kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Migrate to registry.k8s.io 

Signed-off-by: Ciprian Hacman <ciprian@hakman.dev>
This commit is contained in:
Ciprian Hacman 2022-03-17 12:45:22 +02:00
parent d751d0f056
commit a4ed2b0654
26 changed files with 80 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -631,7 +631,7 @@ check-markdown-links:
.PHONY: bazel-kube-apiserver-healthcheck-export-linux-amd64 bazel-kube-apiserver-healthcheck-export-linux-arm64
bazel-kube-apiserver-healthcheck-export-linux-amd64 bazel-kube-apiserver-healthcheck-export-linux-arm64: bazel-kube-apiserver-healthcheck-export-linux-%:
mkdir -p ${BAZELIMAGES}
DOCKER_REGISTRY="" DOCKER_IMAGE_PREFIX="k8s.gcr.io/kops/" KUBE_APISERVER_HEALTHCHECK_TAG=${KUBE_APISERVER_HEALTHCHECK_TAG} ${BAZEL} ${BAZEL_OPTIONS} build ${BAZEL_CONFIG} --@io_bazel_rules_go//go/config:pure --platforms=@io_bazel_rules_go//go/toolchain:linux_$* //cmd/kube-apiserver-healthcheck:image-bundle-$*.tar.gz.sha256
DOCKER_REGISTRY="" DOCKER_IMAGE_PREFIX="registry.k8s.io/kops/" KUBE_APISERVER_HEALTHCHECK_TAG=${KUBE_APISERVER_HEALTHCHECK_TAG} ${BAZEL} ${BAZEL_OPTIONS} build ${BAZEL_CONFIG} --@io_bazel_rules_go//go/config:pure --platforms=@io_bazel_rules_go//go/toolchain:linux_$* //cmd/kube-apiserver-healthcheck:image-bundle-$*.tar.gz.sha256
cp -fp ${BAZEL_BIN}/cmd/kube-apiserver-healthcheck/image-bundle-$*.tar.gz ${BAZELIMAGES}/kube-apiserver-healthcheck-$*.tar.gz
cp -fp ${BAZEL_BIN}/cmd/kube-apiserver-healthcheck/image-bundle-$*.tar.gz.sha256 ${BAZELIMAGES}/kube-apiserver-healthcheck-$*.tar.gz.sha256
@ -642,7 +642,7 @@ bazel-kube-apiserver-healthcheck-export: bazel-kube-apiserver-healthcheck-export
.PHONY: bazel-kops-controller-export-linux-amd64 bazel-kops-controller-export-linux-arm64
bazel-kops-controller-export-linux-amd64 bazel-kops-controller-export-linux-arm64: bazel-kops-controller-export-linux-%:
mkdir -p ${BAZELIMAGES}
DOCKER_REGISTRY="" DOCKER_IMAGE_PREFIX="k8s.gcr.io/kops/" KOPS_CONTROLLER_TAG=${KOPS_CONTROLLER_TAG} ${BAZEL} ${BAZEL_OPTIONS} build ${BAZEL_CONFIG} --@io_bazel_rules_go//go/config:pure --platforms=@io_bazel_rules_go//go/toolchain:linux_$* //cmd/kops-controller:image-bundle-$*.tar.gz.sha256
DOCKER_REGISTRY="" DOCKER_IMAGE_PREFIX="registry.k8s.io/kops/" KOPS_CONTROLLER_TAG=${KOPS_CONTROLLER_TAG} ${BAZEL} ${BAZEL_OPTIONS} build ${BAZEL_CONFIG} --@io_bazel_rules_go//go/config:pure --platforms=@io_bazel_rules_go//go/toolchain:linux_$* //cmd/kops-controller:image-bundle-$*.tar.gz.sha256
cp -fp ${BAZEL_BIN}/cmd/kops-controller/image-bundle-$*.tar.gz ${BAZELIMAGES}/kops-controller-$*.tar.gz
cp -fp ${BAZEL_BIN}/cmd/kops-controller/image-bundle-$*.tar.gz.sha256 ${BAZELIMAGES}/kops-controller-$*.tar.gz.sha256
@ -653,7 +653,7 @@ bazel-kops-controller-export: bazel-kops-controller-export-linux-amd64 bazel-kop
.PHONY: bazel-dns-controller-export-linux-amd64 bazel-dns-controller-export-linux-arm64
bazel-dns-controller-export-linux-amd64 bazel-dns-controller-export-linux-arm64: bazel-dns-controller-export-linux-%:
mkdir -p ${BAZELIMAGES}
DOCKER_REGISTRY="" DOCKER_IMAGE_PREFIX="k8s.gcr.io/kops/" DNS_CONTROLLER_TAG=${DNS_CONTROLLER_TAG} ${BAZEL} ${BAZEL_OPTIONS} build ${BAZEL_CONFIG} --@io_bazel_rules_go//go/config:pure --platforms=@io_bazel_rules_go//go/toolchain:linux_$* //dns-controller/cmd/dns-controller:image-bundle-$*.tar.gz.sha256
DOCKER_REGISTRY="" DOCKER_IMAGE_PREFIX="registry.k8s.io/kops/" DNS_CONTROLLER_TAG=${DNS_CONTROLLER_TAG} ${BAZEL} ${BAZEL_OPTIONS} build ${BAZEL_CONFIG} --@io_bazel_rules_go//go/config:pure --platforms=@io_bazel_rules_go//go/toolchain:linux_$* //dns-controller/cmd/dns-controller:image-bundle-$*.tar.gz.sha256
cp -fp ${BAZEL_BIN}/dns-controller/cmd/dns-controller/image-bundle-$*.tar.gz ${BAZELIMAGES}/dns-controller-$*.tar.gz
cp -fp ${BAZEL_BIN}/dns-controller/cmd/dns-controller/image-bundle-$*.tar.gz.sha256 ${BAZELIMAGES}/dns-controller-$*.tar.gz.sha256

2
cmd/kops/create_cluster.go
View File

@ -899,7 +899,7 @@ func completeKubernetesVersion(cmd *cobra.Command, args []string, toComplete str
tooNewVersion.Pre = nil
tooNewVersion.Build = nil
repo, err := name.NewRepository("k8s.gcr.io/kube-apiserver")
repo, err := name.NewRepository("registry.k8s.io/kube-apiserver")
if err != nil {
return commandutils.CompletionError("parsing kube-apiserver repo", err)
}

6
hack/set-version
View File

@ -62,13 +62,13 @@ sed -i.bak -e "s@KUBE_APISERVER_HEALTHCHECK_TAG=${KOPS_RELEASE_VERSION}@KUBE_API
sed -i.bak -e "s@\"${KOPS_RELEASE_VERSION}\"@\"${NEW_RELEASE_VERSION}\"@g" upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go
sed -i.bak -e "s@${KOPS_RELEASE_VERSION}@${NEW_RELEASE_VERSION}@g" upup/pkg/fi/cloudup/urls_test.go
git grep -l k8s.gcr.io/kops/dns-controller | xargs -I {} sed -i.bak -e "s@dns-controller:${KOPS_RELEASE_VERSION}@dns-controller:${NEW_RELEASE_VERSION}@g" {}
git grep -l registry.k8s.io/kops/dns-controller | xargs -I {} sed -i.bak -e "s@dns-controller:${KOPS_RELEASE_VERSION}@dns-controller:${NEW_RELEASE_VERSION}@g" {}
git grep -l "version..v${KOPS_RELEASE_VERSION}" upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/ | xargs -I {} sed -i.bak -e "s@version: v${KOPS_RELEASE_VERSION}@version: v${NEW_RELEASE_VERSION}@g" {}
git grep -l k8s.gcr.io/kops/kops-controller | xargs -I {} sed -i.bak -e "s@kops-controller:${KOPS_RELEASE_VERSION}@kops-controller:${NEW_RELEASE_VERSION}@g" {}
git grep -l registry.k8s.io/kops/kops-controller | xargs -I {} sed -i.bak -e "s@kops-controller:${KOPS_RELEASE_VERSION}@kops-controller:${NEW_RELEASE_VERSION}@g" {}
git grep -l "version..v${KOPS_RELEASE_VERSION}" upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/ | xargs -I {} sed -i.bak -e "s@version: v${KOPS_RELEASE_VERSION}@version: v${NEW_RELEASE_VERSION}@g" {}
git grep -l k8s.gcr.io/kops/kube-apiserver-healthcheck | xargs -I {} sed -i.bak -e "s@kube-apiserver-healthcheck:${KOPS_RELEASE_VERSION}@kube-apiserver-healthcheck:${NEW_RELEASE_VERSION}@g" {}
git grep -l registry.k8s.io/kops/kube-apiserver-healthcheck | xargs -I {} sed -i.bak -e "s@kube-apiserver-healthcheck:${KOPS_RELEASE_VERSION}@kube-apiserver-healthcheck:${NEW_RELEASE_VERSION}@g" {}
git grep -l "version..${KOPS_RELEASE_VERSION}" upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/ | xargs -I {} sed -i.bak -e "s@version: ${KOPS_RELEASE_VERSION}@version: ${NEW_RELEASE_VERSION}@g" {}

12
pkg/assets/builder.go
View File

@ -124,7 +124,7 @@ func (a *AssetBuilder) RemapImage(image string) (string, error) {
CanonicalLocation: image,
}
if strings.HasPrefix(image, "k8s.gcr.io/kops/dns-controller:") {
if strings.HasPrefix(image, "k8s.gcr.io/kops/dns-controller:") || strings.HasPrefix(image, "registry.k8s.io/kops/dns-controller:") {
// To use user-defined DNS Controller:
// 1. DOCKER_REGISTRY=[your docker hub repo] make dns-controller-push
// 2. export DNSCONTROLLER_IMAGE=[your docker hub repo]
@ -135,7 +135,7 @@ func (a *AssetBuilder) RemapImage(image string) (string, error) {
}
}
if strings.HasPrefix(image, "k8s.gcr.io/kops/kops-controller:") {
if strings.HasPrefix(image, "k8s.gcr.io/kops/kops-controller:") || strings.HasPrefix(image, "registry.k8s.io/kops/kops-controller:") {
// To use user-defined DNS Controller:
// 1. DOCKER_REGISTRY=[your docker hub repo] make kops-controller-push
// 2. export KOPSCONTROLLER_IMAGE=[your docker hub repo]
@ -146,7 +146,7 @@ func (a *AssetBuilder) RemapImage(image string) (string, error) {
}
}
if strings.HasPrefix(image, "k8s.gcr.io/kops/kube-apiserver-healthcheck:") {
if strings.HasPrefix(image, "k8s.gcr.io/kops/kube-apiserver-healthcheck:") || strings.HasPrefix(image, "registry.k8s.io/kops/kube-apiserver-healthcheck:") {
override := os.Getenv("KUBE_APISERVER_HEALTHCHECK_IMAGE")
if override != "" {
image = override
@ -157,7 +157,8 @@ func (a *AssetBuilder) RemapImage(image string) (string, error) {
containerProxy := strings.TrimSuffix(*a.AssetsLocation.ContainerProxy, "/")
normalized := image
// If the image name contains only a single / we need to determine if the image is located on docker-hub or if it's using a convenient URL like k8s.gcr.io/<image-name>
// If the image name contains only a single / we need to determine if the image is located on docker-hub or if it's using a convenient URL,
// like k8s.gcr.io/<image-name> or registry.k8s.io/<image-name>
// In case of a hub image it should be sufficient to just prepend the proxy url, producing eg docker-proxy.example.com/weaveworks/weave-kube
if strings.Count(normalized, "/") <= 1 && !strings.ContainsAny(strings.Split(normalized, "/")[0], ".:") {
normalized = containerProxy + "/" + normalized
@ -176,8 +177,9 @@ func (a *AssetBuilder) RemapImage(image string) (string, error) {
registryMirror := *a.AssetsLocation.ContainerRegistry
normalized := image
// Remove the 'standard' kubernetes image prefix, just for sanity
// Remove the 'standard' kubernetes image prefixes, just for sanity
normalized = strings.TrimPrefix(normalized, "k8s.gcr.io/")
normalized = strings.TrimPrefix(normalized, "registry.k8s.io/")
// When assembling the cluster spec, kops may call the option more then once until the config converges
// This means that this function may me called more than once on the same image

4
pkg/assets/builder_test.go
View File

@ -76,7 +76,7 @@ func TestValidate_RemapImage_ContainerProxy_AppliesToSimplifiedKubernetesURL(t *
builder := buildAssetBuilder(t)
proxyURL := "proxy.example.com/"
image := "k8s.gcr.io/kube-apiserver"
image := "registry.k8s.io/kube-apiserver"
expected := "proxy.example.com/kube-apiserver"
version, _ := util.ParseKubernetesVersion("1.10")
@ -116,7 +116,7 @@ func TestValidate_RemapImage_ContainerProxy_AppliesToImagesWithTags(t *testing.T
builder := buildAssetBuilder(t)
proxyURL := "proxy.example.com/"
image := "k8s.gcr.io/kube-apiserver:1.2.3"
image := "registry.k8s.io/kube-apiserver:1.2.3"
expected := "proxy.example.com/kube-apiserver:1.2.3"
version, _ := util.ParseKubernetesVersion("1.10")

12
pkg/model/components/awscloudcontrollermanager.go
View File

@ -88,17 +88,17 @@ func (b *AWSCloudControllerManagerOptionsBuilder) BuildOptions(o interface{}) er
// See https://us.gcr.io/k8s-artifacts-prod/provider-aws/cloud-controller-manager
switch b.KubernetesVersion.Minor {
case 19:
eccm.Image = "k8s.gcr.io/provider-aws/cloud-controller-manager:v1.19.0-alpha.1"
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.19.0-alpha.1"
case 20:
eccm.Image = "k8s.gcr.io/provider-aws/cloud-controller-manager:v1.20.0-alpha.0"
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.20.0-alpha.0"
case 21:
eccm.Image = "k8s.gcr.io/provider-aws/cloud-controller-manager:v1.21.0-alpha.0"
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.21.0-alpha.0"
case 22:
eccm.Image = "k8s.gcr.io/provider-aws/cloud-controller-manager:v1.22.0-alpha.2"
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.22.0-alpha.2"
case 23:
eccm.Image = "k8s.gcr.io/provider-aws/cloud-controller-manager:v1.23.0-alpha.0"
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.23.0-alpha.0"
case 24:
eccm.Image = "k8s.gcr.io/provider-aws/cloud-controller-manager:v1.23.0-alpha.0"
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.23.0-alpha.0"
default:
eccm.Image = "gcr.io/k8s-staging-provider-aws/cloud-controller-manager:latest"
}

12
pkg/model/components/clusterautoscaler.go
View File

@ -39,20 +39,20 @@ func (b *ClusterAutoscalerOptionsBuilder) BuildOptions(o interface{}) error {
if cas.Image == nil {
image := "k8s.gcr.io/autoscaling/cluster-autoscaler:latest"
image := "registry.k8s.io/autoscaling/cluster-autoscaler:latest"
v, err := util.ParseKubernetesVersion(clusterSpec.KubernetesVersion)
if err == nil {
switch v.Minor {
case 23:
image = "k8s.gcr.io/autoscaling/cluster-autoscaler:v1.23.0"
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.23.0"
case 22:
image = "k8s.gcr.io/autoscaling/cluster-autoscaler:v1.22.2"
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.22.2"
case 21:
image = "k8s.gcr.io/autoscaling/cluster-autoscaler:v1.21.2"
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.21.2"
case 20:
image = "k8s.gcr.io/autoscaling/cluster-autoscaler:v1.20.1"
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.20.1"
case 19:
image = "k8s.gcr.io/autoscaling/cluster-autoscaler:v1.19.2"
image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.19.2"
}
}
cas.Image = fi.String(image)

10
pkg/model/components/context.go
View File

@ -129,7 +129,7 @@ func Image(component string, clusterSpec *kops.ClusterSpec, assetsBuilder *asset
imageName := component
if !IsBaseURL(clusterSpec.KubernetesVersion) {
image := "k8s.gcr.io/" + imageName + ":" + "v" + kubernetesVersion.String()
image := "registry.k8s.io/" + imageName + ":" + "v" + kubernetesVersion.String()
image, err := assetsBuilder.RemapImage(image)
if err != nil {
@ -142,12 +142,12 @@ func Image(component string, clusterSpec *kops.ClusterSpec, assetsBuilder *asset
// are loading from a tarfile then the image is tagged with
// the architecture suffix.
//
// i.e. k8s.gcr.io/kube-apiserver:v1.20.0 is a manifest list
// i.e. registry.k8s.io/kube-apiserver:v1.20.0 is a manifest list
// and we _can_ also pull
// k8s.gcr.io/kube-apiserver-amd64:v1.20.0 directly. But if
// registry.k8s.io/kube-apiserver-amd64:v1.20.0 directly. But if
// we load https://.../v1.20.0/amd64/kube-apiserver.tar then
// the image inside that tar file is named
// "k8s.gcr.io/kube-apiserver-amd64:v1.20.0"
// "registry.k8s.io/kube-apiserver-amd64:v1.20.0"
imageName += "-amd64"
baseURL := clusterSpec.KubernetesVersion
@ -163,7 +163,7 @@ func Image(component string, clusterSpec *kops.ClusterSpec, assetsBuilder *asset
tag := strings.TrimSpace(string(b))
klog.V(2).Infof("Found tag %q for %q", tag, component)
image := "k8s.gcr.io/" + imageName + ":" + tag
image := "registry.k8s.io/" + imageName + ":" + tag
return image, nil
}

2
pkg/model/components/etcdmanager/model.go
View File

@ -178,7 +178,7 @@ metadata:
namespace: kube-system
spec:
containers:
- image: k8s.gcr.io/etcdadm/etcd-manager:v3.0.20220203
- image: registry.k8s.io/etcdadm/etcd-manager:v3.0.20220203
name: etcd-manager
resources:
requests:

4
pkg/model/components/image_test.go
View File

@ -45,7 +45,7 @@ func TestImage(t *testing.T) {
VFS: map[string]string{
"memfs://v1.20.0-download/bin/linux/amd64/kube-apiserver.docker_tag": "1-20-0dockertag",
},
Expected: "k8s.gcr.io/kube-apiserver-amd64:1-20-0dockertag",
Expected: "registry.k8s.io/kube-apiserver-amd64:1-20-0dockertag",
},
{
Component: "kube-apiserver",
@ -54,7 +54,7 @@ func TestImage(t *testing.T) {
KubernetesVersion: "1.20.0",
},
},
Expected: "k8s.gcr.io/kube-apiserver:v1.20.0",
Expected: "registry.k8s.io/kube-apiserver:v1.20.0",
},
}

2
pkg/model/components/kubeapiserver/model.go
View File

@ -79,7 +79,7 @@ kind: Pod
spec:
containers:
- name: healthcheck
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.24.0-alpha.2
image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.24.0-alpha.2
livenessProbe:
httpGet:
# The sidecar serves a healthcheck on the same port,

2
pkg/model/components/kubedns.go
View File

@ -110,7 +110,7 @@ func (b *KubeDnsOptionsBuilder) BuildOptions(o interface{}) error {
}
if nodeLocalDNS.Image == nil {
nodeLocalDNS.Image = fi.String("k8s.gcr.io/dns/k8s-dns-node-cache:1.21.3")
nodeLocalDNS.Image = fi.String("registry.k8s.io/dns/k8s-dns-node-cache:1.21.3")
}
return nil

2
pkg/model/components/kubelet.go
View File

@ -173,7 +173,7 @@ func (b *KubeletOptionsBuilder) BuildOptions(o interface{}) error {
// Prevent image GC from pruning the pause image
// https://github.com/kubernetes/enhancements/tree/master/keps/sig-node/2040-kubelet-cri#pinned-images
image := "k8s.gcr.io/pause:3.6"
image := "registry.k8s.io/pause:3.6"
var err error
if image, err = b.AssetBuilder.RemapImage(image); err != nil {
return err

2
pkg/model/components/nodeproblemdetector.go
View File

@ -62,7 +62,7 @@ func (b *NodeProblemDetectorOptionsBuilder) BuildOptions(o interface{}) error {
}
if npd.Image == nil {
npd.Image = fi.String("k8s.gcr.io/node-problem-detector/node-problem-detector:v0.8.8")
npd.Image = fi.String("registry.k8s.io/node-problem-detector/node-problem-detector:v0.8.8")
}
return nil

18
upup/models/cloudup/resources/addons/aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml.template
View File

@ -285,7 +285,7 @@ spec:
- name: ebs-plugin
securityContext:
privileged: true
image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:{{ .Version }}
image: registry.k8s.io/provider-aws/aws-ebs-csi-driver:{{ .Version }}
args:
- node
- --endpoint=$(CSI_ENDPOINT)
@ -326,7 +326,7 @@ spec:
periodSeconds: 10
failureThreshold: 5
- name: node-driver-registrar
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.1.0
args:
- --csi-address=$(ADDRESS)
- --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
@ -346,7 +346,7 @@ spec:
- name: registration-dir
mountPath: /registration
- name: liveness-probe
image: k8s.gcr.io/sig-storage/livenessprobe:v2.2.0
image: registry.k8s.io/sig-storage/livenessprobe:v2.2.0
args:
- --csi-address=/csi/csi.sock
volumeMounts:
@ -426,7 +426,7 @@ spec:
{{ end }}
containers:
- name: ebs-plugin
image: k8s.gcr.io/provider-aws/aws-ebs-csi-driver:{{ .Version }}
image: registry.k8s.io/provider-aws/aws-ebs-csi-driver:{{ .Version }}
imagePullPolicy: IfNotPresent
args:
- controller
@ -475,7 +475,7 @@ spec:
periodSeconds: 10
failureThreshold: 5
- name: csi-provisioner
image: k8s.gcr.io/sig-storage/csi-provisioner:v2.2.0
image: registry.k8s.io/sig-storage/csi-provisioner:v2.2.0
args:
- --csi-address=$(ADDRESS)
- --v=5
@ -490,7 +490,7 @@ spec:
- name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/
- name: csi-attacher
image: k8s.gcr.io/sig-storage/csi-attacher:v3.2.0
image: registry.k8s.io/sig-storage/csi-attacher:v3.2.0
args:
- --csi-address=$(ADDRESS)
- --v=5
@ -502,7 +502,7 @@ spec:
- name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/
- name: csi-snapshotter
image: k8s.gcr.io/sig-storage/csi-snapshotter:v4.0.0
image: registry.k8s.io/sig-storage/csi-snapshotter:v4.0.0
args:
- --csi-address=$(ADDRESS)
- --leader-election=true
@ -513,7 +513,7 @@ spec:
- name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/
- name: csi-resizer
image: k8s.gcr.io/sig-storage/csi-resizer:v1.1.0
image: registry.k8s.io/sig-storage/csi-resizer:v1.1.0
imagePullPolicy: Always
args:
- --csi-address=$(ADDRESS)
@ -525,7 +525,7 @@ spec:
- name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/
- name: liveness-probe
image: k8s.gcr.io/sig-storage/livenessprobe:v2.2.0
image: registry.k8s.io/sig-storage/livenessprobe:v2.2.0
args:
- --csi-address=/csi/csi.sock
volumeMounts:

4
upup/models/cloudup/resources/addons/core.addons.k8s.io/k8s-1.12.yaml.template
View File

@ -117,9 +117,9 @@ spec:
serviceAccountName: cloud-controller-manager
containers:
- name: cloud-controller-manager
# for in-tree providers we use k8s.gcr.io/cloud-controller-manager
# for in-tree providers we use registry.k8s.io/cloud-controller-manager
# this can be replaced with any other image for out-of-tree providers
image: k8s.gcr.io/cloud-controller-manager:v{{ .KubernetesVersion }} # Reviewers: Will this work?
image: registry.k8s.io/cloud-controller-manager:v{{ .KubernetesVersion }} # Reviewers: Will this work?
command:
- /usr/local/bin/cloud-controller-manager
- --cloud-provider={{ GetCloudProvider }}

4
upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template
View File

@ -154,7 +154,7 @@ spec:
k8s-app: kube-dns
containers:
- name: coredns
image: {{ if KubeDNS.CoreDNSImage }}{{ KubeDNS.CoreDNSImage }}{{ else }}k8s.gcr.io/coredns/coredns:v1.8.5{{ end }}
image: {{ if KubeDNS.CoreDNSImage }}{{ KubeDNS.CoreDNSImage }}{{ else }}registry.k8s.io/coredns/coredns:v1.8.5{{ end }}
imagePullPolicy: IfNotPresent
resources:
limits:
@ -318,7 +318,7 @@ spec:
spec:
containers:
- name: autoscaler
image: {{ if KubeDNS.CPAImage }}{{ KubeDNS.CPAImage }}{{ else }}k8s.gcr.io/cpa/cluster-proportional-autoscaler:1.8.4{{ end }}
image: {{ if KubeDNS.CPAImage }}{{ KubeDNS.CPAImage }}{{ else }}registry.k8s.io/cpa/cluster-proportional-autoscaler:1.8.4{{ end }}
resources:
requests:
cpu: "20m"

2
upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template
View File

@ -38,7 +38,7 @@ spec:
serviceAccount: dns-controller
containers:
- name: dns-controller
image: k8s.gcr.io/kops/dns-controller:1.24.0-alpha.2
image: registry.k8s.io/kops/dns-controller:1.24.0-alpha.2
args:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"

2
upup/models/cloudup/resources/addons/external-dns.addons.k8s.io/k8s-1.19.yaml.template
View File

@ -40,7 +40,7 @@ spec:
readOnlyRootFilesystem: true
capabilities:
drop: ["ALL"]
image: k8s.gcr.io/external-dns/external-dns:v0.10.1
image: registry.k8s.io/external-dns/external-dns:v0.10.1
args:
{{ range $arg := ExternalDnsArgv }}
- "{{ $arg }}"

14
upup/models/cloudup/resources/addons/gcp-pd-csi-driver.addons.k8s.io/k8s-1.23.yaml.template
View File

@ -346,7 +346,7 @@ spec:
priorityClassName: csi-gce-pd-controller
containers:
- name: csi-provisioner
image: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.0
image: registry.k8s.io/sig-storage/csi-provisioner:v2.1.0
args:
- "--v=5"
- "--csi-address=/csi/csi.sock"
@ -380,7 +380,7 @@ spec:
- name: socket-dir
mountPath: /csi
- name: csi-attacher
image: k8s.gcr.io/sig-storage/csi-attacher:v3.1.0
image: registry.k8s.io/sig-storage/csi-attacher:v3.1.0
args:
- "--v=5"
- "--csi-address=/csi/csi.sock"
@ -409,7 +409,7 @@ spec:
- name: socket-dir
mountPath: /csi
- name: csi-resizer
image: k8s.gcr.io/sig-storage/csi-resizer:v1.1.0
image: registry.k8s.io/sig-storage/csi-resizer:v1.1.0
args:
- "--v=5"
- "--csi-address=/csi/csi.sock"
@ -438,7 +438,7 @@ spec:
- name: socket-dir
mountPath: /csi
- name: csi-snapshotter
image: k8s.gcr.io/sig-storage/csi-snapshotter:v3.0.3
image: registry.k8s.io/sig-storage/csi-snapshotter:v3.0.3
args:
- "--v=5"
- "--csi-address=/csi/csi.sock"
@ -457,7 +457,7 @@ spec:
- name: gce-pd-driver
# Don't change base image without changing pdImagePlaceholder in
# test/k8s-integration/main.go
image: k8s.gcr.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver:v1.3.4
image: registry.k8s.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver:v1.3.4
args:
- "--v=5"
- "--endpoint=unix:/csi/csi.sock"
@ -504,7 +504,7 @@ spec:
kubernetes.io/os: linux
containers:
- name: csi-driver-registrar
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.1.0
args:
- "--v=5"
- "--csi-address=/csi/csi.sock"
@ -522,7 +522,7 @@ spec:
- name: gce-pd-driver
# Don't change base image without changing pdImagePlaceholder in
# test/k8s-integration/main.go
image: k8s.gcr.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver:v1.3.4
image: registry.k8s.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver:v1.3.4
args:
- "--v=5"
- "--endpoint=unix:/csi/csi.sock"

2
upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml.template
View File

@ -53,7 +53,7 @@ spec:
serviceAccount: kops-controller
containers:
- name: kops-controller
image: k8s.gcr.io/kops/kops-controller:1.24.0-alpha.2
image: registry.k8s.io/kops/kops-controller:1.24.0-alpha.2
volumeMounts:
{{ if .UseHostCertificates }}
- mountPath: /etc/ssl/certs

8
upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.12.yaml.template
View File

@ -53,7 +53,7 @@ spec:
spec:
containers:
- name: autoscaler
image: {{ if KubeDNS.CPAImage }}{{ KubeDNS.CPAImage }}{{ else }}k8s.gcr.io/cpa/cluster-proportional-autoscaler:1.8.3{{ end }}
image: {{ if KubeDNS.CPAImage }}{{ KubeDNS.CPAImage }}{{ else }}registry.k8s.io/cpa/cluster-proportional-autoscaler:1.8.3{{ end }}
resources:
requests:
cpu: "20m"
@ -130,7 +130,7 @@ spec:
containers:
- name: kubedns
image: k8s.gcr.io/k8s-dns-kube-dns:1.15.13
image: registry.k8s.io/k8s-dns-kube-dns:1.15.13
resources:
# TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in
@ -182,7 +182,7 @@ spec:
mountPath: /kube-dns-config
- name: dnsmasq
image: k8s.gcr.io/k8s-dns-dnsmasq-nanny:1.15.13
image: registry.k8s.io/k8s-dns-dnsmasq-nanny:1.15.13
livenessProbe:
httpGet:
path: /healthcheck/dnsmasq
@ -224,7 +224,7 @@ spec:
mountPath: /etc/k8s/dns/dnsmasq-nanny
- name: sidecar
image: k8s.gcr.io/k8s-dns-sidecar:1.15.13
image: registry.k8s.io/k8s-dns-sidecar:1.15.13
livenessProbe:
httpGet:
path: /metrics

2
upup/models/cloudup/resources/addons/metrics-server.addons.k8s.io/k8s-1.11.yaml.template
View File

@ -142,7 +142,7 @@ spec:
{{ if or (not UseKopsControllerForNodeBootstrap) (WithDefaultBool .MetricsServer.Insecure true) }}
- --kubelet-insecure-tls
{{ end }}
image: {{ or .MetricsServer.Image "k8s.gcr.io/metrics-server/metrics-server:v0.6.0" }}
image: {{ or .MetricsServer.Image "registry.k8s.io/metrics-server/metrics-server:v0.6.0" }}
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3

2
upup/models/cloudup/resources/addons/snapshot-controller.addons.k8s.io/k8s-1.20.yaml.template
View File

@ -1201,7 +1201,7 @@ spec:
spec:
containers:
- name: snapshot-validation
image: k8s.gcr.io/sig-storage/snapshot-validation-webhook:v5.0.0
image: registry.k8s.io/sig-storage/snapshot-validation-webhook:v5.0.0
imagePullPolicy: IfNotPresent
args: ['--tls-cert-file=/etc/snapshot-validation-webhook/certs/tls.crt', '--tls-private-key-file=/etc/snapshot-validation-webhook/certs/tls.key']
ports:

14
upup/models/cloudup/resources/addons/storage-openstack.addons.k8s.io/k8s-1.16.yaml.template
View File

@ -263,7 +263,7 @@ spec:
serviceAccount: csi-cinder-controller-sa
containers:
- name: csi-attacher
image: k8s.gcr.io/sig-storage/csi-attacher:v3.1.0
image: registry.k8s.io/sig-storage/csi-attacher:v3.1.0
args:
- "--csi-address=$(ADDRESS)"
- "--timeout=3m"
@ -275,7 +275,7 @@ spec:
- name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/
- name: csi-provisioner
image: k8s.gcr.io/sig-storage/csi-provisioner:v2.2.0
image: registry.k8s.io/sig-storage/csi-provisioner:v2.2.0
args:
- "--csi-address=$(ADDRESS)"
- "--timeout=3m"
@ -292,7 +292,7 @@ spec:
- name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/
- name: csi-snapshotter
image: k8s.gcr.io/sig-storage/csi-snapshotter:v4.0.0
image: registry.k8s.io/sig-storage/csi-snapshotter:v4.0.0
args:
- "--csi-address=$(ADDRESS)"
- "--timeout=3m"
@ -305,7 +305,7 @@ spec:
- mountPath: /var/lib/csi/sockets/pluginproxy/
name: socket-dir
- name: csi-resizer
image: k8s.gcr.io/sig-storage/csi-resizer:v1.1.0
image: registry.k8s.io/sig-storage/csi-resizer:v1.1.0
args:
- "--csi-address=$(ADDRESS)"
- "--timeout=3m"
@ -318,7 +318,7 @@ spec:
- name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/
- name: liveness-probe
image: k8s.gcr.io/sig-storage/livenessprobe:v2.2.0
image: registry.k8s.io/sig-storage/livenessprobe:v2.2.0
args:
- "--csi-address=$(ADDRESS)"
env:
@ -438,7 +438,7 @@ spec:
hostNetwork: true
containers:
- name: node-driver-registrar
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.1.0
args:
- "--csi-address=$(ADDRESS)"
- "--kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)"
@ -458,7 +458,7 @@ spec:
- name: registration-dir
mountPath: /registration
- name: liveness-probe
image: k8s.gcr.io/sig-storage/livenessprobe:v2.2.0
image: registry.k8s.io/sig-storage/livenessprobe:v2.2.0
args:
- --csi-address=/csi/csi.sock
volumeMounts:

8
upup/pkg/fi/cloudup/apply_cluster.go
View File

@ -1477,10 +1477,10 @@ func (n *nodeUpConfigBuilder) buildWarmPoolImages(ig *kops.InstanceGroup) []stri
//"docker.io/cilium/",
//"docker.io/cloudnativelabs/kube-router:",
//"docker.io/weaveworks/",
"k8s.gcr.io/kube-proxy:",
"k8s.gcr.io/provider-aws/",
"k8s.gcr.io/sig-storage/csi-node-driver-registrar:",
"k8s.gcr.io/sig-storage/livenessprobe:",
"registry.k8s.io/kube-proxy:",
"registry.k8s.io/provider-aws/",
"registry.k8s.io/sig-storage/csi-node-driver-registrar:",
"registry.k8s.io/sig-storage/livenessprobe:",
"quay.io/calico/",
"quay.io/cilium/",
"quay.io/coreos/flannel:",