Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.21.0 alpha.2 #11109

Merged
merged 2 commits into from
Mar 22, 2021
Merged

Release 1.21.0 alpha.2 #11109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b9f364
Promote channel alpha to stable
hakman Mar 22, 2021
fa72535
Release 1.21.0-alpha.2
hakman Mar 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.0-alpha.1
DNS_CONTROLLER_TAG=1.21.0-alpha.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/
KOPS_CONTROLLER_TAG=1.21.0-alpha.1
KOPS_CONTROLLER_TAG=1.21.0-alpha.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
KUBE_APISERVER_HEALTHCHECK_TAG=1.21.0-alpha.1
KUBE_APISERVER_HEALTHCHECK_TAG=1.21.0-alpha.2
KUBE_APISERVER_HEALTHCHECK_PUSH_TAG=$(shell tools/get_workspace_status.sh | grep STABLE_KUBE_APISERVER_HEALTHCHECK_TAG | awk '{print $$2}')


Expand Down
2 changes: 1 addition & 1 deletion channels/alpha
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ spec:
providerID: gce
architectureID: amd64
kubernetesVersion: ">=1.16.0 <1.18.0"
- name: "ubuntu-os-cloud/ubuntu-2004-focal-v20210119a"
- name: "ubuntu-os-cloud/ubuntu-2004-focal-v20210315"
providerID: gce
architectureID: amd64
kubernetesVersion: ">=1.18.0"
Expand Down
14 changes: 7 additions & 7 deletions channels/stable
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ spec:
providerID: gce
architectureID: amd64
kubernetesVersion: ">=1.16.0 <1.18.0"
- name: "ubuntu-os-cloud/ubuntu-2004-focal-v20210119a"
- name: "ubuntu-os-cloud/ubuntu-2004-focal-v20210315"
providerID: gce
architectureID: amd64
kubernetesVersion: ">=1.18.0"
Expand All @@ -84,13 +84,13 @@ spec:
kubenet: {}
kubernetesVersions:
- range: ">=1.20.0"
recommendedVersion: 1.20.4
recommendedVersion: 1.20.5
requiredVersion: 1.20.0
- range: ">=1.19.0"
recommendedVersion: 1.19.8
recommendedVersion: 1.19.9
requiredVersion: 1.19.0
- range: ">=1.18.0"
recommendedVersion: 1.18.16
recommendedVersion: 1.18.17
requiredVersion: 1.18.0
- range: ">=1.17.0"
recommendedVersion: 1.17.17
Expand Down Expand Up @@ -120,15 +120,15 @@ spec:
- range: ">=1.20.0-alpha.1"
#recommendedVersion: "1.19.0-beta.3"
#requiredVersion: 1.20.0
kubernetesVersion: 1.20.4
kubernetesVersion: 1.20.5
- range: ">=1.19.0-beta.3"
#recommendedVersion: "1.19.0-beta.3"
#requiredVersion: 1.19.0
kubernetesVersion: 1.19.8
kubernetesVersion: 1.19.9
- range: ">=1.18.0-alpha.1"
recommendedVersion: "1.18.2"
#requiredVersion: 1.18.0
kubernetesVersion: 1.18.16
kubernetesVersion: 1.18.17
- range: ">=1.17.0-alpha.1"
recommendedVersion: "1.18.2"
#requiredVersion: 1.17.0
Expand Down
2 changes: 1 addition & 1 deletion pkg/model/components/kubeapiserver/model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ kind: Pod
spec:
containers:
- name: healthcheck
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.21.0-alpha.1
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.21.0-alpha.2
livenessProbe:
httpGet:
# The sidecar serves a healthcheck on the same port,
Expand Down
2 changes: 1 addition & 1 deletion pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Contents: |
- --client-key=/secrets/client.key
command:
- /kube-apiserver-healthcheck
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.21.0-alpha.1
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.21.0-alpha.2
livenessProbe:
httpGet:
host: 127.0.0.1
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/create_cluster/gce_byo_sa/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ metadata:
kops.k8s.io/cluster: gce.example.com
name: master-us-test1-a
spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210119a
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210315
machineType: n1-standard-1
maxSize: 1
minSize: 1
Expand All @@ -85,7 +85,7 @@ metadata:
kops.k8s.io/cluster: gce.example.com
name: nodes-us-test1-a
spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210119a
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210315
machineType: n1-standard-2
maxSize: 1
minSize: 1
Expand Down
12 changes: 6 additions & 6 deletions tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com
name: master-us-test1-a
spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210119a
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210315
machineType: n1-standard-1
maxSize: 1
minSize: 1
Expand All @@ -93,7 +93,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com
name: master-us-test1-b
spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210119a
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210315
machineType: n1-standard-1
maxSize: 1
minSize: 1
Expand All @@ -116,7 +116,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com
name: master-us-test1-c
spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210119a
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210315
machineType: n1-standard-1
maxSize: 1
minSize: 1
Expand All @@ -139,7 +139,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com
name: nodes-us-test1-a
spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210119a
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210315
machineType: n1-standard-2
maxSize: 1
minSize: 1
Expand All @@ -162,7 +162,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com
name: nodes-us-test1-b
spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210119a
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210315
machineType: n1-standard-2
maxSize: 1
minSize: 1
Expand All @@ -185,7 +185,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com
name: nodes-us-test1-c
spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210119a
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210315
machineType: n1-standard-2
maxSize: 1
minSize: 1
Expand Down
6 changes: 3 additions & 3 deletions tests/integration/create_cluster/private_gce/expected-v1alpha2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ metadata:
kops.k8s.io/cluster: private.example.com
name: bastions
spec:
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210119a
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210315
machineType: f1-micro
maxSize: 1
minSize: 1
Expand All @@ -98,7 +98,7 @@ spec:
additionalSecurityGroups:
- sg-exampleid3
- sg-exampleid4
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210119a
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210315
machineType: n1-standard-1
maxSize: 1
minSize: 1
Expand All @@ -124,7 +124,7 @@ spec:
additionalSecurityGroups:
- sg-exampleid
- sg-exampleid2
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210119a
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210315
machineType: n1-standard-2
maxSize: 1
minSize: 1
Expand Down
6 changes: 3 additions & 3 deletions upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.21.0-alpha.1
version: v1.21.0-alpha.2
spec:
replicas: 1
strategy:
Expand All @@ -19,7 +19,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.21.0-alpha.1
version: v1.21.0-alpha.2
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
Expand All @@ -33,7 +33,7 @@ spec:
serviceAccount: dns-controller
containers:
- name: dns-controller
image: k8s.gcr.io/kops/dns-controller:1.21.0-alpha.1
image: k8s.gcr.io/kops/dns-controller:1.21.0-alpha.2
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"
Expand Down
6 changes: 3 additions & 3 deletions upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ metadata:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.21.0-alpha.1
version: v1.21.0-alpha.2
spec:
selector:
matchLabels:
Expand All @@ -33,7 +33,7 @@ spec:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.21.0-alpha.1
version: v1.21.0-alpha.2
{{ if UseKopsControllerForNodeBootstrap }}
annotations:
dns.alpha.kubernetes.io/internal: kops-controller.internal.{{ ClusterName }}
Expand All @@ -51,7 +51,7 @@ spec:
serviceAccount: kops-controller
containers:
- name: kops-controller
image: k8s.gcr.io/kops/kops-controller:1.21.0-alpha.1
image: k8s.gcr.io/kops/kops-controller:1.21.0-alpha.2
volumeMounts:
{{ if .UseHostCertificates }}
- mountPath: /etc/ssl/certs
Expand Down
6 changes: 3 additions & 3 deletions upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann

{
key := "kops-controller.addons.k8s.io"
version := "1.21.0-alpha.1"
version := "1.21.0-alpha.2"

{
location := key + "/k8s-1.16.yaml"
Expand All @@ -228,7 +228,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann

if featureflag.PublicJWKS.Enabled() {
key := "anonymous-issuer-discovery.addons.k8s.io"
version := "1.21.0-alpha.1"
version := "1.21.0-alpha.2"

{
location := key + "/k8s-1.16.yaml"
Expand Down Expand Up @@ -402,7 +402,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann
if externalDNS == nil || !externalDNS.Disable {
{
key := "dns-controller.addons.k8s.io"
version := "1.21.0-alpha.1"
version := "1.21.0-alpha.2"

{
location := key + "/k8s-1.12.yaml"
Expand Down
8 changes: 4 additions & 4 deletions upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: 691f125245b950499fe410acd047ef7c5a574b92
manifestHash: 83600ec2669579a1637700aac102f2dfbef4f01c
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.21.0-alpha.1
version: 1.21.0-alpha.2
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 75dd91a5b15ade4a61ebc1de8c35714376dfbed4
name: core.addons.k8s.io
Expand Down Expand Up @@ -47,11 +47,11 @@ spec:
version: 1.5.0
- id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: e61e0c2c4d0d83cb95ee10d836ae8b77e334743b
manifestHash: 46c857881d8cdc761b9ce3d8d35c5204017b9fd4
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.21.0-alpha.1
version: 1.21.0-alpha.2
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
Expand Down
8 changes: 4 additions & 4 deletions upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: 691f125245b950499fe410acd047ef7c5a574b92
manifestHash: 83600ec2669579a1637700aac102f2dfbef4f01c
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.21.0-alpha.1
version: 1.21.0-alpha.2
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 75dd91a5b15ade4a61ebc1de8c35714376dfbed4
name: core.addons.k8s.io
Expand Down Expand Up @@ -47,11 +47,11 @@ spec:
version: 1.5.0
- id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: e61e0c2c4d0d83cb95ee10d836ae8b77e334743b
manifestHash: 46c857881d8cdc761b9ce3d8d35c5204017b9fd4
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.21.0-alpha.1
version: 1.21.0-alpha.2
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
Expand Down
8 changes: 4 additions & 4 deletions upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: e261c04391831cb337f0c42df430cf93b5ccab91
manifestHash: 89d7ad9af69cb88377b3e6a4bfc49a25d51079d4
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.21.0-alpha.1
version: 1.21.0-alpha.2
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 75dd91a5b15ade4a61ebc1de8c35714376dfbed4
name: core.addons.k8s.io
Expand Down Expand Up @@ -40,11 +40,11 @@ spec:
version: 1.5.0
- id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: e61e0c2c4d0d83cb95ee10d836ae8b77e334743b
manifestHash: 46c857881d8cdc761b9ce3d8d35c5204017b9fd4
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.21.0-alpha.1
version: 1.21.0-alpha.2
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
Expand Down
8 changes: 4 additions & 4 deletions upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: e261c04391831cb337f0c42df430cf93b5ccab91
manifestHash: 89d7ad9af69cb88377b3e6a4bfc49a25d51079d4
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.21.0-alpha.1
version: 1.21.0-alpha.2
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 75dd91a5b15ade4a61ebc1de8c35714376dfbed4
name: core.addons.k8s.io
Expand Down Expand Up @@ -40,11 +40,11 @@ spec:
version: 1.5.0
- id: k8s-1.12
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: e61e0c2c4d0d83cb95ee10d836ae8b77e334743b
manifestHash: 46c857881d8cdc761b9ce3d8d35c5204017b9fd4
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.21.0-alpha.1
version: 1.21.0-alpha.2
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
Expand Down
Loading