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

Merge pull request #9949 from hakman/release-1.19-alpha.4 

Release 1.19.0-alpha.4
This commit is contained in:
Kubernetes Prow Robot 2020-09-16 02:31:21 -07:00 committed by GitHub
parent 50e61d6bc9 0eb626fcdd
commit ecac8c5f14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 109 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Makefile
View File

@ -67,11 +67,14 @@ PROTOKUBE_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_PROTOKUBE_TAG
# We lock the versions of our controllers also
# We need to keep in sync with:
# upup/models/cloudup/resources/addons/dns-controller/
DNS_CONTROLLER_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_DNS_CONTROLLER_TAG | awk '{print $$2}')
DNS_CONTROLLER_TAG=1.19.0-alpha.4
DNS_CONTROLLER_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_DNS_CONTROLLER_TAG | awk '{print $$2}')
# upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/
KOPS_CONTROLLER_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KOPS_CONTROLLER_TAG | awk '{print $$2}')
KOPS_CONTROLLER_TAG=1.19.0-alpha.4
KOPS_CONTROLLER_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KOPS_CONTROLLER_TAG | awk '{print $$2}')
# pkg/model/components/kubeapiserver/model.go
KUBE_APISERVER_HEALTHCHECK_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KUBE_APISERVER_HEALTHCHECK_TAG | awk '{print $$2}')
KUBE_APISERVER_HEALTHCHECK_TAG=1.19.0-alpha.4
KUBE_APISERVER_HEALTHCHECK_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KUBE_APISERVER_HEALTHCHECK_TAG | awk '{print $$2}')
# Go exports:
@ -359,9 +362,9 @@ bazel-crossbuild-dns-controller:
.PHONY: dns-controller-push
dns-controller-push:
DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} DNS_CONTROLLER_TAG=${DNS_CONTROLLER_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //dns-controller/cmd/dns-controller:push-image-plain
DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} DNS_CONTROLLER_TAG=${DNS_CONTROLLER_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //dns-controller/cmd/dns-controller:push-image-amd64
DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} DNS_CONTROLLER_TAG=${DNS_CONTROLLER_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64 //dns-controller/cmd/dns-controller:push-image-arm64
DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} DNS_CONTROLLER_TAG=${DNS_CONTROLLER_PUSH_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //dns-controller/cmd/dns-controller:push-image-plain
DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} DNS_CONTROLLER_TAG=${DNS_CONTROLLER_PUSH_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //dns-controller/cmd/dns-controller:push-image-amd64
DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} DNS_CONTROLLER_TAG=${DNS_CONTROLLER_PUSH_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64 //dns-controller/cmd/dns-controller:push-image-arm64
# --------------------------------------------------
# development targets
@ -806,15 +809,15 @@ crds:
.PHONY: kops-controller-push
kops-controller-push:
DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} KOPS_CONTROLLER_TAG=${KOPS_CONTROLLER_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //cmd/kops-controller:push-image-plain
DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} KOPS_CONTROLLER_TAG=${KOPS_CONTROLLER_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //cmd/kops-controller:push-image-amd64
DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} KOPS_CONTROLLER_TAG=${KOPS_CONTROLLER_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64 //cmd/kops-controller:push-image-arm64
DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} KOPS_CONTROLLER_TAG=${KOPS_CONTROLLER_PUSH_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //cmd/kops-controller:push-image-plain
DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} KOPS_CONTROLLER_TAG=${KOPS_CONTROLLER_PUSH_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //cmd/kops-controller:push-image-amd64
DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} KOPS_CONTROLLER_TAG=${KOPS_CONTROLLER_PUSH_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64 //cmd/kops-controller:push-image-arm64
#------------------------------------------------------
# kube-apiserver-healthcheck
.PHONY: kube-apiserver-healthcheck-push
kube-apiserver-healthcheck-push:
DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} KUBE_APISERVER_HEALTHCHECK_TAG=${KUBE_APISERVER_HEALTHCHECK_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //cmd/kube-apiserver-healthcheck:push-image-plain
DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} KUBE_APISERVER_HEALTHCHECK_TAG=${KUBE_APISERVER_HEALTHCHECK_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //cmd/kube-apiserver-healthcheck:push-image-amd64
DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} KUBE_APISERVER_HEALTHCHECK_TAG=${KUBE_APISERVER_HEALTHCHECK_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64 //cmd/kube-apiserver-healthcheck:push-image-arm64
DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} KUBE_APISERVER_HEALTHCHECK_TAG=${KUBE_APISERVER_HEALTHCHECK_PUSH_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //cmd/kube-apiserver-healthcheck:push-image-plain
DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} KUBE_APISERVER_HEALTHCHECK_TAG=${KUBE_APISERVER_HEALTHCHECK_PUSH_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 //cmd/kube-apiserver-healthcheck:push-image-amd64
DOCKER_REGISTRY=${DOCKER_REGISTRY} DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX} KUBE_APISERVER_HEALTHCHECK_TAG=${KUBE_APISERVER_HEALTHCHECK_PUSH_TAG} bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_arm64 //cmd/kube-apiserver-healthcheck:push-image-arm64

1
hack/set-version
View File

@ -51,6 +51,7 @@ sed -i -e "s@DNS_CONTROLLER_TAG=${KOPS_RELEASE_VERSION}@DNS_CONTROLLER_TAG=${NEW
sed -i -e "s@KOPS_CONTROLLER_TAG=${KOPS_RELEASE_VERSION}@KOPS_CONTROLLER_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/urls_test.go
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" {}

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

@ -95,7 +95,7 @@ kind: Pod
spec:
containers:
- name: healthcheck
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.19.0-alpha.3
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.19.0-alpha.4
livenessProbe:
httpGet:
# 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
command:
- /kube-apiserver-healthcheck
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.19.0-alpha.3
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.19.0-alpha.4
livenessProbe:
httpGet:
host: 127.0.0.1

18
upup/models/bindata.go
View File

@ -2187,7 +2187,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.19.0-alpha.3
version: v1.19.0-alpha.4
spec:
replicas: 1
strategy:
@ -2200,7 +2200,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.19.0-alpha.3
version: v1.19.0-alpha.4
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
@ -2214,7 +2214,7 @@ spec:
serviceAccount: dns-controller
containers:
- name: dns-controller
image: k8s.gcr.io/kops/dns-controller:1.19.0-alpha.3
image: k8s.gcr.io/kops/dns-controller:1.19.0-alpha.4
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"
@ -2323,7 +2323,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.19.0-alpha.3
version: v1.19.0-alpha.4
spec:
replicas: 1
selector:
@ -2334,7 +2334,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.19.0-alpha.3
version: v1.19.0-alpha.4
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
# For 1.6, we keep the old tolerations in case of a downgrade to 1.5
@ -2350,7 +2350,7 @@ spec:
serviceAccount: dns-controller
containers:
- name: dns-controller
image: k8s.gcr.io/kops/dns-controller:1.19.0-alpha.3
image: k8s.gcr.io/kops/dns-controller:1.19.0-alpha.4
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"
@ -2728,7 +2728,7 @@ metadata:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.19.0-alpha.3
version: v1.19.0-alpha.4
spec:
selector:
matchLabels:
@ -2742,7 +2742,7 @@ spec:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.19.0-alpha.3
version: v1.19.0-alpha.4
spec:
priorityClassName: system-node-critical
tolerations:
@ -2755,7 +2755,7 @@ spec:
serviceAccount: kops-controller
containers:
- name: kops-controller
image: k8s.gcr.io/kops/kops-controller:1.19.0-alpha.3
image: k8s.gcr.io/kops/kops-controller:1.19.0-alpha.4
volumeMounts:
{{ if .UseHostCertificates }}
- mountPath: /etc/ssl/certs

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

@ -6,7 +6,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.19.0-alpha.3
version: v1.19.0-alpha.4
spec:
replicas: 1
strategy:
@ -19,7 +19,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.19.0-alpha.3
version: v1.19.0-alpha.4
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
@ -33,7 +33,7 @@ spec:
serviceAccount: dns-controller
containers:
- name: dns-controller
image: k8s.gcr.io/kops/dns-controller:1.19.0-alpha.3
image: k8s.gcr.io/kops/dns-controller:1.19.0-alpha.4
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"

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

@ -6,7 +6,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.19.0-alpha.3
version: v1.19.0-alpha.4
spec:
replicas: 1
selector:
@ -17,7 +17,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.19.0-alpha.3
version: v1.19.0-alpha.4
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
# For 1.6, we keep the old tolerations in case of a downgrade to 1.5
@ -33,7 +33,7 @@ spec:
serviceAccount: dns-controller
containers:
- name: dns-controller
image: k8s.gcr.io/kops/dns-controller:1.19.0-alpha.3
image: k8s.gcr.io/kops/dns-controller:1.19.0-alpha.4
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"

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

@ -19,7 +19,7 @@ metadata:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.19.0-alpha.3
version: v1.19.0-alpha.4
spec:
selector:
matchLabels:
@ -33,7 +33,7 @@ spec:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.19.0-alpha.3
version: v1.19.0-alpha.4
spec:
priorityClassName: system-node-critical
tolerations:
@ -46,7 +46,7 @@ spec:
serviceAccount: kops-controller
containers:
- name: kops-controller
image: k8s.gcr.io/kops/kops-controller:1.19.0-alpha.3
image: k8s.gcr.io/kops/kops-controller:1.19.0-alpha.4
volumeMounts:
{{ if .UseHostCertificates }}
- mountPath: /etc/ssl/certs

6
upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
View File

@ -172,7 +172,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann
{
key := "kops-controller.addons.k8s.io"
version := "1.19.0-alpha.3"
version := "1.19.0-alpha.4"
{
location := key + "/k8s-1.16.yaml"
@ -191,7 +191,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann
if featureflag.PublicJWKS.Enabled() {
key := "anonymous-issuer-discovery.addons.k8s.io"
version := "1.19.0-alpha.3"
version := "1.19.0-alpha.4"
{
location := key + "/k8s-1.16.yaml"
@ -439,7 +439,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann
if externalDNS == nil || !externalDNS.Disable {
{
key := "dns-controller.addons.k8s.io"
version := "1.19.0-alpha.3"
version := "1.19.0-alpha.4"
{
location := key + "/k8s-1.6.yaml"

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

@ -7,11 +7,11 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: 892363f3724b8af9a564d5ef3efd010418bad7b7
manifestHash: b047de23df3b0caff3784aaa89ae0c967e866c95
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.19.0-alpha.3
version: 1.19.0-alpha.4
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io
@ -57,19 +57,19 @@ spec:
- id: k8s-1.6
kubernetesVersion: <1.12.0
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: 2a12a3eee8ea83e43106b6f7d7ea978a14e9b246
manifestHash: bb0c5b13c5f82799b956e37f55dd05483ebf4a04
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.19.0-alpha.3
version: 1.19.0-alpha.4
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 916cfc0d1bd7d7c6c80e85045d768c4de9178c62
manifestHash: c3d3784d1204b1b57d1a9f2c6b0794cdae8352ae
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.19.0-alpha.3
version: 1.19.0-alpha.4
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml

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

@ -7,11 +7,11 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: 892363f3724b8af9a564d5ef3efd010418bad7b7
manifestHash: b047de23df3b0caff3784aaa89ae0c967e866c95
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.19.0-alpha.3
version: 1.19.0-alpha.4
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io
@ -57,19 +57,19 @@ spec:
- id: k8s-1.6
kubernetesVersion: <1.12.0
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: 2a12a3eee8ea83e43106b6f7d7ea978a14e9b246
manifestHash: bb0c5b13c5f82799b956e37f55dd05483ebf4a04
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.19.0-alpha.3
version: 1.19.0-alpha.4
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 916cfc0d1bd7d7c6c80e85045d768c4de9178c62
manifestHash: c3d3784d1204b1b57d1a9f2c6b0794cdae8352ae
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.19.0-alpha.3
version: 1.19.0-alpha.4
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml

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

@ -4,7 +4,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.19.0-alpha.3
version: v1.19.0-alpha.4
name: dns-controller
namespace: kube-system
spec:
@ -21,7 +21,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.19.0-alpha.3
version: v1.19.0-alpha.4
spec:
containers:
- command:
@ -34,7 +34,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: k8s.gcr.io/kops/dns-controller:1.19.0-alpha.3
image: k8s.gcr.io/kops/dns-controller:1.19.0-alpha.4
name: dns-controller
resources:
requests:

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

@ -17,7 +17,7 @@ metadata:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.19.0-alpha.3
version: v1.19.0-alpha.4
name: kops-controller
namespace: kube-system
spec:
@ -29,14 +29,14 @@ spec:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.19.0-alpha.3
version: v1.19.0-alpha.4
spec:
containers:
- command:
- /kops-controller
- --v=2
- --conf=/etc/kubernetes/kops-controller/config/config.yaml
image: k8s.gcr.io/kops/kops-controller:1.19.0-alpha.3
image: k8s.gcr.io/kops/kops-controller:1.19.0-alpha.4
name: kops-controller
resources:
requests:

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

@ -7,11 +7,11 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: 892363f3724b8af9a564d5ef3efd010418bad7b7
manifestHash: b047de23df3b0caff3784aaa89ae0c967e866c95
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.19.0-alpha.3
version: 1.19.0-alpha.4
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io
@ -57,19 +57,19 @@ spec:
- id: k8s-1.6
kubernetesVersion: <1.12.0
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: 2a12a3eee8ea83e43106b6f7d7ea978a14e9b246
manifestHash: bb0c5b13c5f82799b956e37f55dd05483ebf4a04
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.19.0-alpha.3
version: 1.19.0-alpha.4
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 916cfc0d1bd7d7c6c80e85045d768c4de9178c62
manifestHash: c3d3784d1204b1b57d1a9f2c6b0794cdae8352ae
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.19.0-alpha.3
version: 1.19.0-alpha.4
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/jwks/manifest.yaml
View File

@ -19,7 +19,7 @@ spec:
name: anonymous-access.addons.k8s.io
selector:
k8s-addon: anonymous-access.addons.k8s.io
version: 1.19.0-alpha.3
version: 1.19.0-alpha.4
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io

6
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/dns-controller.addons.k8s.io-k8s-1.12.yaml
View File

@ -4,7 +4,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.19.0-alpha.3
version: v1.19.0-alpha.4
name: dns-controller
namespace: kube-system
spec:
@ -21,7 +21,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.19.0-alpha.3
version: v1.19.0-alpha.4
spec:
containers:
- command:
@ -38,7 +38,7 @@ spec:
value: arn:aws:iam:::role/dns-controller.kube-system.sa.minimal.example.com
- name: AWS_WEB_IDENTITY_TOKEN_FILE
value: /var/run/secrets/amazonaws.com/token
image: k8s.gcr.io/kops/dns-controller:1.19.0-alpha.3
image: k8s.gcr.io/kops/dns-controller:1.19.0-alpha.4
name: dns-controller
resources:
requests:

6
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/kops-controller.addons.k8s.io-k8s-1.16.yaml
View File

@ -17,7 +17,7 @@ metadata:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.19.0-alpha.3
version: v1.19.0-alpha.4
name: kops-controller
namespace: kube-system
spec:
@ -29,14 +29,14 @@ spec:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.19.0-alpha.3
version: v1.19.0-alpha.4
spec:
containers:
- command:
- /kops-controller
- --v=2
- --conf=/etc/kubernetes/kops-controller/config/config.yaml
image: k8s.gcr.io/kops/kops-controller:1.19.0-alpha.3
image: k8s.gcr.io/kops/kops-controller:1.19.0-alpha.4
name: kops-controller
resources:
requests:

14
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/public-jwks/manifest.yaml
View File

@ -7,11 +7,11 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: 892363f3724b8af9a564d5ef3efd010418bad7b7
manifestHash: b047de23df3b0caff3784aaa89ae0c967e866c95
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.19.0-alpha.3
version: 1.19.0-alpha.4
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: anonymous-issuer-discovery.addons.k8s.io/k8s-1.16.yaml
@ -19,7 +19,7 @@ spec:
name: anonymous-issuer-discovery.addons.k8s.io
selector:
k8s-addon: anonymous-issuer-discovery.addons.k8s.io
version: 1.19.0-alpha.3
version: 1.19.0-alpha.4
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io
@ -65,19 +65,19 @@ spec:
- id: k8s-1.6
kubernetesVersion: <1.12.0
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: 2a12a3eee8ea83e43106b6f7d7ea978a14e9b246
manifestHash: bb0c5b13c5f82799b956e37f55dd05483ebf4a04
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.19.0-alpha.3
version: 1.19.0-alpha.4
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: bcd96c6ebb616cb060250132b9bf802f59f7446b
manifestHash: 767e92b277dad99d830ddfa0dfc37f15731f4b8e
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.19.0-alpha.3
version: 1.19.0-alpha.4
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml

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

@ -4,7 +4,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.19.0-alpha.3
version: v1.19.0-alpha.4
name: dns-controller
namespace: kube-system
spec:
@ -21,7 +21,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.19.0-alpha.3
version: v1.19.0-alpha.4
spec:
containers:
- command:
@ -34,7 +34,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: k8s.gcr.io/kops/dns-controller:1.19.0-alpha.3
image: k8s.gcr.io/kops/dns-controller:1.19.0-alpha.4
name: dns-controller
resources:
requests:

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

@ -17,7 +17,7 @@ metadata:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.19.0-alpha.3
version: v1.19.0-alpha.4
name: kops-controller
namespace: kube-system
spec:
@ -29,14 +29,14 @@ spec:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.19.0-alpha.3
version: v1.19.0-alpha.4
spec:
containers:
- command:
- /kops-controller
- --v=2
- --conf=/etc/kubernetes/kops-controller/config/config.yaml
image: k8s.gcr.io/kops/kops-controller:1.19.0-alpha.3
image: k8s.gcr.io/kops/kops-controller:1.19.0-alpha.4
name: kops-controller
resources:
requests:

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

@ -7,11 +7,11 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: 892363f3724b8af9a564d5ef3efd010418bad7b7
manifestHash: b047de23df3b0caff3784aaa89ae0c967e866c95
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.19.0-alpha.3
version: 1.19.0-alpha.4
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io
@ -57,19 +57,19 @@ spec:
- id: k8s-1.6
kubernetesVersion: <1.12.0
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: 2a12a3eee8ea83e43106b6f7d7ea978a14e9b246
manifestHash: bb0c5b13c5f82799b956e37f55dd05483ebf4a04
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.19.0-alpha.3
version: 1.19.0-alpha.4
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 916cfc0d1bd7d7c6c80e85045d768c4de9178c62
manifestHash: c3d3784d1204b1b57d1a9f2c6b0794cdae8352ae
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.19.0-alpha.3
version: 1.19.0-alpha.4
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml

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

@ -7,11 +7,11 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: 892363f3724b8af9a564d5ef3efd010418bad7b7
manifestHash: b047de23df3b0caff3784aaa89ae0c967e866c95
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.19.0-alpha.3
version: 1.19.0-alpha.4
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io
@ -57,19 +57,19 @@ spec:
- id: k8s-1.6
kubernetesVersion: <1.12.0
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: 2a12a3eee8ea83e43106b6f7d7ea978a14e9b246
manifestHash: bb0c5b13c5f82799b956e37f55dd05483ebf4a04
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.19.0-alpha.3
version: 1.19.0-alpha.4
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 916cfc0d1bd7d7c6c80e85045d768c4de9178c62
manifestHash: c3d3784d1204b1b57d1a9f2c6b0794cdae8352ae
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.19.0-alpha.3
version: 1.19.0-alpha.4
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml

24
upup/pkg/fi/cloudup/urls_test.go
View File

@ -35,33 +35,33 @@ func Test_BuildMirroredAsset(t *testing.T) {
{
url: "https://kubeupv2.s3.amazonaws.com/kops/%s/images/protokube-linux-amd64",
expected: []string{
"https://artifacts.k8s.io/binaries/kops/1.19.0-alpha.3/images/protokube-linux-amd64",
"https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.3/images-protokube-linux-amd64",
"https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.3/images/protokube-linux-amd64",
"https://artifacts.k8s.io/binaries/kops/1.19.0-alpha.4/images/protokube-linux-amd64",
"https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.4/images-protokube-linux-amd64",
"https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.4/images/protokube-linux-amd64",
},
},
{
url: "https://kubeupv2.s3.amazonaws.com/kops/%s/images/protokube-linux-arm64",
expected: []string{
"https://artifacts.k8s.io/binaries/kops/1.19.0-alpha.3/images/protokube-linux-arm64",
"https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.3/images-protokube-linux-arm64",
"https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.3/images/protokube-linux-arm64",
"https://artifacts.k8s.io/binaries/kops/1.19.0-alpha.4/images/protokube-linux-arm64",
"https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.4/images-protokube-linux-arm64",
"https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.4/images/protokube-linux-arm64",
},
},
{
url: "https://kubeupv2.s3.amazonaws.com/kops/%s/linux/amd64/nodeup",
expected: []string{
"https://artifacts.k8s.io/binaries/kops/1.19.0-alpha.3/linux/amd64/nodeup",
"https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.3/nodeup-linux-amd64",
"https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.3/linux/amd64/nodeup",
"https://artifacts.k8s.io/binaries/kops/1.19.0-alpha.4/linux/amd64/nodeup",
"https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.4/nodeup-linux-amd64",
"https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.4/linux/amd64/nodeup",
},
},
{
url: "https://kubeupv2.s3.amazonaws.com/kops/%s/linux/arm64/nodeup",
expected: []string{
"https://artifacts.k8s.io/binaries/kops/1.19.0-alpha.3/linux/arm64/nodeup",
"https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.3/nodeup-linux-arm64",
"https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.3/linux/arm64/nodeup",
"https://artifacts.k8s.io/binaries/kops/1.19.0-alpha.4/linux/arm64/nodeup",
"https://github.com/kubernetes/kops/releases/download/v1.19.0-alpha.4/nodeup-linux-arm64",
"https://kubeupv2.s3.amazonaws.com/kops/1.19.0-alpha.4/linux/arm64/nodeup",
},
},
}

4
version.go
View File

@ -23,8 +23,8 @@ var Version = KOPS_RELEASE_VERSION
// These constants are parsed by build tooling - be careful about changing the formats
const (
KOPS_RELEASE_VERSION = "1.19.0-alpha.3"
KOPS_CI_VERSION = "1.19.0-alpha.4"
KOPS_RELEASE_VERSION = "1.19.0-alpha.4"
KOPS_CI_VERSION = "1.19.0-alpha.5"
)
// GitVersion should be replaced by the makefile