diff --git a/ansible/roles/firstboot/files/ansible_payload/bootstrap/templates/ippool.j2 b/ansible/roles/firstboot/files/ansible_payload/bootstrap/templates/ippool.j2 index fe77036..dd59a5a 100644 --- a/ansible/roles/firstboot/files/ansible_payload/bootstrap/templates/ippool.j2 +++ b/ansible/roles/firstboot/files/ansible_payload/bootstrap/templates/ippool.j2 @@ -1,10 +1,10 @@ -apiVersion: ipam.cluster.x-k8s.io/v1alpha1 +apiVersion: ipam.cluster.x-k8s.io/v1alpha2 kind: InClusterIPPool metadata: name: inclusterippool-{{ _template.cluster.name }} namespace: {{ _template.cluster.namespace }} spec: - start: {{ _template.cluster.network.startip }} - end: {{ _template.cluster.network.endip }} + addresses: + - {{ _template.cluster.network.startip }}-{{ _template.cluster.network.endip }} prefix: {{ _template.cluster.network.prefix }} gateway: {{ _template.cluster.network.gateway }} diff --git a/ansible/vars/metacluster.yml b/ansible/vars/metacluster.yml index 70e92f2..bac2054 100644 --- a/ansible/vars/metacluster.yml +++ b/ansible/vars/metacluster.yml @@ -293,7 +293,7 @@ dependencies: # The following list is generated by running the following commands: # $ clusterctl init -i vsphere: [...] # $ clusterctl generate cluster [...] | yq eval '.data.data' | yq --no-doc eval '.. | .image? | select(.)' | sort -u - - gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.18.1 + - gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.27.0 - gcr.io/cloud-provider-vsphere/csi/release/driver:v2.1.0 - gcr.io/cloud-provider-vsphere/csi/release/syncer:v2.1.0 - quay.io/k8scsi/csi-attacher:v3.0.0