From 97ce6d7d8e9a090c748800d69a57bbd9af698b60 Mon Sep 17 00:00:00 2001 From: Vladimir Kozhukalov Date: Tue, 11 Apr 2023 04:54:26 +0300 Subject: [PATCH] Update kubernetes registry to registry.k8s.io See this link for details https://kubernetes.io/blog/2023/03/10/image-registry-redirect/ Change-Id: Ifc8b64825751933def16a1784fae987a1d7250ad --- ceph-provisioners/Chart.yaml | 2 +- ceph-provisioners/values.yaml | 10 +++++----- daemonjob-controller/Chart.yaml | 2 +- daemonjob-controller/values.yaml | 2 +- etcd/Chart.yaml | 2 +- etcd/values.yaml | 2 +- falco/Chart.yaml | 2 +- falco/values.yaml | 8 ++++---- ingress/Chart.yaml | 2 +- ingress/values.yaml | 4 ++-- kube-dns/Chart.yaml | 2 +- kube-dns/values.yaml | 6 +++--- mariadb/Chart.yaml | 2 +- mariadb/values.yaml | 4 ++-- registry/Chart.yaml | 2 +- registry/values.yaml | 2 +- releasenotes/notes/ceph-provisioners.yaml | 1 + releasenotes/notes/daemonjob-controller.yaml | 1 + releasenotes/notes/etcd.yaml | 1 + releasenotes/notes/falco.yaml | 1 + releasenotes/notes/ingress.yaml | 1 + releasenotes/notes/kube-dns.yaml | 1 + releasenotes/notes/mariadb.yaml | 1 + releasenotes/notes/registry.yaml | 1 + tools/image-repo-overides.sh | 12 ++++++------ 25 files changed, 41 insertions(+), 33 deletions(-) diff --git a/ceph-provisioners/Chart.yaml b/ceph-provisioners/Chart.yaml index 575764e2c..77360f7ef 100644 --- a/ceph-provisioners/Chart.yaml +++ b/ceph-provisioners/Chart.yaml @@ -15,6 +15,6 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Ceph Provisioner name: ceph-provisioners -version: 0.1.24 +version: 0.1.25 home: https://github.com/ceph/ceph ... diff --git a/ceph-provisioners/values.yaml b/ceph-provisioners/values.yaml index 409623c76..173e9c503 100644 --- a/ceph-provisioners/values.yaml +++ b/ceph-provisioners/values.yaml @@ -33,11 +33,11 @@ images: ceph_cephfs_provisioner: 'docker.io/openstackhelm/ceph-cephfs-provisioner:ubuntu_bionic-20200521' ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal-20230124' ceph_rbd_provisioner: 'docker.io/openstackhelm/ceph-rbd-provisioner:change_770201_ubuntu_bionic-20210113' - csi_provisioner: 'k8s.gcr.io/sig-storage/csi-provisioner:v3.1.0' - csi_snapshotter: 'k8s.gcr.io/sig-storage/csi-snapshotter:v6.0.0' - csi_attacher: 'k8s.gcr.io/sig-storage/csi-attacher:v3.4.0' - csi_resizer: 'k8s.gcr.io/sig-storage/csi-resizer:v1.4.0' - csi_registrar: 'k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.0' + csi_provisioner: 'registry.k8s.io/sig-storage/csi-provisioner:v3.1.0' + csi_snapshotter: 'registry.k8s.io/sig-storage/csi-snapshotter:v6.0.0' + csi_attacher: 'registry.k8s.io/sig-storage/csi-attacher:v3.4.0' + csi_resizer: 'registry.k8s.io/sig-storage/csi-resizer:v1.4.0' + csi_registrar: 'registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.0' cephcsi: 'quay.io/cephcsi/cephcsi:v3.6.2' dep_check: 'quay.io/airshipit/kubernetes-entrypoint:v1.0.0' image_repo_sync: 'docker.io/library/docker:17.07.0' diff --git a/daemonjob-controller/Chart.yaml b/daemonjob-controller/Chart.yaml index c00f48566..7a9c9ce37 100644 --- a/daemonjob-controller/Chart.yaml +++ b/daemonjob-controller/Chart.yaml @@ -15,6 +15,6 @@ apiVersion: v1 appVersion: v1.0.0 description: A Helm chart for DaemonjobController name: daemonjob-controller -version: 0.1.6 +version: 0.1.7 home: https://opendev.org/openstack ... diff --git a/daemonjob-controller/values.yaml b/daemonjob-controller/values.yaml index c32b1a54e..5ae11e76c 100644 --- a/daemonjob-controller/values.yaml +++ b/daemonjob-controller/values.yaml @@ -20,7 +20,7 @@ release_group: null images: tags: python: docker.io/library/python:3.7-slim - pause: k8s.gcr.io/pause:latest + pause: registry.k8s.io/pause:latest image_repo_sync: docker.io/library/docker:17.07.0 pullPolicy: IfNotPresent local_registry: diff --git a/etcd/Chart.yaml b/etcd/Chart.yaml index b819ecaea..89f9b50bc 100644 --- a/etcd/Chart.yaml +++ b/etcd/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 appVersion: v3.4.3 description: OpenStack-Helm etcd name: etcd -version: 0.1.5 +version: 0.1.6 home: https://coreos.com/etcd/ icon: https://raw.githubusercontent.com/CloudCoreo/etcd-cluster/master/images/icon.png sources: diff --git a/etcd/values.yaml b/etcd/values.yaml index efe8d61d1..6d3bc04b1 100644 --- a/etcd/values.yaml +++ b/etcd/values.yaml @@ -18,7 +18,7 @@ --- images: tags: - etcd: 'k8s.gcr.io/etcd-amd64:3.4.3' + etcd: 'registry.k8s.io/etcd-amd64:3.4.3' dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 image_repo_sync: docker.io/library/docker:17.07.0 pull_policy: "IfNotPresent" diff --git a/falco/Chart.yaml b/falco/Chart.yaml index bc44bf3b7..26723b146 100644 --- a/falco/Chart.yaml +++ b/falco/Chart.yaml @@ -13,7 +13,7 @@ --- apiVersion: v1 name: falco -version: 0.1.8 +version: 0.1.9 appVersion: 0.11.1 description: Sysdig Falco keywords: diff --git a/falco/values.yaml b/falco/values.yaml index 6554eb254..503e9d14c 100644 --- a/falco/values.yaml +++ b/falco/values.yaml @@ -1079,9 +1079,9 @@ conf: not container.image startswith sysdig/falco-event-generator) or container.image startswith quay.io/sysdig or container.image startswith sysdig/sysdig or - container.image startswith k8s.gcr.io/hyperkube or + container.image startswith registry.k8s.io/hyperkube or container.image startswith quay.io/coreos/flannel or - container.image startswith k8s.gcr.io/kube-proxy or + container.image startswith registry.k8s.io/kube-proxy or container.image startswith calico/node or container.image startswith rook/toolbox or container.image startswith registry.access.redhat.com/openshift3/logging-fluentd or @@ -1317,8 +1317,8 @@ conf: condition: (fd.sip="1.2.3.4" and fd.sport=8080) - macro: k8s_containers condition: > - (container.image startswith k8s.gcr.io/hyperkube-amd64 or - container.image startswith k8s.gcr.io/kube2sky or + (container.image startswith registry.k8s.io/hyperkube-amd64 or + container.image startswith registry.k8s.io/kube2sky or container.image startswith sysdig/agent or container.image startswith sysdig/falco or container.image startswith sysdig/sysdig) diff --git a/ingress/Chart.yaml b/ingress/Chart.yaml index 243193469..584fe5007 100644 --- a/ingress/Chart.yaml +++ b/ingress/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 appVersion: v0.42.0 description: OpenStack-Helm Ingress Controller name: ingress -version: 0.2.14 +version: 0.2.15 home: https://github.com/kubernetes/ingress sources: - https://github.com/kubernetes/ingress diff --git a/ingress/values.yaml b/ingress/values.yaml index eb7c1a196..c42cdac4c 100644 --- a/ingress/values.yaml +++ b/ingress/values.yaml @@ -25,10 +25,10 @@ deployment: images: tags: entrypoint: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 - ingress: k8s.gcr.io/ingress-nginx/controller:v1.5.1 + ingress: registry.k8s.io/ingress-nginx/controller:v1.5.1 ingress_module_init: docker.io/openstackhelm/neutron:xena-ubuntu_focal ingress_routed_vip: docker.io/openstackhelm/neutron:xena-ubuntu_focal - error_pages: k8s.gcr.io/defaultbackend:1.4 + error_pages: registry.k8s.io/defaultbackend:1.4 keepalived: docker.io/osixia/keepalived:1.4.5 dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 image_repo_sync: docker.io/library/docker:17.07.0 diff --git a/kube-dns/Chart.yaml b/kube-dns/Chart.yaml index cdff72305..02a098a1a 100644 --- a/kube-dns/Chart.yaml +++ b/kube-dns/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 appVersion: v1.14.5 description: OpenStack-Helm Kube-DNS name: kube-dns -version: 0.1.6 +version: 0.1.7 home: https://github.com/coreos/flannel icon: https://raw.githubusercontent.com/coreos/flannel/master/logos/flannel-horizontal-color.png sources: diff --git a/kube-dns/values.yaml b/kube-dns/values.yaml index 5608ef1e1..4c1e451ba 100644 --- a/kube-dns/values.yaml +++ b/kube-dns/values.yaml @@ -20,9 +20,9 @@ labels: images: tags: - kube_dns: k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.5 - kube_dns_nanny: k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.5 - kube_dns_sidecar: k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.5 + kube_dns: registry.k8s.io/k8s-dns-kube-dns-amd64:1.14.5 + kube_dns_nanny: registry.k8s.io/k8s-dns-dnsmasq-nanny-amd64:1.14.5 + kube_dns_sidecar: registry.k8s.io/k8s-dns-sidecar-amd64:1.14.5 dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 image_repo_sync: docker.io/library/docker:17.07.0 pull_policy: IfNotPresent diff --git a/mariadb/Chart.yaml b/mariadb/Chart.yaml index 06d33fd30..34cdff5da 100644 --- a/mariadb/Chart.yaml +++ b/mariadb/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 appVersion: v10.6.7 description: OpenStack-Helm MariaDB name: mariadb -version: 0.2.30 +version: 0.2.31 home: https://mariadb.com/kb/en/ icon: http://badges.mariadb.org/mariadb-badge-180x60.png sources: diff --git a/mariadb/values.yaml b/mariadb/values.yaml index 2116b7f20..741a75fe3 100644 --- a/mariadb/values.yaml +++ b/mariadb/values.yaml @@ -21,8 +21,8 @@ release_group: null images: tags: mariadb: docker.io/openstackhelm/mariadb:latest-ubuntu_focal - ingress: k8s.gcr.io/ingress-nginx/controller:v1.5.1 - error_pages: k8s.gcr.io/defaultbackend:1.4 + ingress: registry.k8s.io/ingress-nginx/controller:v1.5.1 + error_pages: registry.k8s.io/defaultbackend:1.4 prometheus_create_mysql_user: docker.io/library/mariadb:10.5.9-focal prometheus_mysql_exporter: docker.io/prom/mysqld-exporter:v0.12.1 prometheus_mysql_exporter_helm_tests: docker.io/openstackhelm/heat:wallaby-ubuntu_focal diff --git a/registry/Chart.yaml b/registry/Chart.yaml index d94c2b20e..7539752e7 100644 --- a/registry/Chart.yaml +++ b/registry/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 appVersion: v2.0.0 description: OpenStack-Helm Docker Registry name: registry -version: 0.1.6 +version: 0.1.7 home: https://github.com/kubernetes/ingress sources: - https://opendev.org/openstack/openstack-helm diff --git a/registry/values.yaml b/registry/values.yaml index c2f23244d..9437d721f 100644 --- a/registry/values.yaml +++ b/registry/values.yaml @@ -29,7 +29,7 @@ release_group: null images: tags: registry: docker.io/library/registry:2 - registry_proxy: k8s.gcr.io/kube-registry-proxy:0.4 + registry_proxy: registry.k8s.io/kube-registry-proxy:0.4 bootstrap: docker.io/library/docker:17.07.0 dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 pull_policy: "IfNotPresent" diff --git a/releasenotes/notes/ceph-provisioners.yaml b/releasenotes/notes/ceph-provisioners.yaml index dc05b839a..8cc88095e 100644 --- a/releasenotes/notes/ceph-provisioners.yaml +++ b/releasenotes/notes/ceph-provisioners.yaml @@ -24,4 +24,5 @@ ceph-provisioners: - 0.1.22 Remove legacy Ceph provisioners - 0.1.23 Remove unnecessary templates - 0.1.24 Update all Ceph images to Focal + - 0.1.25 Update kubernetes registry to registry.k8s.io ... diff --git a/releasenotes/notes/daemonjob-controller.yaml b/releasenotes/notes/daemonjob-controller.yaml index 5098de099..514f14c7e 100644 --- a/releasenotes/notes/daemonjob-controller.yaml +++ b/releasenotes/notes/daemonjob-controller.yaml @@ -7,4 +7,5 @@ daemonjob-controller: - 0.1.4 Use full image ref for docker official images - 0.1.5 Update htk requirements - 0.1.6 Added OCI registry authentication + - 0.1.7 Update kubernetes registry to registry.k8s.io ... diff --git a/releasenotes/notes/etcd.yaml b/releasenotes/notes/etcd.yaml index 54935db4b..f63d5a3b2 100644 --- a/releasenotes/notes/etcd.yaml +++ b/releasenotes/notes/etcd.yaml @@ -6,4 +6,5 @@ etcd: - 0.1.3 Use full image ref for docker official images - 0.1.4 Update htk requirements - 0.1.5 Added OCI registry authentication + - 0.1.6 Update kubernetes registry to registry.k8s.io ... diff --git a/releasenotes/notes/falco.yaml b/releasenotes/notes/falco.yaml index 2512a917e..33fb96167 100644 --- a/releasenotes/notes/falco.yaml +++ b/releasenotes/notes/falco.yaml @@ -9,4 +9,5 @@ falco: - 0.1.6 Update htk requirements - 0.1.7 Added OCI registry authentication - 0.1.8 Replace node-role.kubernetes.io/master with control-plane + - 0.1.9 Update kubernetes registry to registry.k8s.io ... diff --git a/releasenotes/notes/ingress.yaml b/releasenotes/notes/ingress.yaml index aadace486..f0a717080 100644 --- a/releasenotes/notes/ingress.yaml +++ b/releasenotes/notes/ingress.yaml @@ -18,4 +18,5 @@ ingress: - 0.2.12 Uplift ingress to 1.5.1 - 0.2.13 Allow setting node_port for the svc - 0.2.14 Replace node-role.kubernetes.io/master with control-plane + - 0.2.15 Update kubernetes registry to registry.k8s.io ... diff --git a/releasenotes/notes/kube-dns.yaml b/releasenotes/notes/kube-dns.yaml index 747a3aa61..03f53a9d9 100644 --- a/releasenotes/notes/kube-dns.yaml +++ b/releasenotes/notes/kube-dns.yaml @@ -7,4 +7,5 @@ kube-dns: - 0.1.4 Update htk requirements - 0.1.5 Added OCI registry authentication - 0.1.6 Replace node-role.kubernetes.io/master with control-plane + - 0.1.7 Update kubernetes registry to registry.k8s.io ... diff --git a/releasenotes/notes/mariadb.yaml b/releasenotes/notes/mariadb.yaml index ee3f58005..c7a9ca84b 100644 --- a/releasenotes/notes/mariadb.yaml +++ b/releasenotes/notes/mariadb.yaml @@ -46,4 +46,5 @@ mariadb: - 0.2.28 Added verify_databases_backup_in_directory function implementation - 0.2.29 Uplift Mariadb-ingress to 1.5.1 - 0.2.30 Replace node-role.kubernetes.io/master with control-plane + - 0.2.31 Update kubernetes registry to registry.k8s.io ... diff --git a/releasenotes/notes/registry.yaml b/releasenotes/notes/registry.yaml index a8dd8faeb..5c3dd434f 100644 --- a/releasenotes/notes/registry.yaml +++ b/releasenotes/notes/registry.yaml @@ -7,4 +7,5 @@ registry: - 0.1.4 Helm 3 - Fix Job labels - 0.1.5 Update htk requirements - 0.1.6 Added OCI registry authentication + - 0.1.7 Update kubernetes registry to registry.k8s.io ... diff --git a/tools/image-repo-overides.sh b/tools/image-repo-overides.sh index b2af5b2b4..c5dcd3697 100755 --- a/tools/image-repo-overides.sh +++ b/tools/image-repo-overides.sh @@ -13,12 +13,12 @@ # limitations under the License. KUBE_VERSION=$(yq -r '.version.kubernetes' ./tools/gate/playbooks/vars.yaml) -KUBE_IMAGES="k8s.gcr.io/kube-apiserver-amd64:${KUBE_VERSION} -k8s.gcr.io/kube-controller-manager-amd64:${KUBE_VERSION} -k8s.gcr.io/kube-proxy-amd64:${KUBE_VERSION} -k8s.gcr.io/kube-scheduler-amd64:${KUBE_VERSION} -k8s.gcr.io/pause-amd64:3.0 -k8s.gcr.io/etcd-amd64:3.4.3" +KUBE_IMAGES="registry.k8s.io/kube-apiserver-amd64:${KUBE_VERSION} +registry.k8s.io/kube-controller-manager-amd64:${KUBE_VERSION} +registry.k8s.io/kube-proxy-amd64:${KUBE_VERSION} +registry.k8s.io/kube-scheduler-amd64:${KUBE_VERSION} +registry.k8s.io/pause-amd64:3.0 +registry.k8s.io/etcd-amd64:3.4.3" CHART_IMAGES="" for CHART_DIR in ./*/ ; do