From 99dd7570eb59a4ff040a7656c9d2b879f47acc59 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Wed, 22 Jul 2020 15:28:13 -0400 Subject: [PATCH] [VDF] Remove references to gcr.io/google-containers Signed-off-by: Stephen Augustus --- cluster/addons/addon-manager/README.md | 2 +- .../k8s.io/apiserver/pkg/server/egressselector/config_test.go | 2 +- .../testing-manifests/scheduling/nvidia-driver-installer.yaml | 2 +- test/utils/image/manifest.go | 4 ---- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/cluster/addons/addon-manager/README.md b/cluster/addons/addon-manager/README.md index 9a8dbe46b2d..1eb56afea3d 100644 --- a/cluster/addons/addon-manager/README.md +++ b/cluster/addons/addon-manager/README.md @@ -25,7 +25,7 @@ Otherwise it will be omitted. #### Images -addon-manager images are pushed to `k8s.gcr.io`. As addon-manager is built for multiple architectures, there is an image per architecture in the format - `k8s.gcr.io/kube-addon-manager-$(ARCH):$(VERSION)`. The list of existing images and version can be found in gcr.io/google-containers/. +addon-manager images are pushed to `k8s.gcr.io`. As addon-manager is built for multiple architectures, there is an image per architecture in the format - `k8s.gcr.io/kube-addon-manager-$(ARCH):$(VERSION)`. #### How to release diff --git a/staging/src/k8s.io/apiserver/pkg/server/egressselector/config_test.go b/staging/src/k8s.io/apiserver/pkg/server/egressselector/config_test.go index f01781cf592..9067938e7d5 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/egressselector/config_test.go +++ b/staging/src/k8s.io/apiserver/pkg/server/egressselector/config_test.go @@ -164,7 +164,7 @@ spec: hostPath: path: /etc/srv/kubernetes/pki/konnectivity-agent containers: - - image: gcr.io/google-containers/proxy-agent:v0.0.3 + - image: k8s.gcr.io/proxy-agent:v0.0.3 name: proxy-agent command: ["/proxy-agent"] args: ["--caCert=/etc/srv/kubernetes/pki/proxy-agent/ca.crt", "--agentCert=/etc/srv/kubernetes/pki/proxy-agent/client.crt", "--agentKey=/etc/srv/kubernetes/pki/proxy-agent/client.key", "--proxyServerHost=127.0.0.1", "--proxyServerPort=8132"] diff --git a/test/e2e/testing-manifests/scheduling/nvidia-driver-installer.yaml b/test/e2e/testing-manifests/scheduling/nvidia-driver-installer.yaml index 79eafba0457..53ad25f5dee 100644 --- a/test/e2e/testing-manifests/scheduling/nvidia-driver-installer.yaml +++ b/test/e2e/testing-manifests/scheduling/nvidia-driver-installer.yaml @@ -76,5 +76,5 @@ spec: - name: root-mount mountPath: /root containers: - - image: "gcr.io/google-containers/pause:3.2" + - image: "k8s.gcr.io/pause:3.2" name: pause \ No newline at end of file diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 8153fa926b2..a33f99aa4ee 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -37,8 +37,6 @@ type RegistryList struct { InvalidRegistry string `yaml:"invalidRegistry"` GcRegistry string `yaml:"gcRegistry"` GcrReleaseRegistry string `yaml:"gcrReleaseRegistry"` - // TODO: The last consumer of this has been removed and it should be deprecated - GoogleContainerRegistry string `yaml:"googleContainerRegistry"` PrivateRegistry string `yaml:"privateRegistry"` SampleRegistry string `yaml:"sampleRegistry"` K8sCSI string `yaml:"k8sCSI"` @@ -78,8 +76,6 @@ func initReg() RegistryList { InvalidRegistry: "invalid.com/invalid", GcRegistry: "k8s.gcr.io", GcrReleaseRegistry: "gcr.io/gke-release", - // TODO: The last consumer of this has been removed and it should be deleted - GoogleContainerRegistry: "gcr.io/google-containers", PrivateRegistry: "gcr.io/k8s-authenticated-test", SampleRegistry: "gcr.io/google-samples", K8sCSI: "gcr.io/k8s-staging-csi",