[v2.0] Switch from k8s.gcr.io to registry.k8s.io (#3347)

hitachienergy · May 8, 2023 · 3a9d211 · 3a9d211
1 parent 760ea20
commit 3a9d211
Show file tree

Hide file tree

Showing 8 changed files with 209 additions and 203 deletions.
diff --git a/ansible/playbooks/roles/containerd/templates/config.toml.j2 b/ansible/playbooks/roles/containerd/templates/config.toml.j2
@@ -55,7 +55,7 @@ oom_score = 0
     stream_idle_timeout = "4h0m0s"
     enable_selinux = false
     selinux_category_range = 1024
-    sandbox_image = "{{ image_registry_address }}/k8s.gcr.io/pause:3.5"
+    sandbox_image = "{{ image_registry_address }}/registry.k8s.io/pause:3.5"
     stats_collect_period = 10
     systemd_cgroup = false
     enable_tls_streaming = false

diff --git a/...le/playbooks/roles/repository/files/download-requirements/requirements/aarch64/images.yml b/...le/playbooks/roles/repository/files/download-requirements/requirements/aarch64/images.yml
@@ -33,26 +33,26 @@ images:
       sha1: 996f919bfc7db09e30f759d5987395bce287e63d
     # K8s
     # v1.22.4
-    'k8s.gcr.io/kube-apiserver:v1.22.4':
-      sha1: eea0329e33a54d62b0b1cfd6e54169a0f70201a9
+    'registry.k8s.io/kube-apiserver:v1.22.4':
+      sha1: 2fad255ce92b7ee12f206be9d9d098194a8bc151
 
-    'k8s.gcr.io/kube-controller-manager:v1.22.4':
-      sha1: 8fb47001234a741bcd9b1f76d863b8a818728145
+    'registry.k8s.io/kube-controller-manager:v1.22.4':
+      sha1: 51f7911deeadd69d90486a52a4f28e46acf47ef8
 
-    'k8s.gcr.io/kube-scheduler:v1.22.4':
-      sha1: 687d3836b2dfc047a3f146254efa0b1f6c692f69
+    'registry.k8s.io/kube-scheduler:v1.22.4':
+      sha1: eb715ec0defec88b946b4bb37a41b012968b0ac8
 
-    'k8s.gcr.io/kube-proxy:v1.22.4':
-      sha1: b3ce65eedfbf046f619d6f65f6d4cfe442f181a0
+    'registry.k8s.io/kube-proxy:v1.22.4':
+      sha1: 182c5c09e343f3d4e2072cd9e1f9bd93ca254892
 
-    'k8s.gcr.io/coredns/coredns:v1.8.4':
-      sha1: e89c23e998fa93d17a09d1b7cef6aae5cb24b049
+    'registry.k8s.io/coredns/coredns:v1.8.4':
+      sha1: a1cce4643a1e5e8455c96e3adaee141cd8732768
 
-    'k8s.gcr.io/etcd:3.5.0-0':
-      sha1: 3aa7fb15e643e0d199e7b7f7f165533bc4a67f39
+    'registry.k8s.io/etcd:3.5.0-0':
+      sha1: b20cc5eb05db5efaa0dbd17a4ce952bf1032958a
 
-    'k8s.gcr.io/pause:3.5':
-      sha1: 8be7eaa14c9425a6286635d0440f6611ca115d67
+    'registry.k8s.io/pause:3.5':
+      sha1: 95ce209a3229d539db6ec24722e0a86f67e8a157
 
     'quay.io/coreos/flannel:v0.14.0':
       sha1: 13b299bcaa8e0c78d9fe1f5cd9b2155651976d92

diff --git a/...ble/playbooks/roles/repository/files/download-requirements/requirements/x86_64/images.yml b/...ble/playbooks/roles/repository/files/download-requirements/requirements/x86_64/images.yml
@@ -40,23 +40,23 @@ images:
 
     # K8s
     # v1.18.6
-    'k8s.gcr.io/kube-apiserver:v1.18.6':
-      sha1: 554a36b7a5db7b24bf0378b3622b93c51087a7d4
+    'registry.k8s.io/kube-apiserver:v1.18.6':
+      sha1: 7376c22211a4e854efb9c7d486d125cd6b9ad937
 
-    'k8s.gcr.io/kube-controller-manager:v1.18.6':
-      sha1: c5cd6963049e538f641b655261d2750e207f327f
+    'registry.k8s.io/kube-controller-manager:v1.18.6':
+      sha1: cd96d2d94dc62a93e8603f362d981dfba8a5917a
 
-    'k8s.gcr.io/kube-scheduler:v1.18.6':
-      sha1: 9eed1197820be9e1c95594a4be174e28d7e5a33b
+    'registry.k8s.io/kube-scheduler:v1.18.6':
+      sha1: c40ae182f4af1ddbd7b57fff832979c42847655a
 
-    'k8s.gcr.io/kube-proxy:v1.18.6':
-      sha1: 86fc7b8d2ea226cc463574071d982b924d27cb3e
+    'registry.k8s.io/kube-proxy:v1.18.6':
+      sha1: 75418f30f6e3e6d502ee71d3c7b1253e42cfa6b2
 
-    'k8s.gcr.io/coredns:1.6.7':
-      sha1: 3baae909aaa8dbb6c2b4a824817700f2e9aa4803
+    'registry.k8s.io/coredns:1.6.7':
+      sha1: ff4a87c424b1997544d61542c0f0152625466985
 
-    'k8s.gcr.io/etcd:3.4.3-0':
-      sha1: 61a04f2819693a35874ac284dfff756b07173352
+    'registry.k8s.io/etcd:3.4.3-0':
+      sha1: 6afca8c0f0be353a7262c9a4f75cc51e7f77e019
 
     'quay.io/coreos/flannel:v0.12.0-amd64':
       sha1: 2eaa0d8d7014c5f5718f26e658f257bf62751ae0
@@ -77,80 +77,80 @@ images:
       sha1: eb2c7d88f22bcb1a26aea227e0bdcc95fca7801e
 
     # v1.19.15
-    'k8s.gcr.io/kube-apiserver:v1.19.15':
-      sha1: 8f2e76036cc48419dc7f77f60ee2c4b1edfbc0d3
+    'registry.k8s.io/kube-apiserver:v1.19.15':
+      sha1: 8ba2f1966563a1cee14c308fb35269a468529fc7
 
-    'k8s.gcr.io/kube-controller-manager:v1.19.15':
-      sha1: 0efe4e022198d43ab80e98a11c29a72e33722028
+    'registry.k8s.io/kube-controller-manager:v1.19.15':
+      sha1: 36a0dde7704d782291158ed3fc4170f887fa7aca
 
-    'k8s.gcr.io/kube-scheduler:v1.19.15':
-      sha1: e1c793d55bd440c270694f560854267271de9fe7
+    'registry.k8s.io/kube-scheduler:v1.19.15':
+      sha1: 3ba7a05cc19f1accec94557e81c36d146993f76b
 
-    'k8s.gcr.io/kube-proxy:v1.19.15':
-      sha1: 15d8fb70c7673f4745ea3c586b8b1849be71b5c7
+    'registry.k8s.io/kube-proxy:v1.19.15':
+      sha1: de785d5892a9394a7cd8c432f40dc1e2874c565f
 
     # v1.20.12
-    'k8s.gcr.io/kube-apiserver:v1.20.12':
-      sha1: 34c9bad2e9da91be5285bfa083272b447235a63c
+    'registry.k8s.io/kube-apiserver:v1.20.12':
+      sha1: b8c79267b9cbe1310f407f787e7d1643841a4b30
 
-    'k8s.gcr.io/kube-controller-manager:v1.20.12':
-      sha1: 570997ff4e53b3766a08f2aeeebc1c327c0970d4
+    'registry.k8s.io/kube-controller-manager:v1.20.12':
+      sha1: 88e0b52ce2abe3fbe3bcaf2043fd6a2e8ff4d428
 
-    'k8s.gcr.io/kube-scheduler:v1.20.12':
-      sha1: 44813174e670f7bbb8de285543fd4f0330396692
+    'registry.k8s.io/kube-scheduler:v1.20.12':
+      sha1: 47934c2c8fbb8e7051ecf3481c466f5021201710
 
-    'k8s.gcr.io/kube-proxy:v1.20.12':
-      sha1: cc5120cbfa0a7957560b410f1a1b4a1a2fe2ac52
+    'registry.k8s.io/kube-proxy:v1.20.12':
+      sha1: 0e562fedb15086e613bf6c6fbc2e4193bc49cc76
 
-    'k8s.gcr.io/coredns:1.7.0':
-      sha1: 7a11a88502cce4912e6306091273855f14f43c72
+    'registry.k8s.io/coredns:1.7.0':
+      sha1: 521d9f2b461ce4b8a1407715596fec93bfb27e64
 
-    'k8s.gcr.io/pause:3.2':
-      sha1: ee84b4ad5b50edf61fce49be0faf83de77f3ce21
+    'registry.k8s.io/pause:3.2':
+      sha1: a107a151b90d28890f247d4fe951b7b8cf1c7ee7
 
     # v1.21.7
-    'k8s.gcr.io/kube-apiserver:v1.21.7':
-      sha1: 7643a70e9c40c7f62aaa3d600aae621bb39c991b
+    'registry.k8s.io/kube-apiserver:v1.21.7':
+      sha1: 8aa1733cdf257a58f02df6ad6e23176d97e81b79
 
-    'k8s.gcr.io/kube-controller-manager:v1.21.7':
-      sha1: fc7f64ee8f7e6cb5c4f13d3760cb99404d9fc18c
+    'registry.k8s.io/kube-controller-manager:v1.21.7':
+      sha1: cf43f4a88e3b6c79014e5b1e31dd2c0de0da3300
 
-    'k8s.gcr.io/kube-scheduler:v1.21.7':
-      sha1: c6ccd2624dece1dde2d9730335f67162e5ef85da
+    'registry.k8s.io/kube-scheduler:v1.21.7':
+      sha1: f2e62ec380344ea246b40b90cadb3171d211cdab
 
-    'k8s.gcr.io/kube-proxy:v1.21.7':
-      sha1: 9ac75d087e0d684082ff9dbe5a80f530a915a3d1
+    'registry.k8s.io/kube-proxy:v1.21.7':
+      sha1: a121226c3a55b10fd607d280fc9c471f60b86632
 
-    'k8s.gcr.io/coredns/coredns:v1.8.0':
-      sha1: 30122c5575d639f6b978fe34786190652cfe3537
+    'registry.k8s.io/coredns/coredns:v1.8.0':
+      sha1: 43da34af984b00bd2fcdf5364ff9526433e499c8
 
-    'k8s.gcr.io/etcd:3.4.13-0':
-      sha1: 234e6239dcff760da397fb06b3dda1dde226c760
+    'registry.k8s.io/etcd:3.4.13-0':
+      sha1: ee125946a39ce208cb7e38d0fc9a985150f1c3fe
 
-    'k8s.gcr.io/pause:3.4.1':
-      sha1: c203a33f0fcf5225c9cf5925571c80c4c2d8020b
+    'registry.k8s.io/pause:3.4.1':
+      sha1: c4a3022683dee873dc861328dca2d5524910bbc5
 
     # v1.22.4
-    'k8s.gcr.io/kube-apiserver:v1.22.4':
-      sha1: 3c83ee79ae018a583f2d4642b8829570fd4f1d9f
+    'registry.k8s.io/kube-apiserver:v1.22.4':
+      sha1: 753ff29805d9ac873f409f0cd8dec0818dba4b2d
 
-    'k8s.gcr.io/kube-controller-manager:v1.22.4':
-      sha1: 4e17c60205a0ea8304dbb57aadf2befd31173fc0
+    'registry.k8s.io/kube-controller-manager:v1.22.4':
+      sha1: 3e6936ed6984505bcd194da11b8fcd3e77b52ac4
 
-    'k8s.gcr.io/kube-scheduler:v1.22.4':
-      sha1: b157699b85ac5f9c5175e8c469d1ba1ecdd3c4ff
+    'registry.k8s.io/kube-scheduler:v1.22.4':
+      sha1: d1fa695dbae08408cf22c8e14b6a70058d5873e1
 
-    'k8s.gcr.io/kube-proxy:v1.22.4':
-      sha1: 6bab7b8f18941f120c14068d80814621b64f098e
+    'registry.k8s.io/kube-proxy:v1.22.4':
+      sha1: b0e3b50e84060be942e48ea67a5c4a95b7355973
 
-    'k8s.gcr.io/coredns/coredns:v1.8.4':
-      sha1: 282c7b3836bc5d3673027871ffe2140e980df097
+    'registry.k8s.io/coredns/coredns:v1.8.4':
+      sha1: 447ce8fb5c1ef69298658d976e8aa3a55da28675
 
-    'k8s.gcr.io/etcd:3.5.0-0':
-      sha1: c6354fbd7424494ceb6deb24128574e59e258fa6
+    'registry.k8s.io/etcd:3.5.0-0':
+      sha1: 78f42080da842ff9454ba9420ad48d90e84de045
 
-    'k8s.gcr.io/pause:3.5':
-      sha1: d0359d4eec7d50783612e9cd59a54a5e517c774e
+    'registry.k8s.io/pause:3.5':
+      sha1: 98f71abc4bdab5a3d5eb779b18483caed2544c5d
 
     'quay.io/coreos/flannel:v0.14.0-amd64':
       sha1: 378e06b6b5ab1c712c961ac73543a59f1ee1c3ac
@@ -183,20 +183,20 @@ images:
       sha1: c096f70cf3b486b3f0d084c85d33deab6b9423ef
 
   rook:
-    'k8s.gcr.io/sig-storage/csi-attacher:v3.4.0':
-      sha1: 8567876a11c527e9d406d3f3efa09e3cee437985
+    'registry.k8s.io/sig-storage/csi-attacher:v3.4.0':
+      sha1: a65c9b964b98b0a908a577350a03a5166ab467b3
 
-    'k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.0':
-      sha1: 07104d23bbb224f81ef6b8fd379b01a7cbba0946
+    'registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.0':
+      sha1: 49304df65bfbb463bb4be7db688a95c2b1c1a1a5
 
-    'k8s.gcr.io/sig-storage/csi-provisioner:v3.1.0':
-      sha1: 55c9d55eb0f2cbe9e37e5464e578b2d7fa45f8f8
+    'registry.k8s.io/sig-storage/csi-provisioner:v3.1.0':
+      sha1: 0d909f211b06853aaaea6e2533f91e7b7ecfd210
 
-    'k8s.gcr.io/sig-storage/csi-resizer:v1.4.0':
-      sha1: 289bafda08f126423dcf7ad78f08a5d8ed57a82e
+    'registry.k8s.io/sig-storage/csi-resizer:v1.4.0':
+      sha1: 8acc84db171b9b8efc17290e17ea7e12e9a09219
 
-    'k8s.gcr.io/sig-storage/csi-snapshotter:v5.0.1':
-      sha1: 8deb564fde820c7f795d8b425f867d4194edd088
+    'registry.k8s.io/sig-storage/csi-snapshotter:v5.0.1':
+      sha1: d5d1b7d2b3eee884dda7d5cd9a6b553d4d997d50
 
     'quay.io/ceph/ceph:v16.2.7-20220510':
       sha1: 7ffb69fe844f59486704ea80d6802d7d3416b455