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

Pull images from k8s.gcr.io/kops instead of docker.io/kope

This commit is contained in:
Ciprian Hacman 2020-08-25 07:06:09 +03:00
parent 724ec2fcf7
commit a4ff90205a
18 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -644,8 +644,8 @@ bazel-protokube-export:
.PHONY: bazel-kube-apiserver-healthcheck-export .PHONY: bazel-kube-apiserver-healthcheck-export
bazel-kube-apiserver-healthcheck-export: bazel-kube-apiserver-healthcheck-export:
mkdir -p ${BAZELIMAGES} mkdir -p ${BAZELIMAGES}
DOCKER_REGISTRY="" DOCKER_IMAGE_PREFIX="kope/" KUBE_APISERVER_HEALTHCHECK_TAG=${KUBE_APISERVER_HEALTHCHECK_TAG} bazel ${BAZEL_OPTIONS} build ${BAZEL_CONFIG} --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //cmd/kube-apiserver-healthcheck:image-bundle-amd64.tar.gz.sha256 DOCKER_REGISTRY="" DOCKER_IMAGE_PREFIX="k8s.gcr.io/kops/" KUBE_APISERVER_HEALTHCHECK_TAG=${KUBE_APISERVER_HEALTHCHECK_TAG} bazel ${BAZEL_OPTIONS} build ${BAZEL_CONFIG} --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //cmd/kube-apiserver-healthcheck:image-bundle-amd64.tar.gz.sha256
DOCKER_REGISTRY="" DOCKER_IMAGE_PREFIX="kope/" KUBE_APISERVER_HEALTHCHECK_TAG=${KUBE_APISERVER_HEALTHCHECK_TAG} bazel ${BAZEL_OPTIONS} build ${BAZEL_CONFIG} --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64 //cmd/kube-apiserver-healthcheck:image-bundle-arm64.tar.gz.sha256 DOCKER_REGISTRY="" DOCKER_IMAGE_PREFIX="k8s.gcr.io/kops/" KUBE_APISERVER_HEALTHCHECK_TAG=${KUBE_APISERVER_HEALTHCHECK_TAG} bazel ${BAZEL_OPTIONS} build ${BAZEL_CONFIG} --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64 //cmd/kube-apiserver-healthcheck:image-bundle-arm64.tar.gz.sha256
cp -fp bazel-bin/cmd/kube-apiserver-healthcheck/image-bundle-amd64.tar.gz ${BAZELIMAGES}/kube-apiserver-healthcheck-amd64.tar.gz cp -fp bazel-bin/cmd/kube-apiserver-healthcheck/image-bundle-amd64.tar.gz ${BAZELIMAGES}/kube-apiserver-healthcheck-amd64.tar.gz
cp -fp bazel-bin/cmd/kube-apiserver-healthcheck/image-bundle-arm64.tar.gz ${BAZELIMAGES}/kube-apiserver-healthcheck-arm64.tar.gz cp -fp bazel-bin/cmd/kube-apiserver-healthcheck/image-bundle-arm64.tar.gz ${BAZELIMAGES}/kube-apiserver-healthcheck-arm64.tar.gz
cp -fp bazel-bin/cmd/kube-apiserver-healthcheck/image-bundle-amd64.tar.gz.sha256 ${BAZELIMAGES}/kube-apiserver-healthcheck-amd64.tar.gz.sha256 cp -fp bazel-bin/cmd/kube-apiserver-healthcheck/image-bundle-amd64.tar.gz.sha256 ${BAZELIMAGES}/kube-apiserver-healthcheck-amd64.tar.gz.sha256
@ -654,8 +654,8 @@ bazel-kube-apiserver-healthcheck-export:
.PHONY: bazel-kops-controller-export .PHONY: bazel-kops-controller-export
bazel-kops-controller-export: bazel-kops-controller-export:
mkdir -p ${BAZELIMAGES} mkdir -p ${BAZELIMAGES}
DOCKER_REGISTRY="" DOCKER_IMAGE_PREFIX="kope/" KOPS_CONTROLLER_TAG=${KOPS_CONTROLLER_TAG} bazel ${BAZEL_OPTIONS} build ${BAZEL_CONFIG} --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //cmd/kops-controller:image-bundle-amd64.tar.gz.sha256 DOCKER_REGISTRY="" DOCKER_IMAGE_PREFIX="k8s.gcr.io/kops/" KOPS_CONTROLLER_TAG=${KOPS_CONTROLLER_TAG} bazel ${BAZEL_OPTIONS} build ${BAZEL_CONFIG} --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //cmd/kops-controller:image-bundle-amd64.tar.gz.sha256
DOCKER_REGISTRY="" DOCKER_IMAGE_PREFIX="kope/" KOPS_CONTROLLER_TAG=${KOPS_CONTROLLER_TAG} bazel ${BAZEL_OPTIONS} build ${BAZEL_CONFIG} --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64 //cmd/kops-controller:image-bundle-arm64.tar.gz.sha256 DOCKER_REGISTRY="" DOCKER_IMAGE_PREFIX="k8s.gcr.io/kops/" KOPS_CONTROLLER_TAG=${KOPS_CONTROLLER_TAG} bazel ${BAZEL_OPTIONS} build ${BAZEL_CONFIG} --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64 //cmd/kops-controller:image-bundle-arm64.tar.gz.sha256
cp -fp bazel-bin/cmd/kops-controller/image-bundle-amd64.tar.gz ${BAZELIMAGES}/kops-controller-amd64.tar.gz cp -fp bazel-bin/cmd/kops-controller/image-bundle-amd64.tar.gz ${BAZELIMAGES}/kops-controller-amd64.tar.gz
cp -fp bazel-bin/cmd/kops-controller/image-bundle-arm64.tar.gz ${BAZELIMAGES}/kops-controller-arm64.tar.gz cp -fp bazel-bin/cmd/kops-controller/image-bundle-arm64.tar.gz ${BAZELIMAGES}/kops-controller-arm64.tar.gz
cp -fp bazel-bin/cmd/kops-controller/image-bundle-amd64.tar.gz.sha256 ${BAZELIMAGES}/kops-controller-amd64.tar.gz.sha256 cp -fp bazel-bin/cmd/kops-controller/image-bundle-amd64.tar.gz.sha256 ${BAZELIMAGES}/kops-controller-amd64.tar.gz.sha256
@ -664,8 +664,8 @@ bazel-kops-controller-export:
.PHONY: bazel-dns-controller-export .PHONY: bazel-dns-controller-export
bazel-dns-controller-export: bazel-dns-controller-export:
mkdir -p ${BAZELIMAGES} mkdir -p ${BAZELIMAGES}
DOCKER_REGISTRY="" DOCKER_IMAGE_PREFIX="kope/" DNS_CONTROLLER_TAG=${DNS_CONTROLLER_TAG} bazel ${BAZEL_OPTIONS} build ${BAZEL_CONFIG} --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //dns-controller/cmd/dns-controller:image-bundle-amd64.tar.gz.sha256 DOCKER_REGISTRY="" DOCKER_IMAGE_PREFIX="k8s.gcr.io/kops/" DNS_CONTROLLER_TAG=${DNS_CONTROLLER_TAG} bazel ${BAZEL_OPTIONS} build ${BAZEL_CONFIG} --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //dns-controller/cmd/dns-controller:image-bundle-amd64.tar.gz.sha256
DOCKER_REGISTRY="" DOCKER_IMAGE_PREFIX="kope/" DNS_CONTROLLER_TAG=${DNS_CONTROLLER_TAG} bazel ${BAZEL_OPTIONS} build ${BAZEL_CONFIG} --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64 //dns-controller/cmd/dns-controller:image-bundle-arm64.tar.gz.sha256 DOCKER_REGISTRY="" DOCKER_IMAGE_PREFIX="k8s.gcr.io/kops/" DNS_CONTROLLER_TAG=${DNS_CONTROLLER_TAG} bazel ${BAZEL_OPTIONS} build ${BAZEL_CONFIG} --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64 //dns-controller/cmd/dns-controller:image-bundle-arm64.tar.gz.sha256
cp -fp bazel-bin/dns-controller/cmd/dns-controller/image-bundle-amd64.tar.gz ${BAZELIMAGES}/dns-controller-amd64.tar.gz cp -fp bazel-bin/dns-controller/cmd/dns-controller/image-bundle-amd64.tar.gz ${BAZELIMAGES}/dns-controller-amd64.tar.gz
cp -fp bazel-bin/dns-controller/cmd/dns-controller/image-bundle-arm64.tar.gz ${BAZELIMAGES}/dns-controller-arm64.tar.gz cp -fp bazel-bin/dns-controller/cmd/dns-controller/image-bundle-arm64.tar.gz ${BAZELIMAGES}/dns-controller-arm64.tar.gz
cp -fp bazel-bin/dns-controller/cmd/dns-controller/image-bundle-amd64.tar.gz.sha256 ${BAZELIMAGES}/dns-controller-amd64.tar.gz.sha256 cp -fp bazel-bin/dns-controller/cmd/dns-controller/image-bundle-amd64.tar.gz.sha256 ${BAZELIMAGES}/dns-controller-amd64.tar.gz.sha256

6
hack/set-version
View File

@ -52,13 +52,13 @@ sed -i -e "s@KOPS_CONTROLLER_TAG=${KOPS_RELEASE_VERSION}@KOPS_CONTROLLER_TAG=${N
sed -i -e "s@KUBE_APISERVER_HEALTHCHECK_TAG=${KOPS_RELEASE_VERSION}@KUBE_APISERVER_HEALTHCHECK_TAG=${NEW_RELEASE_VERSION}@g" Makefile sed -i -e "s@KUBE_APISERVER_HEALTHCHECK_TAG=${KOPS_RELEASE_VERSION}@KUBE_APISERVER_HEALTHCHECK_TAG=${NEW_RELEASE_VERSION}@g" Makefile
sed -i -e "s@\"${KOPS_RELEASE_VERSION}\"@\"${NEW_RELEASE_VERSION}\"@g" upup/pkg/fi/cloudup/bootstrapchannelbuilder.go sed -i -e "s@\"${KOPS_RELEASE_VERSION}\"@\"${NEW_RELEASE_VERSION}\"@g" upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
git grep -l kope/dns-controller | xargs -I {} sed -i -e "s@dns-controller:${KOPS_RELEASE_VERSION}@dns-controller:${NEW_RELEASE_VERSION}@g" {} git grep -l k8s.gcr.io/kops/dns-controller | xargs -I {} sed -i -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 -e "s@version: v${KOPS_RELEASE_VERSION}@version: v${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 -e "s@version: v${KOPS_RELEASE_VERSION}@version: v${NEW_RELEASE_VERSION}@g" {}
git grep -l kope/kops-controller | xargs -I {} sed -i -e "s@kops-controller:${KOPS_RELEASE_VERSION}@kops-controller:${NEW_RELEASE_VERSION}@g" {} git grep -l k8s.gcr.io/kops/kops-controller | xargs -I {} sed -i -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 -e "s@version: v${KOPS_RELEASE_VERSION}@version: v${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 -e "s@version: v${KOPS_RELEASE_VERSION}@version: v${NEW_RELEASE_VERSION}@g" {}
git grep -l kope/kube-apiserver-healthcheck | xargs -I {} sed -i -e "s@kube-apiserver-healthcheck:${KOPS_RELEASE_VERSION}@kube-apiserver-healthcheck:${NEW_RELEASE_VERSION}@g" {} git grep -l k8s.gcr.io/kops/kube-apiserver-healthcheck | xargs -I {} sed -i -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 -e "s@version: ${KOPS_RELEASE_VERSION}@version: ${NEW_RELEASE_VERSION}@g" {} git grep -l "version..${KOPS_RELEASE_VERSION}" upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/ | xargs -I {} sed -i -e "s@version: ${KOPS_RELEASE_VERSION}@version: ${NEW_RELEASE_VERSION}@g" {}

6
pkg/assets/builder.go
View File

@ -132,7 +132,7 @@ func (a *AssetBuilder) RemapImage(image string) (string, error) {
asset.DockerImage = image asset.DockerImage = image
if strings.HasPrefix(image, "kope/dns-controller:") { if strings.HasPrefix(image, "k8s.gcr.io/kops/dns-controller:") {
// To use user-defined DNS Controller: // To use user-defined DNS Controller:
// 1. DOCKER_REGISTRY=[your docker hub repo] make dns-controller-push // 1. DOCKER_REGISTRY=[your docker hub repo] make dns-controller-push
// 2. export DNSCONTROLLER_IMAGE=[your docker hub repo] // 2. export DNSCONTROLLER_IMAGE=[your docker hub repo]
@ -143,7 +143,7 @@ func (a *AssetBuilder) RemapImage(image string) (string, error) {
} }
} }
if strings.HasPrefix(image, "kope/kops-controller:") { if strings.HasPrefix(image, "k8s.gcr.io/kops/kops-controller:") {
// To use user-defined DNS Controller: // To use user-defined DNS Controller:
// 1. DOCKER_REGISTRY=[your docker hub repo] make kops-controller-push // 1. DOCKER_REGISTRY=[your docker hub repo] make kops-controller-push
// 2. export KOPSCONTROLLER_IMAGE=[your docker hub repo] // 2. export KOPSCONTROLLER_IMAGE=[your docker hub repo]
@ -154,7 +154,7 @@ func (a *AssetBuilder) RemapImage(image string) (string, error) {
} }
} }
if strings.HasPrefix(image, "kope/kube-apiserver-healthcheck:") { if strings.HasPrefix(image, "k8s.gcr.io/kops/kube-apiserver-healthcheck:") {
override := os.Getenv("KUBE_APISERVER_HEALTHCHECK_IMAGE") override := os.Getenv("KUBE_APISERVER_HEALTHCHECK_IMAGE")
if override != "" { if override != "" {
image = override image = override

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

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

2
pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml
View File

@ -14,7 +14,7 @@ Contents:
- --client-key=/secrets/client.key - --client-key=/secrets/client.key
command: command:
- /kube-apiserver-healthcheck - /kube-apiserver-healthcheck
image: kope/kube-apiserver-healthcheck:1.19.0-alpha.3 image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.19.0-alpha.3
livenessProbe: livenessProbe:
httpGet: httpGet:
host: 127.0.0.1 host: 127.0.0.1

6
upup/models/bindata.go
View File

@ -1988,7 +1988,7 @@ spec:
serviceAccount: dns-controller serviceAccount: dns-controller
containers: containers:
- name: dns-controller - name: dns-controller
image: kope/dns-controller:1.19.0-alpha.3 image: k8s.gcr.io/kops/dns-controller:1.19.0-alpha.3
command: command:
{{ range $arg := DnsControllerArgv }} {{ range $arg := DnsControllerArgv }}
- "{{ $arg }}" - "{{ $arg }}"
@ -2124,7 +2124,7 @@ spec:
serviceAccount: dns-controller serviceAccount: dns-controller
containers: containers:
- name: dns-controller - name: dns-controller
image: kope/dns-controller:1.19.0-alpha.3 image: k8s.gcr.io/kops/dns-controller:1.19.0-alpha.3
command: command:
{{ range $arg := DnsControllerArgv }} {{ range $arg := DnsControllerArgv }}
- "{{ $arg }}" - "{{ $arg }}"
@ -2529,7 +2529,7 @@ spec:
serviceAccount: kops-controller serviceAccount: kops-controller
containers: containers:
- name: kops-controller - name: kops-controller
image: kope/kops-controller:1.19.0-alpha.3 image: k8s.gcr.io/kops/kops-controller:1.19.0-alpha.3
volumeMounts: volumeMounts:
{{ if .UseHostCertificates }} {{ if .UseHostCertificates }}
- mountPath: /etc/ssl/certs - mountPath: /etc/ssl/certs

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

@ -33,7 +33,7 @@ spec:
serviceAccount: dns-controller serviceAccount: dns-controller
containers: containers:
- name: dns-controller - name: dns-controller
image: kope/dns-controller:1.19.0-alpha.3 image: k8s.gcr.io/kops/dns-controller:1.19.0-alpha.3
command: command:
{{ range $arg := DnsControllerArgv }} {{ range $arg := DnsControllerArgv }}
- "{{ $arg }}" - "{{ $arg }}"

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

@ -33,7 +33,7 @@ spec:
serviceAccount: dns-controller serviceAccount: dns-controller
containers: containers:
- name: dns-controller - name: dns-controller
image: kope/dns-controller:1.19.0-alpha.3 image: k8s.gcr.io/kops/dns-controller:1.19.0-alpha.3
command: command:
{{ range $arg := DnsControllerArgv }} {{ range $arg := DnsControllerArgv }}
- "{{ $arg }}" - "{{ $arg }}"

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

@ -46,7 +46,7 @@ spec:
serviceAccount: kops-controller serviceAccount: kops-controller
containers: containers:
- name: kops-controller - name: kops-controller
image: kope/kops-controller:1.19.0-alpha.3 image: k8s.gcr.io/kops/kops-controller:1.19.0-alpha.3
volumeMounts: volumeMounts:
{{ if .UseHostCertificates }} {{ if .UseHostCertificates }}
- mountPath: /etc/ssl/certs - mountPath: /etc/ssl/certs

6
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml
View File

@ -7,7 +7,7 @@ spec:
- id: k8s-1.16 - id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0' kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: 32a6a0057d0d1930c0089120b4d0593bb0f109de manifestHash: 892363f3724b8af9a564d5ef3efd010418bad7b7
name: kops-controller.addons.k8s.io name: kops-controller.addons.k8s.io
selector: selector:
k8s-addon: kops-controller.addons.k8s.io k8s-addon: kops-controller.addons.k8s.io
@ -57,7 +57,7 @@ spec:
- id: k8s-1.6 - id: k8s-1.6
kubernetesVersion: <1.12.0 kubernetesVersion: <1.12.0
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: c844ffd7477e2b1fcb0a5524b3bfea4df8e1fc8b manifestHash: 2a12a3eee8ea83e43106b6f7d7ea978a14e9b246
name: dns-controller.addons.k8s.io name: dns-controller.addons.k8s.io
selector: selector:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
@ -65,7 +65,7 @@ spec:
- id: k8s-1.12 - id: k8s-1.12
kubernetesVersion: '>=1.12.0' kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: a59ae2cef3464a9c7b4a29788e030e5bac6274e7 manifestHash: 916cfc0d1bd7d7c6c80e85045d768c4de9178c62
name: dns-controller.addons.k8s.io name: dns-controller.addons.k8s.io
selector: selector:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io

6
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml
View File

@ -7,7 +7,7 @@ spec:
- id: k8s-1.16 - id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0' kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: 32a6a0057d0d1930c0089120b4d0593bb0f109de manifestHash: 892363f3724b8af9a564d5ef3efd010418bad7b7
name: kops-controller.addons.k8s.io name: kops-controller.addons.k8s.io
selector: selector:
k8s-addon: kops-controller.addons.k8s.io k8s-addon: kops-controller.addons.k8s.io
@ -57,7 +57,7 @@ spec:
- id: k8s-1.6 - id: k8s-1.6
kubernetesVersion: <1.12.0 kubernetesVersion: <1.12.0
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: c844ffd7477e2b1fcb0a5524b3bfea4df8e1fc8b manifestHash: 2a12a3eee8ea83e43106b6f7d7ea978a14e9b246
name: dns-controller.addons.k8s.io name: dns-controller.addons.k8s.io
selector: selector:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
@ -65,7 +65,7 @@ spec:
- id: k8s-1.12 - id: k8s-1.12
kubernetesVersion: '>=1.12.0' kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: a59ae2cef3464a9c7b4a29788e030e5bac6274e7 manifestHash: 916cfc0d1bd7d7c6c80e85045d768c4de9178c62
name: dns-controller.addons.k8s.io name: dns-controller.addons.k8s.io
selector: selector:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/dns-controller.addons.k8s.io-k8s-1.12.yaml
View File

@ -34,7 +34,7 @@ spec:
env: env:
- name: KUBERNETES_SERVICE_HOST - name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1 value: 127.0.0.1
image: kope/dns-controller:1.19.0-alpha.3 image: k8s.gcr.io/kops/dns-controller:1.19.0-alpha.3
name: dns-controller name: dns-controller
resources: resources:
requests: requests:

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/kops-controller.addons.k8s.io-k8s-1.16.yaml
View File

@ -36,7 +36,7 @@ spec:
- /kops-controller - /kops-controller
- --v=2 - --v=2
- --conf=/etc/kubernetes/kops-controller/config/config.yaml - --conf=/etc/kubernetes/kops-controller/config/config.yaml
image: kope/kops-controller:1.19.0-alpha.3 image: k8s.gcr.io/kops/kops-controller:1.19.0-alpha.3
name: kops-controller name: kops-controller
resources: resources:
requests: requests:

6
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
View File

@ -7,7 +7,7 @@ spec:
- id: k8s-1.16 - id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0' kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: 32a6a0057d0d1930c0089120b4d0593bb0f109de manifestHash: 892363f3724b8af9a564d5ef3efd010418bad7b7
name: kops-controller.addons.k8s.io name: kops-controller.addons.k8s.io
selector: selector:
k8s-addon: kops-controller.addons.k8s.io k8s-addon: kops-controller.addons.k8s.io
@ -57,7 +57,7 @@ spec:
- id: k8s-1.6 - id: k8s-1.6
kubernetesVersion: <1.12.0 kubernetesVersion: <1.12.0
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: c844ffd7477e2b1fcb0a5524b3bfea4df8e1fc8b manifestHash: 2a12a3eee8ea83e43106b6f7d7ea978a14e9b246
name: dns-controller.addons.k8s.io name: dns-controller.addons.k8s.io
selector: selector:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
@ -65,7 +65,7 @@ spec:
- id: k8s-1.12 - id: k8s-1.12
kubernetesVersion: '>=1.12.0' kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: a59ae2cef3464a9c7b4a29788e030e5bac6274e7 manifestHash: 916cfc0d1bd7d7c6c80e85045d768c4de9178c62
name: dns-controller.addons.k8s.io name: dns-controller.addons.k8s.io
selector: selector:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/dns-controller.addons.k8s.io-k8s-1.12.yaml
View File

@ -34,7 +34,7 @@ spec:
env: env:
- name: KUBERNETES_SERVICE_HOST - name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1 value: 127.0.0.1
image: kope/dns-controller:1.19.0-alpha.3 image: k8s.gcr.io/kops/dns-controller:1.19.0-alpha.3
name: dns-controller name: dns-controller
resources: resources:
requests: requests:

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/kops-controller.addons.k8s.io-k8s-1.16.yaml
View File

@ -36,7 +36,7 @@ spec:
- /kops-controller - /kops-controller
- --v=2 - --v=2
- --conf=/etc/kubernetes/kops-controller/config/config.yaml - --conf=/etc/kubernetes/kops-controller/config/config.yaml
image: kope/kops-controller:1.19.0-alpha.3 image: k8s.gcr.io/kops/kops-controller:1.19.0-alpha.3
name: kops-controller name: kops-controller
resources: resources:
requests: requests:

6
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
View File

@ -7,7 +7,7 @@ spec:
- id: k8s-1.16 - id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0' kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: 32a6a0057d0d1930c0089120b4d0593bb0f109de manifestHash: 892363f3724b8af9a564d5ef3efd010418bad7b7
name: kops-controller.addons.k8s.io name: kops-controller.addons.k8s.io
selector: selector:
k8s-addon: kops-controller.addons.k8s.io k8s-addon: kops-controller.addons.k8s.io
@ -57,7 +57,7 @@ spec:
- id: k8s-1.6 - id: k8s-1.6
kubernetesVersion: <1.12.0 kubernetesVersion: <1.12.0
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: c844ffd7477e2b1fcb0a5524b3bfea4df8e1fc8b manifestHash: 2a12a3eee8ea83e43106b6f7d7ea978a14e9b246
name: dns-controller.addons.k8s.io name: dns-controller.addons.k8s.io
selector: selector:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
@ -65,7 +65,7 @@ spec:
- id: k8s-1.12 - id: k8s-1.12
kubernetesVersion: '>=1.12.0' kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: a59ae2cef3464a9c7b4a29788e030e5bac6274e7 manifestHash: 916cfc0d1bd7d7c6c80e85045d768c4de9178c62
name: dns-controller.addons.k8s.io name: dns-controller.addons.k8s.io
selector: selector:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io

6
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
View File

@ -7,7 +7,7 @@ spec:
- id: k8s-1.16 - id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0' kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: 32a6a0057d0d1930c0089120b4d0593bb0f109de manifestHash: 892363f3724b8af9a564d5ef3efd010418bad7b7
name: kops-controller.addons.k8s.io name: kops-controller.addons.k8s.io
selector: selector:
k8s-addon: kops-controller.addons.k8s.io k8s-addon: kops-controller.addons.k8s.io
@ -57,7 +57,7 @@ spec:
- id: k8s-1.6 - id: k8s-1.6
kubernetesVersion: <1.12.0 kubernetesVersion: <1.12.0
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: c844ffd7477e2b1fcb0a5524b3bfea4df8e1fc8b manifestHash: 2a12a3eee8ea83e43106b6f7d7ea978a14e9b246
name: dns-controller.addons.k8s.io name: dns-controller.addons.k8s.io
selector: selector:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
@ -65,7 +65,7 @@ spec:
- id: k8s-1.12 - id: k8s-1.12
kubernetesVersion: '>=1.12.0' kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: a59ae2cef3464a9c7b4a29788e030e5bac6274e7 manifestHash: 916cfc0d1bd7d7c6c80e85045d768c4de9178c62
name: dns-controller.addons.k8s.io name: dns-controller.addons.k8s.io
selector: selector:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io