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

Release 1.21.5 (#13319)

This commit is contained in:
Justin Santa Barbara 2022-03-05 05:00:52 -05:00 committed by GitHub
parent adfeba6fb1
commit 1dec467005
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 123 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -64,13 +64,13 @@ GITSHA := $(shell cd ${KOPS_ROOT}; git describe --always)
# 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=1.21.4
DNS_CONTROLLER_TAG=1.21.5
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=1.21.4
KOPS_CONTROLLER_TAG=1.21.5
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=1.21.4
KUBE_APISERVER_HEALTHCHECK_TAG=1.21.5
KUBE_APISERVER_HEALTHCHECK_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KUBE_APISERVER_HEALTHCHECK_TAG | awk '{print $$2}')

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.21.4
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.21.5
livenessProbe:
httpGet:
# The sidecar serves a healthcheck on the same port,

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

@ -12,7 +12,7 @@ Contents: |
- --client-key=/secrets/client.key
command:
- /kube-apiserver-healthcheck
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.21.4
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.21.5
livenessProbe:
httpGet:
host: 127.0.0.1

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.21.4
version: v1.21.5
spec:
replicas: 1
strategy:
@ -19,7 +19,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.21.4
version: v1.21.5
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.21.4
image: k8s.gcr.io/kops/dns-controller:1.21.5
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.21.4
version: v1.21.5
spec:
selector:
matchLabels:
@ -31,7 +31,7 @@ spec:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.21.4
version: v1.21.5
{{ if UseKopsControllerForNodeBootstrap }}
annotations:
dns.alpha.kubernetes.io/internal: kops-controller.internal.{{ ClusterName }}
@ -49,7 +49,7 @@ spec:
serviceAccount: kops-controller
containers:
- name: kops-controller
image: k8s.gcr.io/kops/kops-controller:1.21.4
image: k8s.gcr.io/kops/kops-controller:1.21.5
volumeMounts:
{{ if .UseHostCertificates }}
- mountPath: /etc/ssl/certs

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

@ -211,7 +211,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann
{
key := "kops-controller.addons.k8s.io"
version := "1.21.4"
version := "1.21.5"
{
location := key + "/k8s-1.16.yaml"
@ -386,7 +386,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann
if externalDNS == nil || !externalDNS.Disable {
{
key := "dns-controller.addons.k8s.io"
version := "1.21.4"
version := "1.21.5"
{
location := key + "/k8s-1.12.yaml"

8
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml
View File

@ -7,12 +7,12 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: 4882f7eb53d6e6bd4fefeb429ec710d4f8437c66
manifestHash: f801b988f2ce44c55d249182893646108f14c8b5
name: kops-controller.addons.k8s.io
needsRollingUpdate: control-plane
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.21.4
version: 1.21.5
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 75dd91a5b15ade4a61ebc1de8c35714376dfbed4
name: core.addons.k8s.io
@ -48,11 +48,11 @@ spec:
version: 1.5.0
- id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: f011be3908d29b3291ade5ca5e52f1d7d7ef928c
manifestHash: b8c86fa84f1be1a5379d526d01f403427280bd96
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.21.4
version: 1.21.5
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml

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

@ -7,12 +7,12 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: 4882f7eb53d6e6bd4fefeb429ec710d4f8437c66
manifestHash: f801b988f2ce44c55d249182893646108f14c8b5
name: kops-controller.addons.k8s.io
needsRollingUpdate: control-plane
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.21.4
version: 1.21.5
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 75dd91a5b15ade4a61ebc1de8c35714376dfbed4
name: core.addons.k8s.io
@ -48,11 +48,11 @@ spec:
version: 1.5.0
- id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: f011be3908d29b3291ade5ca5e52f1d7d7ef928c
manifestHash: b8c86fa84f1be1a5379d526d01f403427280bd96
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.21.4
version: 1.21.5
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml

8
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml
View File

@ -7,12 +7,12 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: cacb4bd2303985e203deef8e311a1f2528fd0742
manifestHash: 1b9b4625eb40e3955548ebbf1acc4b623fb180d3
name: kops-controller.addons.k8s.io
needsRollingUpdate: control-plane
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.21.4
version: 1.21.5
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 75dd91a5b15ade4a61ebc1de8c35714376dfbed4
name: core.addons.k8s.io
@ -41,11 +41,11 @@ spec:
version: 1.5.0
- id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: f011be3908d29b3291ade5ca5e52f1d7d7ef928c
manifestHash: b8c86fa84f1be1a5379d526d01f403427280bd96
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.21.4
version: 1.21.5
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml

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

@ -7,12 +7,12 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: cacb4bd2303985e203deef8e311a1f2528fd0742
manifestHash: 1b9b4625eb40e3955548ebbf1acc4b623fb180d3
name: kops-controller.addons.k8s.io
needsRollingUpdate: control-plane
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.21.4
version: 1.21.5
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 75dd91a5b15ade4a61ebc1de8c35714376dfbed4
name: core.addons.k8s.io
@ -41,11 +41,11 @@ spec:
version: 1.5.0
- id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: f011be3908d29b3291ade5ca5e52f1d7d7ef928c
manifestHash: b8c86fa84f1be1a5379d526d01f403427280bd96
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.21.4
version: 1.21.5
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml

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

@ -4,11 +4,11 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: dns-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.21.4
version: v1.21.5
name: dns-controller
namespace: kube-system
spec:
@ -25,7 +25,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.21.4
version: v1.21.5
spec:
containers:
- command:
@ -38,7 +38,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: k8s.gcr.io/kops/dns-controller:1.21.4
image: k8s.gcr.io/kops/dns-controller:1.21.5
name: dns-controller
resources:
requests:
@ -63,7 +63,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: dns-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: dns-controller.addons.k8s.io
name: dns-controller
@ -77,7 +77,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: dns-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: dns-controller.addons.k8s.io
name: kops:dns-controller
@ -111,7 +111,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: dns-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: dns-controller.addons.k8s.io
name: kops:dns-controller

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

@ -7,7 +7,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
name: kops-controller
@ -21,11 +21,11 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.21.4
version: v1.21.5
name: kops-controller
namespace: kube-system
spec:
@ -37,7 +37,7 @@ spec:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.21.4
version: v1.21.5
spec:
containers:
- command:
@ -47,7 +47,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: k8s.gcr.io/kops/kops-controller:1.21.4
image: k8s.gcr.io/kops/kops-controller:1.21.5
name: kops-controller
resources:
requests:
@ -89,7 +89,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
name: kops-controller
@ -103,7 +103,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
name: kops-controller
@ -126,7 +126,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
name: kops-controller
@ -147,7 +147,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
name: kops-controller
@ -194,7 +194,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
name: kops-controller

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

@ -7,12 +7,12 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: 4882f7eb53d6e6bd4fefeb429ec710d4f8437c66
manifestHash: f801b988f2ce44c55d249182893646108f14c8b5
name: kops-controller.addons.k8s.io
needsRollingUpdate: control-plane
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.21.4
version: 1.21.5
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 75dd91a5b15ade4a61ebc1de8c35714376dfbed4
name: core.addons.k8s.io
@ -48,11 +48,11 @@ spec:
version: 1.5.0
- id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: f011be3908d29b3291ade5ca5e52f1d7d7ef928c
manifestHash: b8c86fa84f1be1a5379d526d01f403427280bd96
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.21.4
version: 1.21.5
- 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.21.4
version: 1.21.5
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io

8
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.18/manifest.yaml
View File

@ -7,12 +7,12 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: 4882f7eb53d6e6bd4fefeb429ec710d4f8437c66
manifestHash: f801b988f2ce44c55d249182893646108f14c8b5
name: kops-controller.addons.k8s.io
needsRollingUpdate: control-plane
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.21.4
version: 1.21.5
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 75dd91a5b15ade4a61ebc1de8c35714376dfbed4
name: core.addons.k8s.io
@ -48,11 +48,11 @@ spec:
version: 1.5.0
- id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: f011be3908d29b3291ade5ca5e52f1d7d7ef928c
manifestHash: b8c86fa84f1be1a5379d526d01f403427280bd96
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.21.4
version: 1.21.5
- id: k8s-1.11
manifest: metrics-server.addons.k8s.io/k8s-1.11.yaml
manifestHash: a760a68f4d76cfddb5a2cd9afa9afdb0b301d187

8
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml
View File

@ -7,12 +7,12 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: cacb4bd2303985e203deef8e311a1f2528fd0742
manifestHash: 1b9b4625eb40e3955548ebbf1acc4b623fb180d3
name: kops-controller.addons.k8s.io
needsRollingUpdate: control-plane
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.21.4
version: 1.21.5
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 75dd91a5b15ade4a61ebc1de8c35714376dfbed4
name: core.addons.k8s.io
@ -41,11 +41,11 @@ spec:
version: 1.5.0
- id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: f011be3908d29b3291ade5ca5e52f1d7d7ef928c
manifestHash: b8c86fa84f1be1a5379d526d01f403427280bd96
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.21.4
version: 1.21.5
- id: k8s-1.11
manifest: metrics-server.addons.k8s.io/k8s-1.11.yaml
manifestHash: a760a68f4d76cfddb5a2cd9afa9afdb0b301d187

8
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.18/manifest.yaml
View File

@ -7,12 +7,12 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: 4882f7eb53d6e6bd4fefeb429ec710d4f8437c66
manifestHash: f801b988f2ce44c55d249182893646108f14c8b5
name: kops-controller.addons.k8s.io
needsRollingUpdate: control-plane
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.21.4
version: 1.21.5
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 75dd91a5b15ade4a61ebc1de8c35714376dfbed4
name: core.addons.k8s.io
@ -48,11 +48,11 @@ spec:
version: 1.5.0
- id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: f011be3908d29b3291ade5ca5e52f1d7d7ef928c
manifestHash: b8c86fa84f1be1a5379d526d01f403427280bd96
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.21.4
version: 1.21.5
- id: k8s-1.11
manifest: metrics-server.addons.k8s.io/k8s-1.11.yaml
manifestHash: d4a188bdcd03921d7852fa12f4dbb7d996b7edb5

8
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml
View File

@ -7,12 +7,12 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: cacb4bd2303985e203deef8e311a1f2528fd0742
manifestHash: 1b9b4625eb40e3955548ebbf1acc4b623fb180d3
name: kops-controller.addons.k8s.io
needsRollingUpdate: control-plane
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.21.4
version: 1.21.5
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 75dd91a5b15ade4a61ebc1de8c35714376dfbed4
name: core.addons.k8s.io
@ -41,11 +41,11 @@ spec:
version: 1.5.0
- id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: f011be3908d29b3291ade5ca5e52f1d7d7ef928c
manifestHash: b8c86fa84f1be1a5379d526d01f403427280bd96
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.21.4
version: 1.21.5
- id: k8s-1.11
manifest: metrics-server.addons.k8s.io/k8s-1.11.yaml
manifestHash: 3795901da096a90916f4258aec1dc656f16d2b8f

14
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/dns-controller.addons.k8s.io-k8s-1.12.yaml
View File

@ -4,11 +4,11 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: dns-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.21.4
version: v1.21.5
name: dns-controller
namespace: kube-system
spec:
@ -25,7 +25,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.21.4
version: v1.21.5
spec:
containers:
- command:
@ -42,7 +42,7 @@ spec:
value: arn:aws-test:iam::123456789012: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.21.4
image: k8s.gcr.io/kops/dns-controller:1.21.5
name: dns-controller
resources:
requests:
@ -82,7 +82,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: dns-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: dns-controller.addons.k8s.io
name: dns-controller
@ -96,7 +96,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: dns-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: dns-controller.addons.k8s.io
name: kops:dns-controller
@ -130,7 +130,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: dns-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: dns-controller.addons.k8s.io
name: kops:dns-controller

20
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/kops-controller.addons.k8s.io-k8s-1.16.yaml
View File

@ -7,7 +7,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
name: kops-controller
@ -21,11 +21,11 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.21.4
version: v1.21.5
name: kops-controller
namespace: kube-system
spec:
@ -37,7 +37,7 @@ spec:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.21.4
version: v1.21.5
spec:
containers:
- command:
@ -47,7 +47,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: k8s.gcr.io/kops/kops-controller:1.21.4
image: k8s.gcr.io/kops/kops-controller:1.21.5
name: kops-controller
resources:
requests:
@ -89,7 +89,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
name: kops-controller
@ -103,7 +103,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
name: kops-controller
@ -126,7 +126,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
name: kops-controller
@ -147,7 +147,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
name: kops-controller
@ -194,7 +194,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
name: kops-controller

8
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml
View File

@ -7,12 +7,12 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: 4882f7eb53d6e6bd4fefeb429ec710d4f8437c66
manifestHash: f801b988f2ce44c55d249182893646108f14c8b5
name: kops-controller.addons.k8s.io
needsRollingUpdate: control-plane
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.21.4
version: 1.21.5
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 75dd91a5b15ade4a61ebc1de8c35714376dfbed4
name: core.addons.k8s.io
@ -48,11 +48,11 @@ spec:
version: 1.5.0
- id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 15ce192161325b0be1986be142b33a4f4019817f
manifestHash: 5cfeee9a007f5cd1c10cdfee51af9e2cfdd501ac
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.21.4
version: 1.21.5
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml

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

@ -4,11 +4,11 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: dns-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.21.4
version: v1.21.5
name: dns-controller
namespace: kube-system
spec:
@ -25,7 +25,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.21.4
version: v1.21.5
spec:
containers:
- command:
@ -38,7 +38,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: k8s.gcr.io/kops/dns-controller:1.21.4
image: k8s.gcr.io/kops/dns-controller:1.21.5
name: dns-controller
resources:
requests:
@ -63,7 +63,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: dns-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: dns-controller.addons.k8s.io
name: dns-controller
@ -77,7 +77,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: dns-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: dns-controller.addons.k8s.io
name: kops:dns-controller
@ -111,7 +111,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: dns-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: dns-controller.addons.k8s.io
name: kops:dns-controller

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

@ -7,7 +7,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
name: kops-controller
@ -21,11 +21,11 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.21.4
version: v1.21.5
name: kops-controller
namespace: kube-system
spec:
@ -39,7 +39,7 @@ spec:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.21.4
version: v1.21.5
spec:
containers:
- command:
@ -49,7 +49,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: k8s.gcr.io/kops/kops-controller:1.21.4
image: k8s.gcr.io/kops/kops-controller:1.21.5
name: kops-controller
resources:
requests:
@ -91,7 +91,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
name: kops-controller
@ -105,7 +105,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
name: kops-controller
@ -128,7 +128,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
name: kops-controller
@ -149,7 +149,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
name: kops-controller
@ -196,7 +196,7 @@ metadata:
creationTimestamp: null
labels:
addon.kops.k8s.io/name: kops-controller.addons.k8s.io
addon.kops.k8s.io/version: 1.21.4
addon.kops.k8s.io/version: 1.21.5
app.kubernetes.io/managed-by: kops
k8s-addon: kops-controller.addons.k8s.io
name: kops-controller

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

@ -7,12 +7,12 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: cacb4bd2303985e203deef8e311a1f2528fd0742
manifestHash: 1b9b4625eb40e3955548ebbf1acc4b623fb180d3
name: kops-controller.addons.k8s.io
needsRollingUpdate: control-plane
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.21.4
version: 1.21.5
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 75dd91a5b15ade4a61ebc1de8c35714376dfbed4
name: core.addons.k8s.io
@ -41,11 +41,11 @@ spec:
version: 1.5.0
- id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: f011be3908d29b3291ade5ca5e52f1d7d7ef928c
manifestHash: b8c86fa84f1be1a5379d526d01f403427280bd96
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.21.4
version: 1.21.5
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml

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

@ -7,12 +7,12 @@ spec:
- id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: cacb4bd2303985e203deef8e311a1f2528fd0742
manifestHash: 1b9b4625eb40e3955548ebbf1acc4b623fb180d3
name: kops-controller.addons.k8s.io
needsRollingUpdate: control-plane
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.21.4
version: 1.21.5
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 75dd91a5b15ade4a61ebc1de8c35714376dfbed4
name: core.addons.k8s.io
@ -41,11 +41,11 @@ spec:
version: 1.5.0
- id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: f011be3908d29b3291ade5ca5e52f1d7d7ef928c
manifestHash: b8c86fa84f1be1a5379d526d01f403427280bd96
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.21.4
version: 1.21.5
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml

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

@ -36,29 +36,29 @@ func Test_BuildMirroredAsset(t *testing.T) {
{
url: "https://artifacts.k8s.io/binaries/kops/%s/images/protokube-linux-amd64",
expected: []string{
"https://artifacts.k8s.io/binaries/kops/1.21.4/images/protokube-linux-amd64",
"https://github.com/kubernetes/kops/releases/download/v1.21.4/images-protokube-linux-amd64",
"https://artifacts.k8s.io/binaries/kops/1.21.5/images/protokube-linux-amd64",
"https://github.com/kubernetes/kops/releases/download/v1.21.5/images-protokube-linux-amd64",
},
},
{
url: "https://artifacts.k8s.io/binaries/kops/%s/images/protokube-linux-arm64",
expected: []string{
"https://artifacts.k8s.io/binaries/kops/1.21.4/images/protokube-linux-arm64",
"https://github.com/kubernetes/kops/releases/download/v1.21.4/images-protokube-linux-arm64",
"https://artifacts.k8s.io/binaries/kops/1.21.5/images/protokube-linux-arm64",
"https://github.com/kubernetes/kops/releases/download/v1.21.5/images-protokube-linux-arm64",
},
},
{
url: "https://artifacts.k8s.io/binaries/kops/%s/linux/amd64/nodeup",
expected: []string{
"https://artifacts.k8s.io/binaries/kops/1.21.4/linux/amd64/nodeup",
"https://github.com/kubernetes/kops/releases/download/v1.21.4/nodeup-linux-amd64",
"https://artifacts.k8s.io/binaries/kops/1.21.5/linux/amd64/nodeup",
"https://github.com/kubernetes/kops/releases/download/v1.21.5/nodeup-linux-amd64",
},
},
{
url: "https://artifacts.k8s.io/binaries/kops/%s/linux/arm64/nodeup",
expected: []string{
"https://artifacts.k8s.io/binaries/kops/1.21.4/linux/arm64/nodeup",
"https://github.com/kubernetes/kops/releases/download/v1.21.4/nodeup-linux-arm64",
"https://artifacts.k8s.io/binaries/kops/1.21.5/linux/arm64/nodeup",
"https://github.com/kubernetes/kops/releases/download/v1.21.5/nodeup-linux-arm64",
},
},
}

4
version.go
View File

@ -21,8 +21,8 @@ var Version = KOPS_RELEASE_VERSION
// These constants are parsed by build tooling - be careful about changing the formats
const (
KOPS_RELEASE_VERSION = "1.21.4"
KOPS_CI_VERSION = "1.21.5"
KOPS_RELEASE_VERSION = "1.21.5"
KOPS_CI_VERSION = "1.21.6"
)
// GitVersion should be replaced by the makefile