Merge pull request #300 from spiffxp/use-k8s-staging-ci-images

📖 use k8s-staging-ci-images vs kubernetes-ci-images
kubernetes-retired · Jul 29, 2021 · 22ae5f0 · 22ae5f0
2 parents 632119d + ce0edc5
commit 22ae5f0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml b/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml
@@ -268,7 +268,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` will
+                    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.
                   type: string

diff --git a/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml b/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml
@@ -286,7 +286,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/kubeadm/v1beta1/types.go b/kubeadm/v1beta1/types.go
@@ -116,7 +116,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/kubeadm/v1beta2/types.go b/kubeadm/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"`