From 621c4aa59944bcde0c975af11efe5dfded346e0c Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Wed, 13 Apr 2022 16:50:55 -0400 Subject: [PATCH] etcd: Update container repo to gcr.io/etcd-development/etcd Signed-off-by: Stephen Augustus --- build/dependencies.yaml | 2 +- pkg/credentialprovider/keyring.go | 2 +- .../kube-aggregator/artifacts/self-contained/etcd-pod.yaml | 2 +- .../k8s.io/sample-apiserver/artifacts/example/deployment.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 1170012a9b1..930f3ca926d 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -66,7 +66,7 @@ dependencies: - path: hack/lib/etcd.sh match: ETCD_VERSION= - path: staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml - match: quay.io/coreos/etcd + match: gcr.io/etcd-development/etcd - path: test/e2e/framework/nodes_util.go match: const etcdImage - path: test/utils/image/manifest.go diff --git a/pkg/credentialprovider/keyring.go b/pkg/credentialprovider/keyring.go index 0af960a384f..4bbe5c4d9f1 100644 --- a/pkg/credentialprovider/keyring.go +++ b/pkg/credentialprovider/keyring.go @@ -120,7 +120,7 @@ func (dk *BasicDockerKeyring) Add(cfg DockerConfig) { // Update the index used to identify which credentials to use for a given // image. The index is reverse-sorted so more specific paths are matched - // first. For example, if for the given image "quay.io/coreos/etcd", + // first. For example, if for the given image "gcr.io/etcd-development/etcd", // credentials for "quay.io/coreos" should match before "quay.io". sort.Sort(sort.Reverse(sort.StringSlice(dk.index))) } diff --git a/staging/src/k8s.io/kube-aggregator/artifacts/self-contained/etcd-pod.yaml b/staging/src/k8s.io/kube-aggregator/artifacts/self-contained/etcd-pod.yaml index 2d604a25501..61fec7092fa 100644 --- a/staging/src/k8s.io/kube-aggregator/artifacts/self-contained/etcd-pod.yaml +++ b/staging/src/k8s.io/kube-aggregator/artifacts/self-contained/etcd-pod.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: etcd - image: quay.io/coreos/etcd:v3.0.15 + image: gcr.io/etcd-development/etcd:v3.0.15 command: - "etcd" - "--listen-client-urls=https://0.0.0.0:4001" diff --git a/staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml b/staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml index a940b3aa5fc..cc485b99d0d 100644 --- a/staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml +++ b/staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml @@ -26,4 +26,4 @@ spec: imagePullPolicy: Never args: [ "--etcd-servers=http://localhost:2379" ] - name: etcd - image: quay.io/coreos/etcd:v3.5.3 + image: gcr.io/etcd-development/etcd:v3.5.3