diff --git a/ansible/playbooks/roles/containerd/templates/config.toml.j2 b/ansible/playbooks/roles/containerd/templates/config.toml.j2 index 52893a8b8c..e3bdc3f7e8 100644 --- 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/ansible/playbooks/roles/repository/files/download-requirements/requirements/aarch64/images.yml b/ansible/playbooks/roles/repository/files/download-requirements/requirements/aarch64/images.yml index 53fd35e3a8..994fedda33 100644 --- a/ansible/playbooks/roles/repository/files/download-requirements/requirements/aarch64/images.yml +++ b/ansible/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/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/images.yml b/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/images.yml index 2b69625ee5..28451f50e1 100644 --- a/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/images.yml +++ b/ansible/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 diff --git a/ansible/playbooks/roles/repository/files/download-requirements/tests/data/config.py b/ansible/playbooks/roles/repository/files/download-requirements/tests/data/config.py index f98be38026..171bdd4b34 100644 --- a/ansible/playbooks/roles/repository/files/download-requirements/tests/data/config.py +++ b/ansible/playbooks/roles/repository/files/download-requirements/tests/data/config.py @@ -181,23 +181,23 @@ # K8s # v1.18.6 - 'k8s.gcr.io/kube-apiserver:v1.18.6': - sha1: 164968226f4617abaa31e6108ed9034a1e302f4f + 'registry.k8s.io/kube-apiserver:v1.18.6': + sha1: 7376c22211a4e854efb9c7d486d125cd6b9ad937 - 'k8s.gcr.io/kube-controller-manager:v1.18.6': - sha1: ebea3fecab9e5693d31438fa37dc4d02c6914d67 + 'registry.k8s.io/kube-controller-manager:v1.18.6': + sha1: cd96d2d94dc62a93e8603f362d981dfba8a5917a - 'k8s.gcr.io/kube-scheduler:v1.18.6': - sha1: 183d29c4fdcfda7478d08240934fdb6845e2e3ec + 'registry.k8s.io/kube-scheduler:v1.18.6': + sha1: c40ae182f4af1ddbd7b57fff832979c42847655a - 'k8s.gcr.io/kube-proxy:v1.18.6': - sha1: 62da886e36efff0c03a16e19c1442a1c3040fbf1 + 'registry.k8s.io/kube-proxy:v1.18.6': + sha1: 75418f30f6e3e6d502ee71d3c7b1253e42cfa6b2 - 'k8s.gcr.io/coredns:1.6.7': - sha1: 76615ffabb22fd4fb3d562cb6ebcd243f8826e48 + 'registry.k8s.io/coredns:1.6.7': + sha1: ff4a87c424b1997544d61542c0f0152625466985 - 'k8s.gcr.io/etcd:3.4.3-0': - sha1: 6ee82ddb1bbc7f1831c42046612b8bcfbb171b45 + 'registry.k8s.io/etcd:3.4.3-0': + sha1: 6afca8c0f0be353a7262c9a4f75cc51e7f77e019 'quay.io/coreos/flannel:v0.12.0-amd64': sha1: 3516522e779373983992095e61eb6615edd50d1f @@ -218,80 +218,80 @@ sha1: dd1a6525bde05937a28e3d9176b826162ae489af # v1.19.15 - 'k8s.gcr.io/kube-apiserver:v1.19.15': - sha1: e01c8d778e4e693a0ea09cdbbe041a65cf070c6f + 'registry.k8s.io/kube-apiserver:v1.19.15': + sha1: 8ba2f1966563a1cee14c308fb35269a468529fc7 - 'k8s.gcr.io/kube-controller-manager:v1.19.15': - sha1: d1f5cc6a861b2259861fb78b2b83e9a07b788e31 + 'registry.k8s.io/kube-controller-manager:v1.19.15': + sha1: 36a0dde7704d782291158ed3fc4170f887fa7aca - 'k8s.gcr.io/kube-scheduler:v1.19.15': - sha1: b07fdd17205bc071ab108851d245689642244f92 + 'registry.k8s.io/kube-scheduler:v1.19.15': + sha1: 3ba7a05cc19f1accec94557e81c36d146993f76b - 'k8s.gcr.io/kube-proxy:v1.19.15': - sha1: 9e2e7a8d40840bbade3a1f2dc743b9226491b6c2 + 'registry.k8s.io/kube-proxy:v1.19.15': + sha1: de785d5892a9394a7cd8c432f40dc1e2874c565f # v1.20.12 - 'k8s.gcr.io/kube-apiserver:v1.20.12': - sha1: bbb037b9452db326aaf09988cee080940f3c418a + 'registry.k8s.io/kube-apiserver:v1.20.12': + sha1: b8c79267b9cbe1310f407f787e7d1643841a4b30 - 'k8s.gcr.io/kube-controller-manager:v1.20.12': - sha1: 4a902578a0c548edec93e0f4afea8b601fa54b93 + 'registry.k8s.io/kube-controller-manager:v1.20.12': + sha1: 88e0b52ce2abe3fbe3bcaf2043fd6a2e8ff4d428 - 'k8s.gcr.io/kube-scheduler:v1.20.12': - sha1: ed5ceb21d0f5bc350db69550fb7feac7a6f1e50b + 'registry.k8s.io/kube-scheduler:v1.20.12': + sha1: 47934c2c8fbb8e7051ecf3481c466f5021201710 - 'k8s.gcr.io/kube-proxy:v1.20.12': - sha1: f937aba709f52be88360361230840e7bca756b2e + 'registry.k8s.io/kube-proxy:v1.20.12': + sha1: 0e562fedb15086e613bf6c6fbc2e4193bc49cc76 - 'k8s.gcr.io/coredns:1.7.0': - sha1: 5aa15f4cb942885879955b98a0a824833d9f66eb + 'registry.k8s.io/coredns:1.7.0': + sha1: 521d9f2b461ce4b8a1407715596fec93bfb27e64 - 'k8s.gcr.io/pause:3.2': - sha1: ae4799e1a1ec9cd0dda8ab643b6e50c9fe505fef + 'registry.k8s.io/pause:3.2': + sha1: a107a151b90d28890f247d4fe951b7b8cf1c7ee7 # v1.21.7 - 'k8s.gcr.io/kube-apiserver:v1.21.7': - sha1: edb26859b3485808716982deccd90ca420828649 + 'registry.k8s.io/kube-apiserver:v1.21.7': + sha1: 8aa1733cdf257a58f02df6ad6e23176d97e81b79 - 'k8s.gcr.io/kube-controller-manager:v1.21.7': - sha1: 9abf1841da5b113b377c1471880198259ec2d246 + 'registry.k8s.io/kube-controller-manager:v1.21.7': + sha1: cf43f4a88e3b6c79014e5b1e31dd2c0de0da3300 - 'k8s.gcr.io/kube-scheduler:v1.21.7': - sha1: 996d25351afc96a10e9008c04418db07a99c76b7 + 'registry.k8s.io/kube-scheduler:v1.21.7': + sha1: f2e62ec380344ea246b40b90cadb3171d211cdab - 'k8s.gcr.io/kube-proxy:v1.21.7': - sha1: 450af22a892ffef276d4d58332b7817a1dde34e7 + 'registry.k8s.io/kube-proxy:v1.21.7': + sha1: a121226c3a55b10fd607d280fc9c471f60b86632 - 'k8s.gcr.io/coredns/coredns:v1.8.0': - sha1: 03114a98137e7cc2dcf4983b919e6b93ac8d1189 + 'registry.k8s.io/coredns/coredns:v1.8.0': + sha1: 43da34af984b00bd2fcdf5364ff9526433e499c8 - 'k8s.gcr.io/etcd:3.4.13-0': - sha1: d37a2efafcc4aa86e6dc497e87e80b5d7f326115 + 'registry.k8s.io/etcd:3.4.13-0': + sha1: ee125946a39ce208cb7e38d0fc9a985150f1c3fe - 'k8s.gcr.io/pause:3.4.1': - sha1: 7f57ae28d733f99c0aab8f4e27d4b0c034cd0c04 + 'registry.k8s.io/pause:3.4.1': + sha1: c4a3022683dee873dc861328dca2d5524910bbc5 # v1.22.4 - 'k8s.gcr.io/kube-apiserver:v1.22.4': - sha1: 2bf4ddb2e1f1530cf55ebaf8e8d0c56ad378b9ec + 'registry.k8s.io/kube-apiserver:v1.22.4': + sha1: 753ff29805d9ac873f409f0cd8dec0818dba4b2d - 'k8s.gcr.io/kube-controller-manager:v1.22.4': - sha1: 241924fa3dc4671fe6644402f7beb60028c02c71 + 'registry.k8s.io/kube-controller-manager:v1.22.4': + sha1: 3e6936ed6984505bcd194da11b8fcd3e77b52ac4 - 'k8s.gcr.io/kube-scheduler:v1.22.4': - sha1: 373e2939072b03cf5b1e115820b7fb6b749b0ebb + 'registry.k8s.io/kube-scheduler:v1.22.4': + sha1: d1fa695dbae08408cf22c8e14b6a70058d5873e1 - 'k8s.gcr.io/kube-proxy:v1.22.4': - sha1: fecfb88509a430c29267a99b83f60f4a7c333583 + 'registry.k8s.io/kube-proxy:v1.22.4': + sha1: b0e3b50e84060be942e48ea67a5c4a95b7355973 - 'k8s.gcr.io/coredns/coredns:v1.8.4': - sha1: 69c8e14ac3941fd5551ff22180be5f4ea2742d7f + 'registry.k8s.io/coredns/coredns:v1.8.4': + sha1: 447ce8fb5c1ef69298658d976e8aa3a55da28675 - 'k8s.gcr.io/etcd:3.5.0-0': - sha1: 9d9ee2df54a201dcc9c7a10ea763b9a5dce875f1 + 'registry.k8s.io/etcd:3.5.0-0': + sha1: 78f42080da842ff9454ba9420ad48d90e84de045 - 'k8s.gcr.io/pause:3.5': - sha1: bf3e3420df62f093f94c41d2b7a62b874dcbfc28 + 'registry.k8s.io/pause:3.5': + sha1: 98f71abc4bdab5a3d5eb779b18483caed2544c5d 'quay.io/coreos/flannel:v0.14.0-amd64': sha1: cff47465996a51de4632b53abf1fca873f147027 @@ -311,20 +311,20 @@ 'calico/pod2daemon-flexvol:v3.20.3': sha1: 97c1b7ac90aa5a0f5c52e7f137549e598ff80f3e - 'k8s.gcr.io/sig-storage/csi-attacher:v3.4.0': - sha1: f076bd75359c6449b965c48eb8bad96c6d40790d + '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: 129eb73c8e118e5049fee3d273b2d477c547e080 + '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: 2b45e5a3432cb89f3aec59584c1fa92c069e7a38 + 'registry.k8s.io/sig-storage/csi-provisioner:v3.1.0': + sha1: 0d909f211b06853aaaea6e2533f91e7b7ecfd210 - 'k8s.gcr.io/sig-storage/csi-resizer:v1.4.0': - sha1: ce5c57454254c195762c1f58e1d902d7e81ea669 + 'registry.k8s.io/sig-storage/csi-resizer:v1.4.0': + sha1: 8acc84db171b9b8efc17290e17ea7e12e9a09219 - 'k8s.gcr.io/sig-storage/csi-snapshotter:v5.0.1': - sha1: be1cf43617eea007629c0eb99149a99b6498f889 + 'registry.k8s.io/sig-storage/csi-snapshotter:v5.0.1': + sha1: d5d1b7d2b3eee884dda7d5cd9a6b553d4d997d50 'quay.io/ceph/ceph:v16.2.7': sha1: fe9b7802c67e19111f83ffe4754ab62df66fd417 diff --git a/docs/changelogs/CHANGELOG-2.0.md b/docs/changelogs/CHANGELOG-2.0.md index b519f31d90..32fa5841cf 100644 --- a/docs/changelogs/CHANGELOG-2.0.md +++ b/docs/changelogs/CHANGELOG-2.0.md @@ -1,6 +1,12 @@ # Changelog 2.0 +## [2.0.6] YYYY-MM-DD + +### Updated + +- [#3347](https://github.com/epiphany-platform/epiphany/issues/3347) - Switch from `k8s.gcr.io` to `registry.k8s.io` + ## [2.0.5] 2023-03-01 ### Fixed diff --git a/schema/common/defaults/configuration/image-registry.yml b/schema/common/defaults/configuration/image-registry.yml index 4c7ab66bf6..ca965e7995 100644 --- a/schema/common/defaults/configuration/image-registry.yml +++ b/schema/common/defaults/configuration/image-registry.yml @@ -28,15 +28,15 @@ specification: - name: "kubernetesui/metrics-scraper:v1.0.7" file_name: metrics-scraper-v1.0.7.tar rook: - - name: "k8s.gcr.io/sig-storage/csi-attacher:v3.4.0" + - name: "registry.k8s.io/sig-storage/csi-attacher:v3.4.0" file_name: csi-attacher-v3.4.0.tar - - name: "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.0" + - name: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.0" file_name: csi-node-driver-registrar-v2.5.0.tar - - name: "k8s.gcr.io/sig-storage/csi-provisioner:v3.1.0" + - name: "registry.k8s.io/sig-storage/csi-provisioner:v3.1.0" file_name: csi-provisioner-v3.1.0.tar - - name: "k8s.gcr.io/sig-storage/csi-resizer:v1.4.0" + - name: "registry.k8s.io/sig-storage/csi-resizer:v1.4.0" file_name: csi-resizer-v1.4.0.tar - - name: "k8s.gcr.io/sig-storage/csi-snapshotter:v5.0.1" + - name: "registry.k8s.io/sig-storage/csi-snapshotter:v5.0.1" file_name: csi-snapshotter-v5.0.1.tar - name: "quay.io/ceph/ceph:v16.2.7-20220510" file_name: ceph-v16.2.7-20220510.tar @@ -55,19 +55,19 @@ specification: kubernetes-master: # K8s v1.22.4 - Epiphany 1.3 # https://github.com/kubernetes/kubernetes/blob/v1.22.4/build/dependencies.yaml - - name: "k8s.gcr.io/kube-apiserver:v1.22.4" + - name: "registry.k8s.io/kube-apiserver:v1.22.4" file_name: kube-apiserver-v1.22.4.tar - - name: "k8s.gcr.io/kube-controller-manager:v1.22.4" + - name: "registry.k8s.io/kube-controller-manager:v1.22.4" file_name: kube-controller-manager-v1.22.4.tar - - name: "k8s.gcr.io/kube-proxy:v1.22.4" + - name: "registry.k8s.io/kube-proxy:v1.22.4" file_name: kube-proxy-v1.22.4.tar - - name: "k8s.gcr.io/kube-scheduler:v1.22.4" + - name: "registry.k8s.io/kube-scheduler:v1.22.4" file_name: kube-scheduler-v1.22.4.tar - - name: "k8s.gcr.io/coredns/coredns:v1.8.4" + - name: "registry.k8s.io/coredns/coredns:v1.8.4" file_name: coredns-v1.8.4.tar - - name: "k8s.gcr.io/etcd:3.5.0-0" + - name: "registry.k8s.io/etcd:3.5.0-0" file_name: etcd-3.5.0-0.tar - - name: "k8s.gcr.io/pause:3.5" + - name: "registry.k8s.io/pause:3.5" file_name: pause-3.5.tar # flannel - name: "quay.io/coreos/flannel:v0.14.0" @@ -96,54 +96,54 @@ specification: - name: "calico/pod2daemon-flexvol:v3.20.3" file_name: pod2daemon-flexvol-v3.20.3.tar # K8s v1.21.7 - Epiphany 1.3 (transitional version) - - name: "k8s.gcr.io/kube-apiserver:v1.21.7" + - name: "registry.k8s.io/kube-apiserver:v1.21.7" file_name: kube-apiserver-v1.21.7.tar - - name: "k8s.gcr.io/kube-controller-manager:v1.21.7" + - name: "registry.k8s.io/kube-controller-manager:v1.21.7" file_name: kube-controller-manager-v1.21.7.tar - - name: "k8s.gcr.io/kube-proxy:v1.21.7" + - name: "registry.k8s.io/kube-proxy:v1.21.7" file_name: kube-proxy-v1.21.7.tar - - name: "k8s.gcr.io/kube-scheduler:v1.21.7" + - name: "registry.k8s.io/kube-scheduler:v1.21.7" file_name: kube-scheduler-v1.21.7.tar - - name: "k8s.gcr.io/coredns/coredns:v1.8.0" + - name: "registry.k8s.io/coredns/coredns:v1.8.0" file_name: coredns-v1.8.0.tar - - name: "k8s.gcr.io/etcd:3.4.13-0" + - name: "registry.k8s.io/etcd:3.4.13-0" file_name: etcd-3.4.13-0.tar - - name: "k8s.gcr.io/pause:3.4.1" + - name: "registry.k8s.io/pause:3.4.1" file_name: pause-3.4.1.tar # K8s v1.20.12 - Epiphany 1.3 (transitional version) - - name: "k8s.gcr.io/kube-apiserver:v1.20.12" + - name: "registry.k8s.io/kube-apiserver:v1.20.12" file_name: kube-apiserver-v1.20.12.tar - - name: "k8s.gcr.io/kube-controller-manager:v1.20.12" + - name: "registry.k8s.io/kube-controller-manager:v1.20.12" file_name: kube-controller-manager-v1.20.12.tar - - name: "k8s.gcr.io/kube-proxy:v1.20.12" + - name: "registry.k8s.io/kube-proxy:v1.20.12" file_name: kube-proxy-v1.20.12.tar - - name: "k8s.gcr.io/kube-scheduler:v1.20.12" + - name: "registry.k8s.io/kube-scheduler:v1.20.12" file_name: kube-scheduler-v1.20.12.tar - - name: "k8s.gcr.io/coredns:1.7.0" + - name: "registry.k8s.io/coredns:1.7.0" file_name: coredns-1.7.0.tar - - name: "k8s.gcr.io/pause:3.2" + - name: "registry.k8s.io/pause:3.2" file_name: pause-3.2.tar # K8s v1.19.15 - Epiphany 1.3 (transitional version) - - name: "k8s.gcr.io/kube-apiserver:v1.19.15" + - name: "registry.k8s.io/kube-apiserver:v1.19.15" file_name: kube-apiserver-v1.19.15.tar - - name: "k8s.gcr.io/kube-controller-manager:v1.19.15" + - name: "registry.k8s.io/kube-controller-manager:v1.19.15" file_name: kube-controller-manager-v1.19.15.tar - - name: "k8s.gcr.io/kube-proxy:v1.19.15" + - name: "registry.k8s.io/kube-proxy:v1.19.15" file_name: kube-proxy-v1.19.15.tar - - name: "k8s.gcr.io/kube-scheduler:v1.19.15" + - name: "registry.k8s.io/kube-scheduler:v1.19.15" file_name: kube-scheduler-v1.19.15.tar # K8s v1.18.6 - Epiphany 0.7.1 - 1.2 - - name: "k8s.gcr.io/kube-apiserver:v1.18.6" + - name: "registry.k8s.io/kube-apiserver:v1.18.6" file_name: kube-apiserver-v1.18.6.tar - - name: "k8s.gcr.io/kube-controller-manager:v1.18.6" + - name: "registry.k8s.io/kube-controller-manager:v1.18.6" file_name: kube-controller-manager-v1.18.6.tar - - name: "k8s.gcr.io/kube-proxy:v1.18.6" + - name: "registry.k8s.io/kube-proxy:v1.18.6" file_name: kube-proxy-v1.18.6.tar - - name: "k8s.gcr.io/kube-scheduler:v1.18.6" + - name: "registry.k8s.io/kube-scheduler:v1.18.6" file_name: kube-scheduler-v1.18.6.tar - - name: "k8s.gcr.io/coredns:1.6.7" + - name: "registry.k8s.io/coredns:1.6.7" file_name: coredns-1.6.7.tar - - name: "k8s.gcr.io/etcd:3.4.3-0" + - name: "registry.k8s.io/etcd:3.4.3-0" file_name: etcd-3.4.3-0.tar # flannel - name: "quay.io/coreos/flannel:v0.12.0-amd64" @@ -180,19 +180,19 @@ specification: file_name: haproxy-2.2.2-alpine.tar kubernetes-master: # K8s v1.22.4 - Epiphany 1.3 - - name: "k8s.gcr.io/kube-apiserver:v1.22.4" + - name: "registry.k8s.io/kube-apiserver:v1.22.4" file_name: kube-apiserver-v1.22.4.tar - - name: "k8s.gcr.io/kube-controller-manager:v1.22.4" + - name: "registry.k8s.io/kube-controller-manager:v1.22.4" file_name: kube-controller-manager-v1.22.4.tar - - name: "k8s.gcr.io/kube-proxy:v1.22.4" + - name: "registry.k8s.io/kube-proxy:v1.22.4" file_name: kube-proxy-v1.22.4.tar - - name: "k8s.gcr.io/kube-scheduler:v1.22.4" + - name: "registry.k8s.io/kube-scheduler:v1.22.4" file_name: kube-scheduler-v1.22.4.tar - - name: "k8s.gcr.io/coredns/coredns:v1.8.4" + - name: "registry.k8s.io/coredns/coredns:v1.8.4" file_name: coredns-v1.8.4.tar - - name: "k8s.gcr.io/etcd:3.5.0-0" + - name: "registry.k8s.io/etcd:3.5.0-0" file_name: etcd-3.5.0-0.tar - - name: "k8s.gcr.io/pause:3.5" + - name: "registry.k8s.io/pause:3.5" file_name: pause-3.5.tar # flannel - name: "quay.io/coreos/flannel:v0.14.0" diff --git a/schema/common/defaults/configuration/kubernetes-master.yml b/schema/common/defaults/configuration/kubernetes-master.yml index 8f306e1ab3..1dac8264a8 100644 --- a/schema/common/defaults/configuration/kubernetes-master.yml +++ b/schema/common/defaults/configuration/kubernetes-master.yml @@ -30,7 +30,7 @@ specification: dnsDomain: cluster.local serviceSubnet: 10.96.0.0/12 plugin: flannel # valid options: calico, flannel, canal (due to lack of support for calico on Azure - use canal) - imageRepository: k8s.gcr.io + imageRepository: registry.k8s.io certificates: expiration_days: 365 # values greater than 24855 are not recommended renew: false diff --git a/schema/common/defaults/configuration/rook.yml b/schema/common/defaults/configuration/rook.yml index d48f123fb8..a9b7917baf 100644 --- a/schema/common/defaults/configuration/rook.yml +++ b/schema/common/defaults/configuration/rook.yml @@ -19,15 +19,15 @@ specification: cephcsi: image: quay.io/cephcsi/cephcsi:v3.5.1 registrar: - image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.0 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.0 provisioner: - image: k8s.gcr.io/sig-storage/csi-provisioner:v3.1.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v3.1.0 snapshotter: - image: k8s.gcr.io/sig-storage/csi-snapshotter:v5.0.1 + image: registry.k8s.io/sig-storage/csi-snapshotter:v5.0.1 attacher: - image: k8s.gcr.io/sig-storage/csi-attacher:v3.4.0 + image: registry.k8s.io/sig-storage/csi-attacher:v3.4.0 resizer: - image: k8s.gcr.io/sig-storage/csi-resizer:v1.4.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.4.0 cluster_chart_values: toolbox: enabled: false