github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #97087 from SataQiu/change-ci-image-repo

Browse Source 
kubeadm: change the default image repository for CI images from gcr.io/kubernetes-ci-images to gcr.io/k8s-staging-ci-images
This commit is contained in:
Kubernetes Prow Robot
2021-01-14 08:55:04 -08:00
committed by GitHub
parent faaae71427 fa04c55ee6
commit d067c2e95d
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/apis/kubeadm/types.go
View File

@@ -107,7 +107,7 @@ type ClusterConfiguration struct {
// ImageRepository sets the container registry to pull images from. // 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/`) // 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. // will be used for all the other images.
ImageRepository string ImageRepository string

2
cmd/kubeadm/app/apis/kubeadm/v1beta1/types.go
View File

@@ -101,7 +101,7 @@ type ClusterConfiguration struct {
// ImageRepository sets the container registry to pull images from. // 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/`) // 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. // will be used for all the other images.
ImageRepository string `json:"imageRepository"` ImageRepository string `json:"imageRepository"`

2
cmd/kubeadm/app/apis/kubeadm/v1beta2/types.go
View File

@@ -97,7 +97,7 @@ type ClusterConfiguration struct {
// ImageRepository sets the container registry to pull images from. // 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/`) // 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. // will be used for all the other images.
ImageRepository string `json:"imageRepository,omitempty"` ImageRepository string `json:"imageRepository,omitempty"`

2
cmd/kubeadm/app/constants/constants.go
View File

@@ -317,7 +317,7 @@ const (
NodeBootstrapTokenAuthGroup = "system:bootstrappers:kubeadm:default-node-token" NodeBootstrapTokenAuthGroup = "system:bootstrappers:kubeadm:default-node-token"
// DefaultCIImageRepository points to image registry where CI uploads images from ci-cross build job // DefaultCIImageRepository points to image registry where CI uploads images from ci-cross build job
DefaultCIImageRepository = "gcr.io/kubernetes-ci-images" DefaultCIImageRepository = "gcr.io/k8s-staging-ci-images"
// CoreDNSConfigMap specifies in what ConfigMap in the kube-system namespace the CoreDNS config should be stored // CoreDNSConfigMap specifies in what ConfigMap in the kube-system namespace the CoreDNS config should be stored
CoreDNSConfigMap = "coredns" CoreDNSConfigMap = "coredns"