github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #103813 from SataQiu/update-kubeadm-ci-bucket

Browse Source 
kubeadm: update references to legacy artifacts locations
This commit is contained in:
Kubernetes Prow Robot 2021-08-05 01:44:27 -07:00 committed by GitHub
commit 90ac41bd77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,7 +116,7 @@ type ClusterConfiguration struct {
CertificatesDir string CertificatesDir string
// 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/`)
// `gcr.io/k8s-staging-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/v1beta2/types.go
View File

@ -96,7 +96,7 @@ type ClusterConfiguration struct {
CertificatesDir string `json:"certificatesDir,omitempty"` CertificatesDir string `json:"certificatesDir,omitempty"`
// 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/`)
// `gcr.io/k8s-staging-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/apis/kubeadm/v1beta3/types.go
View File

@ -121,7 +121,7 @@ type ClusterConfiguration struct {
CertificatesDir string `json:"certificatesDir,omitempty"` CertificatesDir string `json:"certificatesDir,omitempty"`
// 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/`)
// `gcr.io/k8s-staging-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.
// +optional // +optional

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

@ -312,7 +312,7 @@ const (
// NodeBootstrapTokenAuthGroup specifies which group a Node Bootstrap Token should be authenticated in // NodeBootstrapTokenAuthGroup specifies which group a Node Bootstrap Token should be authenticated in
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 build job
DefaultCIImageRepository = "gcr.io/k8s-staging-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

2
cmd/kubeadm/app/util/version.go
View File

@ -43,7 +43,7 @@ var (
kubeCIBucketURL = "https://storage.googleapis.com/k8s-release-dev" kubeCIBucketURL = "https://storage.googleapis.com/k8s-release-dev"
kubeReleaseRegex = regexp.MustCompile(`^v?(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)([-0-9a-zA-Z_\.+]*)?$`) kubeReleaseRegex = regexp.MustCompile(`^v?(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)([-0-9a-zA-Z_\.+]*)?$`)
kubeReleaseLabelRegex = regexp.MustCompile(`^((latest|stable)+(-[1-9](\.[1-9]([0-9])?)?)?)\z`) kubeReleaseLabelRegex = regexp.MustCompile(`^((latest|stable)+(-[1-9](\.[1-9]([0-9])?)?)?)\z`)
kubeBucketPrefixes = regexp.MustCompile(`^((release|ci|ci-cross)/)?([-\w_\.+]+)$`) kubeBucketPrefixes = regexp.MustCompile(`^((release|ci)/)?([-\w_\.+]+)$`)
) )
// KubernetesReleaseVersion is helper function that can fetch // KubernetesReleaseVersion is helper function that can fetch