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

Release 1.20.3 (#12510) 

* Release 1.20.3

* Run hack/update-expected.sh
This commit is contained in:
Ciprian Hacman 2021-10-09 08:50:36 +03:00 committed by GitHub
parent 3171f908f6
commit 6995b12559
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 86 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -66,13 +66,13 @@ PROTOKUBE_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_PROTOKUBE_TAG
# We lock the versions of our controllers also # We lock the versions of our controllers also
# We need to keep in sync with: # We need to keep in sync with:
# upup/models/cloudup/resources/addons/dns-controller/ # upup/models/cloudup/resources/addons/dns-controller/
DNS_CONTROLLER_TAG=1.20.2 DNS_CONTROLLER_TAG=1.20.3
DNS_CONTROLLER_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_DNS_CONTROLLER_TAG | awk '{print $$2}') 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/ # upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/
KOPS_CONTROLLER_TAG=1.20.2 KOPS_CONTROLLER_TAG=1.20.3
KOPS_CONTROLLER_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KOPS_CONTROLLER_TAG | awk '{print $$2}') KOPS_CONTROLLER_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KOPS_CONTROLLER_TAG | awk '{print $$2}')
# pkg/model/components/kubeapiserver/model.go # pkg/model/components/kubeapiserver/model.go
KUBE_APISERVER_HEALTHCHECK_TAG=1.20.2 KUBE_APISERVER_HEALTHCHECK_TAG=1.20.3
KUBE_APISERVER_HEALTHCHECK_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KUBE_APISERVER_HEALTHCHECK_TAG | awk '{print $$2}') 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: spec:
containers: containers:
- name: healthcheck - name: healthcheck
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.20.2 image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.20.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

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

12
upup/models/bindata.go
View File

@ -29305,7 +29305,7 @@ metadata:
labels: labels:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller k8s-app: dns-controller
version: v1.20.2 version: v1.20.3
spec: spec:
replicas: 1 replicas: 1
strategy: strategy:
@ -29318,7 +29318,7 @@ spec:
labels: labels:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller k8s-app: dns-controller
version: v1.20.2 version: v1.20.3
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
@ -29332,7 +29332,7 @@ spec:
serviceAccount: dns-controller serviceAccount: dns-controller
containers: containers:
- name: dns-controller - name: dns-controller
image: k8s.gcr.io/kops/dns-controller:1.20.2 image: k8s.gcr.io/kops/dns-controller:1.20.3
command: command:
{{ range $arg := DnsControllerArgv }} {{ range $arg := DnsControllerArgv }}
- "{{ $arg }}" - "{{ $arg }}"
@ -29604,7 +29604,7 @@ metadata:
labels: labels:
k8s-addon: kops-controller.addons.k8s.io k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller k8s-app: kops-controller
version: v1.20.2 version: v1.20.3
spec: spec:
selector: selector:
matchLabels: matchLabels:
@ -29618,7 +29618,7 @@ spec:
labels: labels:
k8s-addon: kops-controller.addons.k8s.io k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller k8s-app: kops-controller
version: v1.20.2 version: v1.20.3
{{ if UseKopsControllerForNodeBootstrap }} {{ if UseKopsControllerForNodeBootstrap }}
annotations: annotations:
dns.alpha.kubernetes.io/internal: kops-controller.internal.{{ ClusterName }} dns.alpha.kubernetes.io/internal: kops-controller.internal.{{ ClusterName }}
@ -29636,7 +29636,7 @@ spec:
serviceAccount: kops-controller serviceAccount: kops-controller
containers: containers:
- name: kops-controller - name: kops-controller
image: k8s.gcr.io/kops/kops-controller:1.20.2 image: k8s.gcr.io/kops/kops-controller:1.20.3
volumeMounts: volumeMounts:
{{ if .UseHostCertificates }} {{ if .UseHostCertificates }}
- mountPath: /etc/ssl/certs - 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: labels:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller k8s-app: dns-controller
version: v1.20.2 version: v1.20.3
spec: spec:
replicas: 1 replicas: 1
strategy: strategy:
@ -19,7 +19,7 @@ spec:
labels: labels:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller k8s-app: dns-controller
version: v1.20.2 version: v1.20.3
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
@ -33,7 +33,7 @@ spec:
serviceAccount: dns-controller serviceAccount: dns-controller
containers: containers:
- name: dns-controller - name: dns-controller
image: k8s.gcr.io/kops/dns-controller:1.20.2 image: k8s.gcr.io/kops/dns-controller:1.20.3
command: command:
{{ range $arg := DnsControllerArgv }} {{ range $arg := DnsControllerArgv }}
- "{{ $arg }}" - "{{ $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: labels:
k8s-addon: kops-controller.addons.k8s.io k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller k8s-app: kops-controller
version: v1.20.2 version: v1.20.3
spec: spec:
selector: selector:
matchLabels: matchLabels:
@ -33,7 +33,7 @@ spec:
labels: labels:
k8s-addon: kops-controller.addons.k8s.io k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller k8s-app: kops-controller
version: v1.20.2 version: v1.20.3
{{ if UseKopsControllerForNodeBootstrap }} {{ if UseKopsControllerForNodeBootstrap }}
annotations: annotations:
dns.alpha.kubernetes.io/internal: kops-controller.internal.{{ ClusterName }} dns.alpha.kubernetes.io/internal: kops-controller.internal.{{ ClusterName }}
@ -51,7 +51,7 @@ spec:
serviceAccount: kops-controller serviceAccount: kops-controller
containers: containers:
- name: kops-controller - name: kops-controller
image: k8s.gcr.io/kops/kops-controller:1.20.2 image: k8s.gcr.io/kops/kops-controller:1.20.3
volumeMounts: volumeMounts:
{{ if .UseHostCertificates }} {{ if .UseHostCertificates }}
- mountPath: /etc/ssl/certs - mountPath: /etc/ssl/certs

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

@ -209,7 +209,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann
{ {
key := "kops-controller.addons.k8s.io" key := "kops-controller.addons.k8s.io"
version := "1.20.2" version := "1.20.3"
{ {
location := key + "/k8s-1.16.yaml" location := key + "/k8s-1.16.yaml"
@ -228,7 +228,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann
if featureflag.PublicJWKS.Enabled() { if featureflag.PublicJWKS.Enabled() {
key := "anonymous-issuer-discovery.addons.k8s.io" key := "anonymous-issuer-discovery.addons.k8s.io"
version := "1.20.2" version := "1.20.3"
{ {
location := key + "/k8s-1.16.yaml" location := key + "/k8s-1.16.yaml"
@ -402,7 +402,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann
if externalDNS == nil || !externalDNS.Disable { if externalDNS == nil || !externalDNS.Disable {
{ {
key := "dns-controller.addons.k8s.io" key := "dns-controller.addons.k8s.io"
version := "1.20.2" version := "1.20.3"
{ {
location := key + "/k8s-1.12.yaml" location := key + "/k8s-1.12.yaml"

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

@ -7,11 +7,11 @@ 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: 2b13a0c7904bdae5a70234bbfdc4f406f83d7c52 manifestHash: 34255b4d35a99fcf5cf1c33780e867055d6d072a
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
version: 1.20.2 version: 1.20.3
- manifest: core.addons.k8s.io/v1.4.0.yaml - manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io name: core.addons.k8s.io
@ -47,11 +47,11 @@ spec:
version: 1.5.0 version: 1.5.0
- id: k8s-1.12 - id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 2e4bb737c7635145d5dbc02895c8248599d0942d manifestHash: 194785cee00c594bd445a3042365c0b6773cf2bf
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
version: 1.20.2 version: 1.20.3
- id: v1.15.0 - id: v1.15.0
kubernetesVersion: '>=1.15.0' kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml manifest: storage-aws.addons.k8s.io/v1.15.0.yaml

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

@ -7,11 +7,11 @@ 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: 2b13a0c7904bdae5a70234bbfdc4f406f83d7c52 manifestHash: 34255b4d35a99fcf5cf1c33780e867055d6d072a
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
version: 1.20.2 version: 1.20.3
- manifest: core.addons.k8s.io/v1.4.0.yaml - manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io name: core.addons.k8s.io
@ -47,11 +47,11 @@ spec:
version: 1.5.0 version: 1.5.0
- id: k8s-1.12 - id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 2e4bb737c7635145d5dbc02895c8248599d0942d manifestHash: 194785cee00c594bd445a3042365c0b6773cf2bf
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
version: 1.20.2 version: 1.20.3
- id: v1.15.0 - id: v1.15.0
kubernetesVersion: '>=1.15.0' kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml manifest: storage-aws.addons.k8s.io/v1.15.0.yaml

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

@ -7,11 +7,11 @@ 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: cf4188f9253ee56ddfead4cf27e8394ac3b6cea1 manifestHash: c088e142383496713e5bb47197a8d881e85c4465
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
version: 1.20.2 version: 1.20.3
- manifest: core.addons.k8s.io/v1.4.0.yaml - manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io name: core.addons.k8s.io
@ -40,11 +40,11 @@ spec:
version: 1.5.0 version: 1.5.0
- id: k8s-1.12 - id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 2e4bb737c7635145d5dbc02895c8248599d0942d manifestHash: 194785cee00c594bd445a3042365c0b6773cf2bf
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
version: 1.20.2 version: 1.20.3
- id: v1.15.0 - id: v1.15.0
kubernetesVersion: '>=1.15.0' kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml manifest: storage-aws.addons.k8s.io/v1.15.0.yaml

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

@ -7,11 +7,11 @@ 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: cf4188f9253ee56ddfead4cf27e8394ac3b6cea1 manifestHash: c088e142383496713e5bb47197a8d881e85c4465
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
version: 1.20.2 version: 1.20.3
- manifest: core.addons.k8s.io/v1.4.0.yaml - manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io name: core.addons.k8s.io
@ -40,11 +40,11 @@ spec:
version: 1.5.0 version: 1.5.0
- id: k8s-1.12 - id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 2e4bb737c7635145d5dbc02895c8248599d0942d manifestHash: 194785cee00c594bd445a3042365c0b6773cf2bf
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
version: 1.20.2 version: 1.20.3
- id: v1.15.0 - id: v1.15.0
kubernetesVersion: '>=1.15.0' kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml 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: labels:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller k8s-app: dns-controller
version: v1.20.2 version: v1.20.3
name: dns-controller name: dns-controller
namespace: kube-system namespace: kube-system
spec: spec:
@ -21,7 +21,7 @@ spec:
labels: labels:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller k8s-app: dns-controller
version: v1.20.2 version: v1.20.3
spec: spec:
containers: containers:
- command: - command:
@ -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: k8s.gcr.io/kops/dns-controller:1.20.2 image: k8s.gcr.io/kops/dns-controller:1.20.3
name: dns-controller name: dns-controller
resources: resources:
requests: 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: labels:
k8s-addon: kops-controller.addons.k8s.io k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller k8s-app: kops-controller
version: v1.20.2 version: v1.20.3
name: kops-controller name: kops-controller
namespace: kube-system namespace: kube-system
spec: spec:
@ -29,14 +29,14 @@ spec:
labels: labels:
k8s-addon: kops-controller.addons.k8s.io k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller k8s-app: kops-controller
version: v1.20.2 version: v1.20.3
spec: spec:
containers: containers:
- command: - command:
- /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: k8s.gcr.io/kops/kops-controller:1.20.2 image: k8s.gcr.io/kops/kops-controller:1.20.3
name: kops-controller name: kops-controller
resources: resources:
requests: requests:

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

@ -7,11 +7,11 @@ 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: 2b13a0c7904bdae5a70234bbfdc4f406f83d7c52 manifestHash: 34255b4d35a99fcf5cf1c33780e867055d6d072a
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
version: 1.20.2 version: 1.20.3
- manifest: core.addons.k8s.io/v1.4.0.yaml - manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io name: core.addons.k8s.io
@ -47,11 +47,11 @@ spec:
version: 1.5.0 version: 1.5.0
- id: k8s-1.12 - id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 2e4bb737c7635145d5dbc02895c8248599d0942d manifestHash: 194785cee00c594bd445a3042365c0b6773cf2bf
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
version: 1.20.2 version: 1.20.3
- id: v1.15.0 - id: v1.15.0
kubernetesVersion: '>=1.15.0' kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml 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 name: anonymous-access.addons.k8s.io
selector: selector:
k8s-addon: anonymous-access.addons.k8s.io k8s-addon: anonymous-access.addons.k8s.io
version: 1.20.2 version: 1.20.3
- manifest: core.addons.k8s.io/v1.4.0.yaml - manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io 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: labels:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller k8s-app: dns-controller
version: v1.20.2 version: v1.20.3
name: dns-controller name: dns-controller
namespace: kube-system namespace: kube-system
spec: spec:
@ -21,7 +21,7 @@ spec:
labels: labels:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller k8s-app: dns-controller
version: v1.20.2 version: v1.20.3
spec: spec:
containers: containers:
- command: - command:
@ -38,7 +38,7 @@ spec:
value: arn:aws-test:iam::123456789012:role/dns-controller.kube-system.sa.minimal.example.com value: arn:aws-test:iam::123456789012:role/dns-controller.kube-system.sa.minimal.example.com
- name: AWS_WEB_IDENTITY_TOKEN_FILE - name: AWS_WEB_IDENTITY_TOKEN_FILE
value: /var/run/secrets/amazonaws.com/token value: /var/run/secrets/amazonaws.com/token
image: k8s.gcr.io/kops/dns-controller:1.20.2 image: k8s.gcr.io/kops/dns-controller:1.20.3
name: dns-controller name: dns-controller
resources: resources:
requests: 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: labels:
k8s-addon: kops-controller.addons.k8s.io k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller k8s-app: kops-controller
version: v1.20.2 version: v1.20.3
name: kops-controller name: kops-controller
namespace: kube-system namespace: kube-system
spec: spec:
@ -29,14 +29,14 @@ spec:
labels: labels:
k8s-addon: kops-controller.addons.k8s.io k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller k8s-app: kops-controller
version: v1.20.2 version: v1.20.3
spec: spec:
containers: containers:
- command: - command:
- /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: k8s.gcr.io/kops/kops-controller:1.20.2 image: k8s.gcr.io/kops/kops-controller:1.20.3
name: kops-controller name: kops-controller
resources: resources:
requests: requests:

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

@ -7,11 +7,11 @@ 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: 2b13a0c7904bdae5a70234bbfdc4f406f83d7c52 manifestHash: 34255b4d35a99fcf5cf1c33780e867055d6d072a
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
version: 1.20.2 version: 1.20.3
- id: k8s-1.16 - id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0' kubernetesVersion: '>=1.16.0-alpha.0'
manifest: anonymous-issuer-discovery.addons.k8s.io/k8s-1.16.yaml manifest: anonymous-issuer-discovery.addons.k8s.io/k8s-1.16.yaml
@ -19,7 +19,7 @@ spec:
name: anonymous-issuer-discovery.addons.k8s.io name: anonymous-issuer-discovery.addons.k8s.io
selector: selector:
k8s-addon: anonymous-issuer-discovery.addons.k8s.io k8s-addon: anonymous-issuer-discovery.addons.k8s.io
version: 1.20.2 version: 1.20.3
- manifest: core.addons.k8s.io/v1.4.0.yaml - manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io name: core.addons.k8s.io
@ -55,11 +55,11 @@ spec:
version: 1.5.0 version: 1.5.0
- id: k8s-1.12 - id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 6f9cb0b7ff6b3e58c373cb1a9ea12aeafcef3af5 manifestHash: d77c54625d01da45a92173f77a74dfb16c536cf3
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
version: 1.20.2 version: 1.20.3
- id: v1.15.0 - id: v1.15.0
kubernetesVersion: '>=1.15.0' kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml 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: labels:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller k8s-app: dns-controller
version: v1.20.2 version: v1.20.3
name: dns-controller name: dns-controller
namespace: kube-system namespace: kube-system
spec: spec:
@ -21,7 +21,7 @@ spec:
labels: labels:
k8s-addon: dns-controller.addons.k8s.io k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller k8s-app: dns-controller
version: v1.20.2 version: v1.20.3
spec: spec:
containers: containers:
- command: - command:
@ -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: k8s.gcr.io/kops/dns-controller:1.20.2 image: k8s.gcr.io/kops/dns-controller:1.20.3
name: dns-controller name: dns-controller
resources: resources:
requests: 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: labels:
k8s-addon: kops-controller.addons.k8s.io k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller k8s-app: kops-controller
version: v1.20.2 version: v1.20.3
name: kops-controller name: kops-controller
namespace: kube-system namespace: kube-system
spec: spec:
@ -31,14 +31,14 @@ spec:
labels: labels:
k8s-addon: kops-controller.addons.k8s.io k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller k8s-app: kops-controller
version: v1.20.2 version: v1.20.3
spec: spec:
containers: containers:
- command: - command:
- /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: k8s.gcr.io/kops/kops-controller:1.20.2 image: k8s.gcr.io/kops/kops-controller:1.20.3
name: kops-controller name: kops-controller
resources: resources:
requests: requests:

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

@ -7,11 +7,11 @@ 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: cf4188f9253ee56ddfead4cf27e8394ac3b6cea1 manifestHash: c088e142383496713e5bb47197a8d881e85c4465
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
version: 1.20.2 version: 1.20.3
- manifest: core.addons.k8s.io/v1.4.0.yaml - manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io name: core.addons.k8s.io
@ -40,11 +40,11 @@ spec:
version: 1.5.0 version: 1.5.0
- id: k8s-1.12 - id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 2e4bb737c7635145d5dbc02895c8248599d0942d manifestHash: 194785cee00c594bd445a3042365c0b6773cf2bf
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
version: 1.20.2 version: 1.20.3
- id: v1.15.0 - id: v1.15.0
kubernetesVersion: '>=1.15.0' kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml manifest: storage-aws.addons.k8s.io/v1.15.0.yaml

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

@ -7,11 +7,11 @@ 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: cf4188f9253ee56ddfead4cf27e8394ac3b6cea1 manifestHash: c088e142383496713e5bb47197a8d881e85c4465
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
version: 1.20.2 version: 1.20.3
- manifest: core.addons.k8s.io/v1.4.0.yaml - manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io name: core.addons.k8s.io
@ -40,11 +40,11 @@ spec:
version: 1.5.0 version: 1.5.0
- id: k8s-1.12 - id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 2e4bb737c7635145d5dbc02895c8248599d0942d manifestHash: 194785cee00c594bd445a3042365c0b6773cf2bf
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
version: 1.20.2 version: 1.20.3
- id: v1.15.0 - id: v1.15.0
kubernetesVersion: '>=1.15.0' kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml manifest: storage-aws.addons.k8s.io/v1.15.0.yaml

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

@ -36,33 +36,33 @@ func Test_BuildMirroredAsset(t *testing.T) {
{ {
url: "https://kubeupv2.s3.amazonaws.com/kops/%s/images/protokube-linux-amd64", url: "https://kubeupv2.s3.amazonaws.com/kops/%s/images/protokube-linux-amd64",
expected: []string{ expected: []string{
"https://artifacts.k8s.io/binaries/kops/1.20.2/images/protokube-linux-amd64", "https://artifacts.k8s.io/binaries/kops/1.20.3/images/protokube-linux-amd64",
"https://github.com/kubernetes/kops/releases/download/v1.20.2/images-protokube-linux-amd64", "https://github.com/kubernetes/kops/releases/download/v1.20.3/images-protokube-linux-amd64",
"https://kubeupv2.s3.amazonaws.com/kops/1.20.2/images/protokube-linux-amd64", "https://kubeupv2.s3.amazonaws.com/kops/1.20.3/images/protokube-linux-amd64",
}, },
}, },
{ {
url: "https://kubeupv2.s3.amazonaws.com/kops/%s/images/protokube-linux-arm64", url: "https://kubeupv2.s3.amazonaws.com/kops/%s/images/protokube-linux-arm64",
expected: []string{ expected: []string{
"https://artifacts.k8s.io/binaries/kops/1.20.2/images/protokube-linux-arm64", "https://artifacts.k8s.io/binaries/kops/1.20.3/images/protokube-linux-arm64",
"https://github.com/kubernetes/kops/releases/download/v1.20.2/images-protokube-linux-arm64", "https://github.com/kubernetes/kops/releases/download/v1.20.3/images-protokube-linux-arm64",
"https://kubeupv2.s3.amazonaws.com/kops/1.20.2/images/protokube-linux-arm64", "https://kubeupv2.s3.amazonaws.com/kops/1.20.3/images/protokube-linux-arm64",
}, },
}, },
{ {
url: "https://kubeupv2.s3.amazonaws.com/kops/%s/linux/amd64/nodeup", url: "https://kubeupv2.s3.amazonaws.com/kops/%s/linux/amd64/nodeup",
expected: []string{ expected: []string{
"https://artifacts.k8s.io/binaries/kops/1.20.2/linux/amd64/nodeup", "https://artifacts.k8s.io/binaries/kops/1.20.3/linux/amd64/nodeup",
"https://github.com/kubernetes/kops/releases/download/v1.20.2/nodeup-linux-amd64", "https://github.com/kubernetes/kops/releases/download/v1.20.3/nodeup-linux-amd64",
"https://kubeupv2.s3.amazonaws.com/kops/1.20.2/linux/amd64/nodeup", "https://kubeupv2.s3.amazonaws.com/kops/1.20.3/linux/amd64/nodeup",
}, },
}, },
{ {
url: "https://kubeupv2.s3.amazonaws.com/kops/%s/linux/arm64/nodeup", url: "https://kubeupv2.s3.amazonaws.com/kops/%s/linux/arm64/nodeup",
expected: []string{ expected: []string{
"https://artifacts.k8s.io/binaries/kops/1.20.2/linux/arm64/nodeup", "https://artifacts.k8s.io/binaries/kops/1.20.3/linux/arm64/nodeup",
"https://github.com/kubernetes/kops/releases/download/v1.20.2/nodeup-linux-arm64", "https://github.com/kubernetes/kops/releases/download/v1.20.3/nodeup-linux-arm64",
"https://kubeupv2.s3.amazonaws.com/kops/1.20.2/linux/arm64/nodeup", "https://kubeupv2.s3.amazonaws.com/kops/1.20.3/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 // These constants are parsed by build tooling - be careful about changing the formats
const ( const (
KOPS_RELEASE_VERSION = "1.20.2" KOPS_RELEASE_VERSION = "1.20.3"
KOPS_CI_VERSION = "1.20.3" KOPS_CI_VERSION = "1.20.4"
) )
// GitVersion should be replaced by the makefile // GitVersion should be replaced by the makefile