From 66e1eeb7c61f6e22fa7f262abe7efa39a48ba069 Mon Sep 17 00:00:00 2001 From: salasberryfin Date: Fri, 10 Feb 2023 09:56:01 +0100 Subject: [PATCH 1/3] update image references from k8s.gcr.io to registry.k8s.io --- addon-resizer/deploy/example.yaml | 2 +- addon-resizer/vendor/k8s.io/api/core/v1/generated.proto | 2 +- addon-resizer/vendor/k8s.io/api/core/v1/types.go | 2 +- .../vendor/k8s.io/api/core/v1/types_swagger_doc_generated.go | 2 +- charts/cluster-autoscaler/README.md | 2 +- charts/cluster-autoscaler/values.yaml | 2 +- cluster-autoscaler/FAQ.md | 4 ++-- .../aws/examples/cluster-autoscaler-autodiscover.yaml | 2 +- .../aws/examples/cluster-autoscaler-multi-asg.yaml | 2 +- .../aws/examples/cluster-autoscaler-one-asg.yaml | 2 +- .../aws/examples/cluster-autoscaler-run-on-control-plane.yaml | 2 +- .../cloudprovider/azure/examples/cluster-autoscaler-aks.yaml | 2 +- .../azure/examples/cluster-autoscaler-autodiscover.yaml | 2 +- .../examples/cluster-autoscaler-standard-control-plane.yaml | 2 +- .../azure/examples/cluster-autoscaler-standard-msi.yaml | 2 +- .../azure/examples/cluster-autoscaler-standard.yaml | 2 +- .../azure/examples/cluster-autoscaler-vmss-control-plane.yaml | 2 +- .../azure/examples/cluster-autoscaler-vmss-msi.yaml | 2 +- .../cloudprovider/azure/examples/cluster-autoscaler-vmss.yaml | 2 +- .../cherryservers/examples/cluster-autoscaler-deployment.yaml | 2 +- .../civo/examples/cluster-autoscaler-standard.yaml | 2 +- .../examples/cluster-autoscaler-run-on-control-plane.yaml | 2 +- .../cloudprovider/exoscale/examples/cluster-autoscaler.yaml | 2 +- .../cluster-autoscaler-manifests/cluster-autoscaler.yaml | 2 +- .../hetzner/examples/cluster-autoscaler-run-on-master.yaml | 2 +- cluster-autoscaler/cloudprovider/huaweicloud/README.md | 2 +- .../ionoscloud/examples/cluster-autoscaler-standard.yaml | 2 +- .../cloudprovider/kamatera/examples/deployment.yaml | 2 +- .../linode/examples/cluster-autoscaler-autodiscover.yaml | 2 +- cluster-autoscaler/cloudprovider/oci/README.md | 2 +- .../oci/examples/oci-ip-cluster-autoscaler-w-config.yaml | 2 +- .../oci/examples/oci-ip-cluster-autoscaler-w-principals.yaml | 2 +- .../packet/examples/cluster-autoscaler-deployment.yaml | 2 +- .../vultr/examples/cluster-autoscaler-deployment.yaml | 2 +- .../deploy/admission-controller-deployment.yaml | 2 +- .../deploy/recommender-deployment-high.yaml | 2 +- .../deploy/recommender-deployment-low.yaml | 2 +- vertical-pod-autoscaler/deploy/recommender-deployment.yaml | 2 +- vertical-pod-autoscaler/deploy/updater-deployment.yaml | 2 +- vertical-pod-autoscaler/e2e/v1/actuation.go | 2 +- vertical-pod-autoscaler/e2e/v1/common.go | 4 ++-- vertical-pod-autoscaler/e2e/v1beta2/actuation.go | 2 +- vertical-pod-autoscaler/e2e/v1beta2/common.go | 4 ++-- vertical-pod-autoscaler/examples/hamster-deprecated.yaml | 2 +- vertical-pod-autoscaler/examples/hamster.yaml | 2 +- vertical-pod-autoscaler/examples/redis-deprecated.yaml | 2 +- vertical-pod-autoscaler/examples/redis.yaml | 2 +- vertical-pod-autoscaler/hack/vpa-process-yaml.sh | 2 +- 48 files changed, 51 insertions(+), 51 deletions(-) diff --git a/addon-resizer/deploy/example.yaml b/addon-resizer/deploy/example.yaml index f974ec90da73..c560e78dde0e 100644 --- a/addon-resizer/deploy/example.yaml +++ b/addon-resizer/deploy/example.yaml @@ -41,7 +41,7 @@ spec: spec: serviceAccountName: pod-nanny containers: - - image: k8s.gcr.io/autoscaling/addon-resizer:1.8.14 + - image: registry.k8s.io/autoscaling/addon-resizer:1.8.14 imagePullPolicy: Always name: pod-nanny resources: diff --git a/addon-resizer/vendor/k8s.io/api/core/v1/generated.proto b/addon-resizer/vendor/k8s.io/api/core/v1/generated.proto index b4d75069f7ef..7ec373145d7c 100644 --- a/addon-resizer/vendor/k8s.io/api/core/v1/generated.proto +++ b/addon-resizer/vendor/k8s.io/api/core/v1/generated.proto @@ -723,7 +723,7 @@ message Container { // Describe a container image message ContainerImage { // Names by which this image is known. - // e.g. ["k8s.gcr.io/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"] + // e.g. ["registry.k8s.io/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"] repeated string names = 1; // The size of the image in bytes. diff --git a/addon-resizer/vendor/k8s.io/api/core/v1/types.go b/addon-resizer/vendor/k8s.io/api/core/v1/types.go index b941e0ac2e08..7ba740ee1f7b 100644 --- a/addon-resizer/vendor/k8s.io/api/core/v1/types.go +++ b/addon-resizer/vendor/k8s.io/api/core/v1/types.go @@ -3993,7 +3993,7 @@ type PodSignature struct { // Describe a container image type ContainerImage struct { // Names by which this image is known. - // e.g. ["k8s.gcr.io/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"] + // e.g. ["registry.k8s.io/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"] Names []string `json:"names" protobuf:"bytes,1,rep,name=names"` // The size of the image in bytes. // +optional diff --git a/addon-resizer/vendor/k8s.io/api/core/v1/types_swagger_doc_generated.go b/addon-resizer/vendor/k8s.io/api/core/v1/types_swagger_doc_generated.go index 5b4e173db245..9707b17a8f42 100644 --- a/addon-resizer/vendor/k8s.io/api/core/v1/types_swagger_doc_generated.go +++ b/addon-resizer/vendor/k8s.io/api/core/v1/types_swagger_doc_generated.go @@ -340,7 +340,7 @@ func (Container) SwaggerDoc() map[string]string { var map_ContainerImage = map[string]string{ "": "Describe a container image", - "names": "Names by which this image is known. e.g. [\"k8s.gcr.io/hyperkube:v1.0.7\", \"dockerhub.io/google_containers/hyperkube:v1.0.7\"]", + "names": "Names by which this image is known. e.g. [\"registry.k8s.io/hyperkube:v1.0.7\", \"dockerhub.io/google_containers/hyperkube:v1.0.7\"]", "sizeBytes": "The size of the image in bytes.", } diff --git a/charts/cluster-autoscaler/README.md b/charts/cluster-autoscaler/README.md index 578e570c8410..b06057b68f21 100644 --- a/charts/cluster-autoscaler/README.md +++ b/charts/cluster-autoscaler/README.md @@ -357,7 +357,7 @@ Though enough for the majority of installations, the default PodSecurityPolicy _ | fullnameOverride | string | `""` | String to fully override `cluster-autoscaler.fullname` template. | | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | | image.pullSecrets | list | `[]` | Image pull secrets | -| image.repository | string | `"k8s.gcr.io/autoscaling/cluster-autoscaler"` | Image repository | +| image.repository | string | `"registry.k8s.io/autoscaling/cluster-autoscaler"` | Image repository | | image.tag | string | `"v1.23.0"` | Image tag | | kubeTargetVersionOverride | string | `""` | Allow overriding the `.Capabilities.KubeVersion.GitVersion` check. Useful for `helm template` commands. | | magnumCABundlePath | string | `"/etc/kubernetes/ca-bundle.crt"` | Path to the host's CA bundle, from `ca-file` in the cloud-config file. | diff --git a/charts/cluster-autoscaler/values.yaml b/charts/cluster-autoscaler/values.yaml index 44d16c83691f..a92d291e032c 100644 --- a/charts/cluster-autoscaler/values.yaml +++ b/charts/cluster-autoscaler/values.yaml @@ -234,7 +234,7 @@ fullnameOverride: "" image: # image.repository -- Image repository - repository: k8s.gcr.io/autoscaling/cluster-autoscaler + repository: registry.k8s.io/autoscaling/cluster-autoscaler # image.tag -- Image tag tag: v1.23.0 # image.pullPolicy -- Image pull policy diff --git a/cluster-autoscaler/FAQ.md b/cluster-autoscaler/FAQ.md index f7d18269a26c..146d1bb14338 100644 --- a/cluster-autoscaler/FAQ.md +++ b/cluster-autoscaler/FAQ.md @@ -441,7 +441,7 @@ spec: terminationGracePeriodSeconds: 0 containers: - name: reserve-resources - image: k8s.gcr.io/pause + image: registry.k8s.io/pause resources: requests: cpu: "200m" @@ -464,7 +464,7 @@ spec: app: overprovisioning-autoscaler spec: containers: - - image: k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.8.1 + - image: registry.k8s.io/cluster-proportional-autoscaler-amd64:1.8.1 name: autoscaler command: - /cluster-proportional-autoscaler diff --git a/cluster-autoscaler/cloudprovider/aws/examples/cluster-autoscaler-autodiscover.yaml b/cluster-autoscaler/cloudprovider/aws/examples/cluster-autoscaler-autodiscover.yaml index 5ac2a9afcfc8..f3de1745065c 100644 --- a/cluster-autoscaler/cloudprovider/aws/examples/cluster-autoscaler-autodiscover.yaml +++ b/cluster-autoscaler/cloudprovider/aws/examples/cluster-autoscaler-autodiscover.yaml @@ -144,7 +144,7 @@ spec: fsGroup: 65534 serviceAccountName: cluster-autoscaler containers: - - image: k8s.gcr.io/autoscaling/cluster-autoscaler:v1.22.2 + - image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.22.2 name: cluster-autoscaler resources: limits: diff --git a/cluster-autoscaler/cloudprovider/aws/examples/cluster-autoscaler-multi-asg.yaml b/cluster-autoscaler/cloudprovider/aws/examples/cluster-autoscaler-multi-asg.yaml index 59d09a951ec5..a93367cc15d5 100644 --- a/cluster-autoscaler/cloudprovider/aws/examples/cluster-autoscaler-multi-asg.yaml +++ b/cluster-autoscaler/cloudprovider/aws/examples/cluster-autoscaler-multi-asg.yaml @@ -144,7 +144,7 @@ spec: fsGroup: 65534 serviceAccountName: cluster-autoscaler containers: - - image: k8s.gcr.io/autoscaling/cluster-autoscaler:v1.22.2 + - image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.22.2 name: cluster-autoscaler resources: limits: diff --git a/cluster-autoscaler/cloudprovider/aws/examples/cluster-autoscaler-one-asg.yaml b/cluster-autoscaler/cloudprovider/aws/examples/cluster-autoscaler-one-asg.yaml index 4e09a5e877dc..4d35ba3599d4 100644 --- a/cluster-autoscaler/cloudprovider/aws/examples/cluster-autoscaler-one-asg.yaml +++ b/cluster-autoscaler/cloudprovider/aws/examples/cluster-autoscaler-one-asg.yaml @@ -144,7 +144,7 @@ spec: fsGroup: 65534 serviceAccountName: cluster-autoscaler containers: - - image: k8s.gcr.io/autoscaling/cluster-autoscaler:v1.22.2 + - image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.22.2 name: cluster-autoscaler resources: limits: diff --git a/cluster-autoscaler/cloudprovider/aws/examples/cluster-autoscaler-run-on-control-plane.yaml b/cluster-autoscaler/cloudprovider/aws/examples/cluster-autoscaler-run-on-control-plane.yaml index ff16cecbc2cb..b362a440f8d2 100644 --- a/cluster-autoscaler/cloudprovider/aws/examples/cluster-autoscaler-run-on-control-plane.yaml +++ b/cluster-autoscaler/cloudprovider/aws/examples/cluster-autoscaler-run-on-control-plane.yaml @@ -151,7 +151,7 @@ spec: nodeSelector: kubernetes.io/role: master containers: - - image: k8s.gcr.io/autoscaling/cluster-autoscaler:v1.22.2 + - image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.22.2 name: cluster-autoscaler resources: limits: diff --git a/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-aks.yaml b/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-aks.yaml index 843ec82c86d4..0b8558a43156 100644 --- a/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-aks.yaml +++ b/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-aks.yaml @@ -154,7 +154,7 @@ spec: spec: serviceAccountName: cluster-autoscaler containers: - - image: k8s.gcr.io/autoscaling/cluster-autoscaler:{{ ca_version }} + - image: registry.k8s.io/autoscaling/cluster-autoscaler:{{ ca_version }} imagePullPolicy: Always name: cluster-autoscaler resources: diff --git a/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-autodiscover.yaml b/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-autodiscover.yaml index a898361dda57..fee3dc20a305 100644 --- a/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-autodiscover.yaml +++ b/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-autodiscover.yaml @@ -188,7 +188,7 @@ spec: secretKeyRef: key: Deployment name: cluster-autoscaler-azure - image: k8s.gcr.io/autoscaling/cluster-autoscaler:{{ ca_version }} + image: registry.k8s.io/autoscaling/cluster-autoscaler:{{ ca_version }} imagePullPolicy: Always name: cluster-autoscaler resources: diff --git a/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-standard-control-plane.yaml b/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-standard-control-plane.yaml index 3d24d910b09b..b3d21d8d92a5 100644 --- a/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-standard-control-plane.yaml +++ b/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-standard-control-plane.yaml @@ -204,7 +204,7 @@ spec: secretKeyRef: key: Deployment name: cluster-autoscaler-azure - image: k8s.gcr.io/autoscaling/cluster-autoscaler:{{ ca_version }} + image: registry.k8s.io/autoscaling/cluster-autoscaler:{{ ca_version }} imagePullPolicy: Always name: cluster-autoscaler resources: diff --git a/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-standard-msi.yaml b/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-standard-msi.yaml index d748ebdb08e9..83d2bcccb7ac 100644 --- a/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-standard-msi.yaml +++ b/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-standard-msi.yaml @@ -189,7 +189,7 @@ spec: secretKeyRef: key: Deployment name: cluster-autoscaler-azure - image: k8s.gcr.io/autoscaling/cluster-autoscaler:{{ ca_version }} + image: registry.k8s.io/autoscaling/cluster-autoscaler:{{ ca_version }} imagePullPolicy: Always name: cluster-autoscaler resources: diff --git a/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-standard.yaml b/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-standard.yaml index 956bad2faf89..3f0930fee6af 100644 --- a/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-standard.yaml +++ b/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-standard.yaml @@ -197,7 +197,7 @@ spec: secretKeyRef: key: Deployment name: cluster-autoscaler-azure - image: k8s.gcr.io/autoscaling/cluster-autoscaler:{{ ca_version }} + image: registry.k8s.io/autoscaling/cluster-autoscaler:{{ ca_version }} imagePullPolicy: Always name: cluster-autoscaler resources: diff --git a/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-vmss-control-plane.yaml b/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-vmss-control-plane.yaml index 73a5132b6cff..9161887cb4db 100644 --- a/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-vmss-control-plane.yaml +++ b/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-vmss-control-plane.yaml @@ -159,7 +159,7 @@ spec: nodeSelector: kubernetes.io/role: master containers: - - image: k8s.gcr.io/autoscaling/cluster-autoscaler:{{ ca_version }} + - image: registry.k8s.io/autoscaling/cluster-autoscaler:{{ ca_version }} imagePullPolicy: Always name: cluster-autoscaler command: diff --git a/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-vmss-msi.yaml b/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-vmss-msi.yaml index e12b3c5f4824..b28a8e3c4db0 100644 --- a/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-vmss-msi.yaml +++ b/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-vmss-msi.yaml @@ -157,7 +157,7 @@ spec: nodeSelector: kubernetes.io/role: master containers: - - image: k8s.gcr.io/autoscaling/cluster-autoscaler:{{ ca_version }} + - image: registry.k8s.io/autoscaling/cluster-autoscaler:{{ ca_version }} imagePullPolicy: Always name: cluster-autoscaler command: diff --git a/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-vmss.yaml b/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-vmss.yaml index 64853150fe2d..a24ad67193cf 100644 --- a/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-vmss.yaml +++ b/cluster-autoscaler/cloudprovider/azure/examples/cluster-autoscaler-vmss.yaml @@ -152,7 +152,7 @@ spec: spec: serviceAccountName: cluster-autoscaler containers: - - image: k8s.gcr.io/autoscaling/cluster-autoscaler:{{ ca_version }} + - image: registry.k8s.io/autoscaling/cluster-autoscaler:{{ ca_version }} imagePullPolicy: Always name: cluster-autoscaler resources: diff --git a/cluster-autoscaler/cloudprovider/cherryservers/examples/cluster-autoscaler-deployment.yaml b/cluster-autoscaler/cloudprovider/cherryservers/examples/cluster-autoscaler-deployment.yaml index a071b31e5a34..183575b49c19 100644 --- a/cluster-autoscaler/cloudprovider/cherryservers/examples/cluster-autoscaler-deployment.yaml +++ b/cluster-autoscaler/cloudprovider/cherryservers/examples/cluster-autoscaler-deployment.yaml @@ -32,7 +32,7 @@ spec: serviceAccountName: cluster-autoscaler containers: - name: cluster-autoscaler - image: k8s.gcr.io/autoscaling/cluster-autoscaler:latest + image: registry.k8s.io/autoscaling/cluster-autoscaler:latest imagePullPolicy: Always env: - name: BOOTSTRAP_TOKEN_ID diff --git a/cluster-autoscaler/cloudprovider/civo/examples/cluster-autoscaler-standard.yaml b/cluster-autoscaler/cloudprovider/civo/examples/cluster-autoscaler-standard.yaml index 914733ca6078..e4a801467a1a 100644 --- a/cluster-autoscaler/cloudprovider/civo/examples/cluster-autoscaler-standard.yaml +++ b/cluster-autoscaler/cloudprovider/civo/examples/cluster-autoscaler-standard.yaml @@ -139,7 +139,7 @@ spec: spec: serviceAccountName: cluster-autoscaler containers: - - image: k8s.gcr.io/autoscaling/cluster-autoscaler:v1.25.0 # or your custom image + - image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.25.0 # or your custom image name: cluster-autoscaler imagePullPolicy: Always resources: diff --git a/cluster-autoscaler/cloudprovider/exoscale/examples/cluster-autoscaler-run-on-control-plane.yaml b/cluster-autoscaler/cloudprovider/exoscale/examples/cluster-autoscaler-run-on-control-plane.yaml index 031c2065c158..ac3c378f6def 100644 --- a/cluster-autoscaler/cloudprovider/exoscale/examples/cluster-autoscaler-run-on-control-plane.yaml +++ b/cluster-autoscaler/cloudprovider/exoscale/examples/cluster-autoscaler-run-on-control-plane.yaml @@ -143,7 +143,7 @@ spec: serviceAccountName: cluster-autoscaler containers: - name: cluster-autoscaler - image: k8s.gcr.io/autoscaling/cluster-autoscaler:v1.24.0 + image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.24.0 imagePullPolicy: "Always" resources: limits: diff --git a/cluster-autoscaler/cloudprovider/exoscale/examples/cluster-autoscaler.yaml b/cluster-autoscaler/cloudprovider/exoscale/examples/cluster-autoscaler.yaml index 48e8320f711e..f1c264b1def5 100644 --- a/cluster-autoscaler/cloudprovider/exoscale/examples/cluster-autoscaler.yaml +++ b/cluster-autoscaler/cloudprovider/exoscale/examples/cluster-autoscaler.yaml @@ -143,7 +143,7 @@ spec: serviceAccountName: cluster-autoscaler containers: - name: cluster-autoscaler - image: k8s.gcr.io/autoscaling/cluster-autoscaler:v1.24.0 + image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.24.0 imagePullPolicy: "Always" resources: limits: diff --git a/cluster-autoscaler/cloudprovider/externalgrpc/examples/cluster-autoscaler-manifests/cluster-autoscaler.yaml b/cluster-autoscaler/cloudprovider/externalgrpc/examples/cluster-autoscaler-manifests/cluster-autoscaler.yaml index 930db9a5bd63..258f28fc29e7 100644 --- a/cluster-autoscaler/cloudprovider/externalgrpc/examples/cluster-autoscaler-manifests/cluster-autoscaler.yaml +++ b/cluster-autoscaler/cloudprovider/externalgrpc/examples/cluster-autoscaler-manifests/cluster-autoscaler.yaml @@ -139,7 +139,7 @@ spec: spec: serviceAccountName: cluster-autoscaler containers: - - image: k8s.gcr.io/autoscaling/cluster-autoscaler:latest + - image: registry.k8s.io/autoscaling/cluster-autoscaler:latest name: cluster-autoscaler resources: limits: diff --git a/cluster-autoscaler/cloudprovider/hetzner/examples/cluster-autoscaler-run-on-master.yaml b/cluster-autoscaler/cloudprovider/hetzner/examples/cluster-autoscaler-run-on-master.yaml index a0bf5d4c60a4..496c3551d858 100644 --- a/cluster-autoscaler/cloudprovider/hetzner/examples/cluster-autoscaler-run-on-master.yaml +++ b/cluster-autoscaler/cloudprovider/hetzner/examples/cluster-autoscaler-run-on-master.yaml @@ -152,7 +152,7 @@ spec: - key: node-role.kubernetes.io/master operator: Exists containers: - - image: k8s.gcr.io/autoscaling/cluster-autoscaler:latest # or your custom image + - image: registry.k8s.io/autoscaling/cluster-autoscaler:latest # or your custom image name: cluster-autoscaler resources: limits: diff --git a/cluster-autoscaler/cloudprovider/huaweicloud/README.md b/cluster-autoscaler/cloudprovider/huaweicloud/README.md index a50536e42823..23588d551bd2 100644 --- a/cluster-autoscaler/cloudprovider/huaweicloud/README.md +++ b/cluster-autoscaler/cloudprovider/huaweicloud/README.md @@ -151,7 +151,7 @@ dns: {} etcd: local: dataDir: /var/lib/etcd -imageRepository: k8s.gcr.io +imageRepository: registry.k8s.io kind: ClusterConfiguration kubernetesVersion: 1.22.0 networking: diff --git a/cluster-autoscaler/cloudprovider/ionoscloud/examples/cluster-autoscaler-standard.yaml b/cluster-autoscaler/cloudprovider/ionoscloud/examples/cluster-autoscaler-standard.yaml index 2e555da686cf..cad5902f7b7d 100644 --- a/cluster-autoscaler/cloudprovider/ionoscloud/examples/cluster-autoscaler-standard.yaml +++ b/cluster-autoscaler/cloudprovider/ionoscloud/examples/cluster-autoscaler-standard.yaml @@ -148,7 +148,7 @@ spec: spec: serviceAccountName: cluster-autoscaler containers: - - image: k8s.gcr.io/autoscaling/cluster-autoscaler:latest # or your custom image + - image: registry.k8s.io/autoscaling/cluster-autoscaler:latest # or your custom image name: cluster-autoscaler imagePullPolicy: Always resources: diff --git a/cluster-autoscaler/cloudprovider/kamatera/examples/deployment.yaml b/cluster-autoscaler/cloudprovider/kamatera/examples/deployment.yaml index 5a914757d6eb..667f7cced964 100644 --- a/cluster-autoscaler/cloudprovider/kamatera/examples/deployment.yaml +++ b/cluster-autoscaler/cloudprovider/kamatera/examples/deployment.yaml @@ -171,7 +171,7 @@ spec: spec: serviceAccountName: cluster-autoscaler containers: - - image: k8s.gcr.io/cluster-autoscaler:{{ ca_version }} + - image: registry.k8s.io/cluster-autoscaler:{{ ca_version }} name: cluster-autoscaler command: - ./cluster-autoscaler diff --git a/cluster-autoscaler/cloudprovider/linode/examples/cluster-autoscaler-autodiscover.yaml b/cluster-autoscaler/cloudprovider/linode/examples/cluster-autoscaler-autodiscover.yaml index 68875aaee51e..16d238cce415 100644 --- a/cluster-autoscaler/cloudprovider/linode/examples/cluster-autoscaler-autodiscover.yaml +++ b/cluster-autoscaler/cloudprovider/linode/examples/cluster-autoscaler-autodiscover.yaml @@ -139,7 +139,7 @@ spec: spec: serviceAccountName: cluster-autoscaler containers: - - image: k8s.gcr.io/autoscaling/cluster-autoscaler:latest + - image: registry.k8s.io/autoscaling/cluster-autoscaler:latest name: cluster-autoscaler resources: limits: diff --git a/cluster-autoscaler/cloudprovider/oci/README.md b/cluster-autoscaler/cloudprovider/oci/README.md index 74031eddf6fd..61fb4055ce05 100644 --- a/cluster-autoscaler/cloudprovider/oci/README.md +++ b/cluster-autoscaler/cloudprovider/oci/README.md @@ -172,7 +172,7 @@ Note the 3 specified instance-pools are intended to correspond to different avai ```yaml ... containers: - - image: k8s.gcr.io/autoscaling/cluster-autoscaler:{{ ca_version }} + - image: registry.k8s.io/autoscaling/cluster-autoscaler:{{ ca_version }} name: cluster-autoscaler command: - ./cluster-autoscaler diff --git a/cluster-autoscaler/cloudprovider/oci/examples/oci-ip-cluster-autoscaler-w-config.yaml b/cluster-autoscaler/cloudprovider/oci/examples/oci-ip-cluster-autoscaler-w-config.yaml index a2c35b6a7fcc..594f04e96246 100644 --- a/cluster-autoscaler/cloudprovider/oci/examples/oci-ip-cluster-autoscaler-w-config.yaml +++ b/cluster-autoscaler/cloudprovider/oci/examples/oci-ip-cluster-autoscaler-w-config.yaml @@ -141,7 +141,7 @@ spec: spec: serviceAccountName: cluster-autoscaler containers: - - image: k8s.gcr.io/autoscaling/cluster-autoscaler:{{ ca_version }} + - image: registry.k8s.io/autoscaling/cluster-autoscaler:{{ ca_version }} name: cluster-autoscaler command: - ./cluster-autoscaler diff --git a/cluster-autoscaler/cloudprovider/oci/examples/oci-ip-cluster-autoscaler-w-principals.yaml b/cluster-autoscaler/cloudprovider/oci/examples/oci-ip-cluster-autoscaler-w-principals.yaml index fa4a8d4700cd..c656e4a847a5 100644 --- a/cluster-autoscaler/cloudprovider/oci/examples/oci-ip-cluster-autoscaler-w-principals.yaml +++ b/cluster-autoscaler/cloudprovider/oci/examples/oci-ip-cluster-autoscaler-w-principals.yaml @@ -141,7 +141,7 @@ spec: spec: serviceAccountName: cluster-autoscaler containers: - - image: k8s.gcr.io/autoscaling/cluster-autoscaler:{{ ca_version }} + - image: registry.k8s.io/autoscaling/cluster-autoscaler:{{ ca_version }} name: cluster-autoscaler command: - ./cluster-autoscaler diff --git a/cluster-autoscaler/cloudprovider/packet/examples/cluster-autoscaler-deployment.yaml b/cluster-autoscaler/cloudprovider/packet/examples/cluster-autoscaler-deployment.yaml index b006d6c95d6c..a2ca17731a98 100644 --- a/cluster-autoscaler/cloudprovider/packet/examples/cluster-autoscaler-deployment.yaml +++ b/cluster-autoscaler/cloudprovider/packet/examples/cluster-autoscaler-deployment.yaml @@ -147,7 +147,7 @@ spec: serviceAccountName: cluster-autoscaler containers: - name: cluster-autoscaler - image: k8s.gcr.io/autoscaling/cluster-autoscaler:latest + image: registry.k8s.io/autoscaling/cluster-autoscaler:latest imagePullPolicy: Always env: - name: BOOTSTRAP_TOKEN_ID diff --git a/cluster-autoscaler/cloudprovider/vultr/examples/cluster-autoscaler-deployment.yaml b/cluster-autoscaler/cloudprovider/vultr/examples/cluster-autoscaler-deployment.yaml index f72f5bba1e15..b0eef7dfb028 100644 --- a/cluster-autoscaler/cloudprovider/vultr/examples/cluster-autoscaler-deployment.yaml +++ b/cluster-autoscaler/cloudprovider/vultr/examples/cluster-autoscaler-deployment.yaml @@ -136,7 +136,7 @@ spec: spec: serviceAccountName: cluster-autoscaler containers: - - image: k8s.gcr.io/autoscaling/cluster-autoscaler:latest + - image: registry.k8s.io/autoscaling/cluster-autoscaler:latest name: cluster-autoscaler resources: limits: diff --git a/vertical-pod-autoscaler/deploy/admission-controller-deployment.yaml b/vertical-pod-autoscaler/deploy/admission-controller-deployment.yaml index c681dc87f3be..da2b4bcc587f 100644 --- a/vertical-pod-autoscaler/deploy/admission-controller-deployment.yaml +++ b/vertical-pod-autoscaler/deploy/admission-controller-deployment.yaml @@ -20,7 +20,7 @@ spec: runAsUser: 65534 # nobody containers: - name: admission-controller - image: k8s.gcr.io/autoscaling/vpa-admission-controller:0.13.0 + image: registry.k8s.io/autoscaling/vpa-admission-controller:0.13.0 imagePullPolicy: Always env: - name: NAMESPACE diff --git a/vertical-pod-autoscaler/deploy/recommender-deployment-high.yaml b/vertical-pod-autoscaler/deploy/recommender-deployment-high.yaml index ea0c992eb717..d6e079e3f853 100644 --- a/vertical-pod-autoscaler/deploy/recommender-deployment-high.yaml +++ b/vertical-pod-autoscaler/deploy/recommender-deployment-high.yaml @@ -26,7 +26,7 @@ spec: runAsUser: 65534 # nobody containers: - name: recommender - image: k8s.gcr.io/autoscaling/vpa-recommender:0.13.0 + image: registry.k8s.io/autoscaling/vpa-recommender:0.13.0 imagePullPolicy: Always args: - --name=performance diff --git a/vertical-pod-autoscaler/deploy/recommender-deployment-low.yaml b/vertical-pod-autoscaler/deploy/recommender-deployment-low.yaml index 300b6d34e1ca..cdb25b57fd47 100644 --- a/vertical-pod-autoscaler/deploy/recommender-deployment-low.yaml +++ b/vertical-pod-autoscaler/deploy/recommender-deployment-low.yaml @@ -26,7 +26,7 @@ spec: runAsUser: 65534 # nobody containers: - name: recommender - image: k8s.gcr.io/autoscaling/vpa-recommender:0.13.0 + image: registry.k8s.io/autoscaling/vpa-recommender:0.13.0 imagePullPolicy: Always args: - --name=frugal diff --git a/vertical-pod-autoscaler/deploy/recommender-deployment.yaml b/vertical-pod-autoscaler/deploy/recommender-deployment.yaml index 7d16af0be8ef..38a728c79773 100644 --- a/vertical-pod-autoscaler/deploy/recommender-deployment.yaml +++ b/vertical-pod-autoscaler/deploy/recommender-deployment.yaml @@ -20,7 +20,7 @@ spec: runAsUser: 65534 # nobody containers: - name: recommender - image: k8s.gcr.io/autoscaling/vpa-recommender:0.13.0 + image: registry.k8s.io/autoscaling/vpa-recommender:0.13.0 imagePullPolicy: Always resources: limits: diff --git a/vertical-pod-autoscaler/deploy/updater-deployment.yaml b/vertical-pod-autoscaler/deploy/updater-deployment.yaml index 9db6a4c7bcac..0d6287b706da 100644 --- a/vertical-pod-autoscaler/deploy/updater-deployment.yaml +++ b/vertical-pod-autoscaler/deploy/updater-deployment.yaml @@ -20,7 +20,7 @@ spec: runAsUser: 65534 # nobody containers: - name: updater - image: k8s.gcr.io/autoscaling/vpa-updater:0.13.0 + image: registry.k8s.io/autoscaling/vpa-updater:0.13.0 imagePullPolicy: Always env: - name: NAMESPACE diff --git a/vertical-pod-autoscaler/e2e/v1/actuation.go b/vertical-pod-autoscaler/e2e/v1/actuation.go index 6038db8cd378..eb4b1b632f27 100644 --- a/vertical-pod-autoscaler/e2e/v1/actuation.go +++ b/vertical-pod-autoscaler/e2e/v1/actuation.go @@ -302,7 +302,7 @@ var _ = ActuationSuiteE2eDescribe("Actuation", func() { // TODO(krzysied): Update the image url when the agnhost:2.10 image // is promoted to the k8s-e2e-test-images repository. agnhostImage = "gcr.io/k8s-staging-e2e-test-images/agnhost:2.10" - sidecarParam = "--sidecar-image=k8s.gcr.io/pause:3.1" + sidecarParam = "--sidecar-image=registry.k8s.io/pause:3.1" sidecarName = "webhook-added-sidecar" servicePort = int32(8443) containerPort = int32(8444) diff --git a/vertical-pod-autoscaler/e2e/v1/common.go b/vertical-pod-autoscaler/e2e/v1/common.go index 16d21f5c0cd5..a098de25aa02 100644 --- a/vertical-pod-autoscaler/e2e/v1/common.go +++ b/vertical-pod-autoscaler/e2e/v1/common.go @@ -144,7 +144,7 @@ func NewNHamstersDeployment(f *framework.Framework, n int) *appsv1.Deployment { defaultHamsterReplicas, /*replicas*/ hamsterLabels, /*podLabels*/ GetHamsterContainerNameByIndex(0), /*imageName*/ - "k8s.gcr.io/ubuntu-slim:0.1", /*image*/ + "registry.k8s.io/ubuntu-slim:0.1", /*image*/ appsv1.RollingUpdateDeploymentStrategyType, /*strategyType*/ ) d.ObjectMeta.Namespace = f.Namespace.Name @@ -278,7 +278,7 @@ func SetupHamsterContainer(cpu, memory string) apiv1.Container { return apiv1.Container{ Name: "hamster", - Image: "k8s.gcr.io/ubuntu-slim:0.1", + Image: "registry.k8s.io/ubuntu-slim:0.1", Resources: apiv1.ResourceRequirements{ Requests: apiv1.ResourceList{ apiv1.ResourceCPU: cpuQuantity, diff --git a/vertical-pod-autoscaler/e2e/v1beta2/actuation.go b/vertical-pod-autoscaler/e2e/v1beta2/actuation.go index ad915675fe8a..566ce61acbce 100644 --- a/vertical-pod-autoscaler/e2e/v1beta2/actuation.go +++ b/vertical-pod-autoscaler/e2e/v1beta2/actuation.go @@ -290,7 +290,7 @@ var _ = ActuationSuiteE2eDescribe("Actuation", func() { // TODO(krzysied): Update the image url when the agnhost:2.10 image // is promoted to the k8s-e2e-test-images repository. agnhostImage = "gcr.io/k8s-staging-e2e-test-images/agnhost:2.10" - sidecarParam = "--sidecar-image=k8s.gcr.io/pause:3.1" + sidecarParam = "--sidecar-image=registry.k8s.io/pause:3.1" sidecarName = "webhook-added-sidecar" servicePort = int32(8443) containerPort = int32(8444) diff --git a/vertical-pod-autoscaler/e2e/v1beta2/common.go b/vertical-pod-autoscaler/e2e/v1beta2/common.go index b3f4e8771a25..efd2392847b5 100644 --- a/vertical-pod-autoscaler/e2e/v1beta2/common.go +++ b/vertical-pod-autoscaler/e2e/v1beta2/common.go @@ -144,7 +144,7 @@ func NewNHamstersDeployment(f *framework.Framework, n int) *appsv1.Deployment { defaultHamsterReplicas, /*replicas*/ hamsterLabels, /*podLabels*/ GetHamsterContainerNameByIndex(0), /*imageName*/ - "k8s.gcr.io/ubuntu-slim:0.1", /*image*/ + "registry.k8s.io/ubuntu-slim:0.1", /*image*/ appsv1.RollingUpdateDeploymentStrategyType, /*strategyType*/ ) d.ObjectMeta.Namespace = f.Namespace.Name @@ -279,7 +279,7 @@ func SetupHamsterContainer(cpu, memory string) apiv1.Container { return apiv1.Container{ Name: "hamster", - Image: "k8s.gcr.io/ubuntu-slim:0.1", + Image: "registry.k8s.io/ubuntu-slim:0.1", Resources: apiv1.ResourceRequirements{ Requests: apiv1.ResourceList{ apiv1.ResourceCPU: cpuQuantity, diff --git a/vertical-pod-autoscaler/examples/hamster-deprecated.yaml b/vertical-pod-autoscaler/examples/hamster-deprecated.yaml index e613121cc501..6586f6aa0acc 100644 --- a/vertical-pod-autoscaler/examples/hamster-deprecated.yaml +++ b/vertical-pod-autoscaler/examples/hamster-deprecated.yaml @@ -31,7 +31,7 @@ spec: spec: containers: - name: hamster - image: k8s.gcr.io/ubuntu-slim:0.1 + image: registry.k8s.io/ubuntu-slim:0.1 resources: requests: cpu: 100m diff --git a/vertical-pod-autoscaler/examples/hamster.yaml b/vertical-pod-autoscaler/examples/hamster.yaml index a4928605aea5..17ec2ea60d00 100644 --- a/vertical-pod-autoscaler/examples/hamster.yaml +++ b/vertical-pod-autoscaler/examples/hamster.yaml @@ -49,7 +49,7 @@ spec: runAsUser: 65534 # nobody containers: - name: hamster - image: k8s.gcr.io/ubuntu-slim:0.1 + image: registry.k8s.io/ubuntu-slim:0.1 resources: requests: cpu: 100m diff --git a/vertical-pod-autoscaler/examples/redis-deprecated.yaml b/vertical-pod-autoscaler/examples/redis-deprecated.yaml index 13e69c0670b1..d0b122263050 100644 --- a/vertical-pod-autoscaler/examples/redis-deprecated.yaml +++ b/vertical-pod-autoscaler/examples/redis-deprecated.yaml @@ -26,7 +26,7 @@ spec: spec: containers: - name: master - image: k8s.gcr.io/redis:e2e # or just image: redis + image: registry.k8s.io/redis:e2e # or just image: redis resources: requests: cpu: 100m diff --git a/vertical-pod-autoscaler/examples/redis.yaml b/vertical-pod-autoscaler/examples/redis.yaml index 00266d759c50..84539b6db9c2 100644 --- a/vertical-pod-autoscaler/examples/redis.yaml +++ b/vertical-pod-autoscaler/examples/redis.yaml @@ -27,7 +27,7 @@ spec: spec: containers: - name: master - image: k8s.gcr.io/redis:e2e # or just image: redis + image: registry.k8s.io/redis:e2e # or just image: redis resources: requests: cpu: 100m diff --git a/vertical-pod-autoscaler/hack/vpa-process-yaml.sh b/vertical-pod-autoscaler/hack/vpa-process-yaml.sh index e5d9dc97d6d4..f843d11a8e95 100755 --- a/vertical-pod-autoscaler/hack/vpa-process-yaml.sh +++ b/vertical-pod-autoscaler/hack/vpa-process-yaml.sh @@ -31,7 +31,7 @@ if [ $# -eq 0 ]; then exit 1 fi -DEFAULT_REGISTRY="k8s.gcr.io/autoscaling" +DEFAULT_REGISTRY="registry.k8s.io/autoscaling" DEFAULT_TAG="0.13.0" REGISTRY_TO_APPLY=${REGISTRY-$DEFAULT_REGISTRY} From 773a3716b472c8c00ed9ca4e4d1912eaea4647ab Mon Sep 17 00:00:00 2001 From: salasberryfin Date: Fri, 10 Feb 2023 10:50:27 +0100 Subject: [PATCH 2/3] revert changes in /vendor specific files --- addon-resizer/vendor/k8s.io/api/core/v1/generated.proto | 2 +- addon-resizer/vendor/k8s.io/api/core/v1/types.go | 2 +- .../vendor/k8s.io/api/core/v1/types_swagger_doc_generated.go | 2 +- vertical-pod-autoscaler/e2e/v1/common.go | 2 +- vertical-pod-autoscaler/e2e/v1beta2/common.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addon-resizer/vendor/k8s.io/api/core/v1/generated.proto b/addon-resizer/vendor/k8s.io/api/core/v1/generated.proto index 7ec373145d7c..b4d75069f7ef 100644 --- a/addon-resizer/vendor/k8s.io/api/core/v1/generated.proto +++ b/addon-resizer/vendor/k8s.io/api/core/v1/generated.proto @@ -723,7 +723,7 @@ message Container { // Describe a container image message ContainerImage { // Names by which this image is known. - // e.g. ["registry.k8s.io/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"] + // e.g. ["k8s.gcr.io/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"] repeated string names = 1; // The size of the image in bytes. diff --git a/addon-resizer/vendor/k8s.io/api/core/v1/types.go b/addon-resizer/vendor/k8s.io/api/core/v1/types.go index 7ba740ee1f7b..b941e0ac2e08 100644 --- a/addon-resizer/vendor/k8s.io/api/core/v1/types.go +++ b/addon-resizer/vendor/k8s.io/api/core/v1/types.go @@ -3993,7 +3993,7 @@ type PodSignature struct { // Describe a container image type ContainerImage struct { // Names by which this image is known. - // e.g. ["registry.k8s.io/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"] + // e.g. ["k8s.gcr.io/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"] Names []string `json:"names" protobuf:"bytes,1,rep,name=names"` // The size of the image in bytes. // +optional diff --git a/addon-resizer/vendor/k8s.io/api/core/v1/types_swagger_doc_generated.go b/addon-resizer/vendor/k8s.io/api/core/v1/types_swagger_doc_generated.go index 9707b17a8f42..5b4e173db245 100644 --- a/addon-resizer/vendor/k8s.io/api/core/v1/types_swagger_doc_generated.go +++ b/addon-resizer/vendor/k8s.io/api/core/v1/types_swagger_doc_generated.go @@ -340,7 +340,7 @@ func (Container) SwaggerDoc() map[string]string { var map_ContainerImage = map[string]string{ "": "Describe a container image", - "names": "Names by which this image is known. e.g. [\"registry.k8s.io/hyperkube:v1.0.7\", \"dockerhub.io/google_containers/hyperkube:v1.0.7\"]", + "names": "Names by which this image is known. e.g. [\"k8s.gcr.io/hyperkube:v1.0.7\", \"dockerhub.io/google_containers/hyperkube:v1.0.7\"]", "sizeBytes": "The size of the image in bytes.", } diff --git a/vertical-pod-autoscaler/e2e/v1/common.go b/vertical-pod-autoscaler/e2e/v1/common.go index a098de25aa02..c90ec6fc8b2d 100644 --- a/vertical-pod-autoscaler/e2e/v1/common.go +++ b/vertical-pod-autoscaler/e2e/v1/common.go @@ -144,7 +144,7 @@ func NewNHamstersDeployment(f *framework.Framework, n int) *appsv1.Deployment { defaultHamsterReplicas, /*replicas*/ hamsterLabels, /*podLabels*/ GetHamsterContainerNameByIndex(0), /*imageName*/ - "registry.k8s.io/ubuntu-slim:0.1", /*image*/ + "registry.k8s.io/ubuntu-slim:0.1", /*image*/ appsv1.RollingUpdateDeploymentStrategyType, /*strategyType*/ ) d.ObjectMeta.Namespace = f.Namespace.Name diff --git a/vertical-pod-autoscaler/e2e/v1beta2/common.go b/vertical-pod-autoscaler/e2e/v1beta2/common.go index efd2392847b5..b4e31bd8a1af 100644 --- a/vertical-pod-autoscaler/e2e/v1beta2/common.go +++ b/vertical-pod-autoscaler/e2e/v1beta2/common.go @@ -144,7 +144,7 @@ func NewNHamstersDeployment(f *framework.Framework, n int) *appsv1.Deployment { defaultHamsterReplicas, /*replicas*/ hamsterLabels, /*podLabels*/ GetHamsterContainerNameByIndex(0), /*imageName*/ - "registry.k8s.io/ubuntu-slim:0.1", /*image*/ + "registry.k8s.io/ubuntu-slim:0.1", /*image*/ appsv1.RollingUpdateDeploymentStrategyType, /*strategyType*/ ) d.ObjectMeta.Namespace = f.Namespace.Name From 66911412a47f59c67415f0e973fb83dbe8f5085d Mon Sep 17 00:00:00 2001 From: salasberryfin Date: Mon, 13 Feb 2023 08:56:24 +0100 Subject: [PATCH 3/3] increment cluster-autoscaler Helm chart version --- charts/cluster-autoscaler/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/cluster-autoscaler/Chart.yaml b/charts/cluster-autoscaler/Chart.yaml index c2b962cce174..43d4d9753842 100644 --- a/charts/cluster-autoscaler/Chart.yaml +++ b/charts/cluster-autoscaler/Chart.yaml @@ -11,4 +11,4 @@ name: cluster-autoscaler sources: - https://github.com/kubernetes/autoscaler/tree/master/cluster-autoscaler type: application -version: 9.23.2 +version: 9.24.0