Migrate gcr.io/kubernetes-ci-images to gcr.io/k8s-staging-ci-images

kubernetes-sigs · Feb 3, 2021 · 9df9a54 · 9df9a54
1 parent 74c7ae2
commit 9df9a54
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml b/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml
@@ -269,7 +269,7 @@ spec:
                     description: ImageRepository sets the container registry to pull
                       images from. If empty, `k8s.gcr.io` will be used by default;
                       in case of kubernetes version is a CI build (kubernetes version
-                      starts with `ci/` or `ci-cross/`) `gcr.io/kubernetes-ci-images`
+                      starts with `ci/` or `ci-cross/`) `gcr.io/k8s-staging-ci-images`
                       will be used as a default for control plane components and for
                       kube-proxy, while `k8s.gcr.io` will be used for all the other
                       images.
@@ -1079,7 +1079,7 @@ spec:
                     description: ImageRepository sets the container registry to pull
                       images from. If empty, `k8s.gcr.io` will be used by default;
                       in case of kubernetes version is a CI build (kubernetes version
-                      starts with `ci/` or `ci-cross/`) `gcr.io/kubernetes-ci-images`
+                      starts with `ci/` or `ci-cross/`) `gcr.io/k8s-staging-ci-images`
                       will be used as a default for control plane components and for
                       kube-proxy, while `k8s.gcr.io` will be used for all the other
                       images.

diff --git a/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml b/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml
@@ -290,7 +290,7 @@ spec:
                               to pull images from. If empty, `k8s.gcr.io` will be
                               used by default; in case of kubernetes version is a
                               CI build (kubernetes version starts with `ci/` or `ci-cross/`)
-                              `gcr.io/kubernetes-ci-images` will be used as a default
+                              `gcr.io/k8s-staging-ci-images` will be used as a default
                               for control plane components and for kube-proxy, while
                               `k8s.gcr.io` will be used for all the other images.
                             type: string
@@ -1134,7 +1134,7 @@ spec:
                               to pull images from. If empty, `k8s.gcr.io` will be
                               used by default; in case of kubernetes version is a
                               CI build (kubernetes version starts with `ci/` or `ci-cross/`)
-                              `gcr.io/kubernetes-ci-images` will be used as a default
+                              `gcr.io/k8s-staging-ci-images` will be used as a default
                               for control plane components and for kube-proxy, while
                               `k8s.gcr.io` will be used for all the other images.
                             type: string

diff --git a/bootstrap/kubeadm/types/v1beta1/types.go b/bootstrap/kubeadm/types/v1beta1/types.go
@@ -108,7 +108,7 @@ type ClusterConfiguration struct {
 
 	// ImageRepository sets the container registry to pull images from.
 	// If empty, `k8s.gcr.io` will be used by default; in case of kubernetes version is a CI build (kubernetes version starts with `ci/` or `ci-cross/`)
-	// `gcr.io/kubernetes-ci-images` will be used as a default for control plane components and for kube-proxy, while `k8s.gcr.io`
+	// `gcr.io/k8s-staging-ci-images` will be used as a default for control plane components and for kube-proxy, while `k8s.gcr.io`
 	// will be used for all the other images.
 	// +optional
 	ImageRepository string `json:"imageRepository,omitempty"`

diff --git a/bootstrap/kubeadm/types/v1beta2/types.go b/bootstrap/kubeadm/types/v1beta2/types.go
@@ -97,7 +97,7 @@ type ClusterConfiguration struct {
 
 	// ImageRepository sets the container registry to pull images from.
 	// If empty, `k8s.gcr.io` will be used by default; in case of kubernetes version is a CI build (kubernetes version starts with `ci/` or `ci-cross/`)
-	// `gcr.io/kubernetes-ci-images` will be used as a default for control plane components and for kube-proxy, while `k8s.gcr.io`
+	// `gcr.io/k8s-staging-ci-images` will be used as a default for control plane components and for kube-proxy, while `k8s.gcr.io`
 	// will be used for all the other images.
 	ImageRepository string `json:"imageRepository,omitempty"`
 

diff --git a/...rolplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml b/...rolplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml
@@ -348,7 +348,7 @@ spec:
                         description: ImageRepository sets the container registry to
                           pull images from. If empty, `k8s.gcr.io` will be used by
                           default; in case of kubernetes version is a CI build (kubernetes
-                          version starts with `ci/` or `ci-cross/`) `gcr.io/kubernetes-ci-images`
+                          version starts with `ci/` or `ci-cross/`) `gcr.io/k8s-staging-ci-images`
                           will be used as a default for control plane components and
                           for kube-proxy, while `k8s.gcr.io` will be used for all
                           the other images.

diff --git a/test/framework/kubernetesversions/data/debian_injection_script.envsubst.sh b/test/framework/kubernetesversions/data/debian_injection_script.envsubst.sh
@@ -95,7 +95,7 @@ if [[ "$${KUBERNETES_VERSION}" != "" ]]; then
     $${GSUTIL} cp "$${CI_URL}/$${CI_CONTAINER}.$${CONTAINER_EXT}" "$${CI_DIR}/$${CI_CONTAINER}.$${CONTAINER_EXT}"
     $${SUDO} ctr -n k8s.io images import "$${CI_DIR}/$${CI_CONTAINER}.$${CONTAINER_EXT}" || echo "* ignoring expected 'ctr images import' result"
     $${SUDO} ctr -n k8s.io images tag "k8s.gcr.io/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "k8s.gcr.io/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
-    $${SUDO} ctr -n k8s.io images tag "k8s.gcr.io/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/kubernetes-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
+    $${SUDO} ctr -n k8s.io images tag "k8s.gcr.io/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/k8s-staging-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
   done
 fi
 echo "* checking binary versions"

diff --git a/test/framework/kubetest/run.go b/test/framework/kubetest/run.go
@@ -35,7 +35,7 @@ import (
 
 const (
 	standardImage   = "us.gcr.io/k8s-artifacts-prod/conformance"
-	ciArtifactImage = "gcr.io/kubernetes-ci-images/conformance"
+	ciArtifactImage = "gcr.io/k8s-staging-ci-images/conformance"
 )
 
 const (
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,7 @@ import ( @@
     const (
     	standardImage   = "us.gcr.io/k8s-artifacts-prod/conformance"
-    	ciArtifactImage = "gcr.io/kubernetes-ci-images/conformance"
+    	ciArtifactImage = "gcr.io/k8s-staging-ci-images/conformance"
     )
     const (
@@ Expand Down @@