diff --git a/.zuul.yaml b/.zuul.yaml index 73bb78d117..6f415c506d 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -64,6 +64,11 @@ container_runtime: containerd containerd_version: 1.6.28 containerd_tarball_sha256: f70736e52d61e5ad225f4fd21643b5ca1220013ab8b6c380434caeefb572da9b + cloud_provider_tag: v1.27.3 + cinder_csi_plugin_tag: v1.27.3 + k8s_keystone_auth_tag: v1.27.3 + magnum_auto_healer_tag: v1.27.3 + octavia_ingress_controller_tag: v1.27.3 - job: name: magnum-tempest-plugin-tests-cluster-k8s_fcos_v1-1.27-calico diff --git a/magnum/drivers/common/templates/kubernetes/fragments/enable-auto-healing.sh b/magnum/drivers/common/templates/kubernetes/fragments/enable-auto-healing.sh index d14c449ed9..e889e00fc0 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/enable-auto-healing.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/enable-auto-healing.sh @@ -239,7 +239,7 @@ EOF function enable_magnum_auto_healer { echo "Installing magnum_auto_healer" - image_prefix=${CONTAINER_INFRA_PREFIX:-docker.io/k8scloudprovider/} + image_prefix=${CONTAINER_INFRA_PREFIX:-registry.k8s.io/provider-os/} image_prefix=${image_prefix%/} magnum_auto_healer_manifest=/srv/magnum/kubernetes/manifests/magnum_auto_healer.yaml diff --git a/magnum/drivers/common/templates/kubernetes/fragments/enable-cinder-csi.sh b/magnum/drivers/common/templates/kubernetes/fragments/enable-cinder-csi.sh index 7321d130a0..de42b2d41f 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/enable-cinder-csi.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/enable-cinder-csi.sh @@ -315,7 +315,7 @@ spec: - mountPath: /var/lib/csi/sockets/pluginproxy/ name: socket-dir - name: cinder-csi-plugin - image: ${CONTAINER_INFRA_PREFIX:-docker.io/k8scloudprovider/}cinder-csi-plugin:${CINDER_CSI_PLUGIN_TAG} + image: ${CONTAINER_INFRA_PREFIX:-registry.k8s.io/provider-os/}cinder-csi-plugin:${CINDER_CSI_PLUGIN_TAG} args: - /bin/cinder-csi-plugin - "--endpoint=\$(CSI_ENDPOINT)" @@ -451,7 +451,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - image: ${CONTAINER_INFRA_PREFIX:-docker.io/k8scloudprovider/}cinder-csi-plugin:${CINDER_CSI_PLUGIN_TAG} + image: ${CONTAINER_INFRA_PREFIX:-registry.k8s.io/provider-os/}cinder-csi-plugin:${CINDER_CSI_PLUGIN_TAG} args: - /bin/cinder-csi-plugin - "--endpoint=\$(CSI_ENDPOINT)" diff --git a/magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-octavia.sh b/magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-octavia.sh index 8fef59a419..26f8c817aa 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-octavia.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-octavia.sh @@ -51,7 +51,7 @@ EOF writeFile $OCTAVIA_INGRESS_CONTROLLER_CONFIGMAP "$OCTAVIA_INGRESS_CONTROLLER_CONFIGMAP_CONTENT" # octavia-ingress-controller deployment -oic_image="${CONTAINER_INFRA_PREFIX:-docker.io/k8scloudprovider/}octavia-ingress-controller:${OCTAVIA_INGRESS_CONTROLLER_TAG}" +oic_image="${CONTAINER_INFRA_PREFIX:-registry.k8s.io/provider-os/}octavia-ingress-controller:${OCTAVIA_INGRESS_CONTROLLER_TAG}" OCTAVIA_INGRESS_CONTROLLER=/srv/magnum/kubernetes/manifests/octavia-ingress-controller.yaml OCTAVIA_INGRESS_CONTROLLER_CONTENT=$(cat <