Skip to content

Commit

Permalink
Merge pull request #10841 from hakman/release-1.21.0-alpha.1
Browse files Browse the repository at this point in the history
Release 1.21.0-alpha.1
  • Loading branch information
k8s-ci-robot authored Feb 16, 2021
2 parents d39e42b + 35ea2f4 commit 7a9fc86
Show file tree
Hide file tree
Showing 24 changed files with 86 additions and 86 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 need to keep in sync with:
# upup/models/cloudup/resources/addons/dns-controller/
DNS_CONTROLLER_TAG=1.20.0-alpha.2
DNS_CONTROLLER_TAG=1.21.0-alpha.1
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.20.0-alpha.2
KOPS_CONTROLLER_TAG=1.21.0-alpha.1
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.20.0-alpha.2
KUBE_APISERVER_HEALTHCHECK_TAG=1.21.0-alpha.1
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 pkg/model/components/kubeapiserver/model.go
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.20.0-alpha.2
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.21.0-alpha.1
livenessProbe:
httpGet:
# The sidecar serves a healthcheck on the same port,
Expand Down
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.20.0-alpha.2
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.21.0-alpha.1
livenessProbe:
httpGet:
host: 127.0.0.1
Expand Down
12 changes: 6 additions & 6 deletions upup/models/bindata.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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.20.0-alpha.2
version: v1.21.0-alpha.1
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.20.0-alpha.2
version: v1.21.0-alpha.1
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.20.0-alpha.2
image: k8s.gcr.io/kops/dns-controller:1.21.0-alpha.1
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"
Expand Down
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.20.0-alpha.2
version: v1.21.0-alpha.1
spec:
selector:
matchLabels:
Expand All @@ -33,7 +33,7 @@ spec:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.20.0-alpha.2
version: v1.21.0-alpha.1
{{ 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.20.0-alpha.2
image: k8s.gcr.io/kops/kops-controller:1.21.0-alpha.1
volumeMounts:
{{ if .UseHostCertificates }}
- mountPath: /etc/ssl/certs
Expand Down
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.20.0-alpha.2"
version := "1.21.0-alpha.1"

{
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.20.0-alpha.2"
version := "1.21.0-alpha.1"

{
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.20.0-alpha.2"
version := "1.21.0-alpha.1"

{
location := key + "/k8s-1.12.yaml"
Expand Down
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: da1b535bde00a6d8c8867d7eb5466f49bb549523
manifestHash: 9ef65a8b68b39b5222609e3bd0f16e1beab7c561
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.20.0-alpha.2
version: 1.21.0-alpha.1
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
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: d4c5b1003fdc829d2d1d64952e0f0bce5ff58b2d
manifestHash: d8e045435539cc5353d3817f5998a55a7219fb10
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.20.0-alpha.2
version: 1.21.0-alpha.1
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
Expand Down
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: da1b535bde00a6d8c8867d7eb5466f49bb549523
manifestHash: 9ef65a8b68b39b5222609e3bd0f16e1beab7c561
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.20.0-alpha.2
version: 1.21.0-alpha.1
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
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: d4c5b1003fdc829d2d1d64952e0f0bce5ff58b2d
manifestHash: d8e045435539cc5353d3817f5998a55a7219fb10
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.20.0-alpha.2
version: 1.21.0-alpha.1
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
Expand Down
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: 56e24f1a62bc259aef0f634ab6e036e2ec553cfd
manifestHash: 61e66ba2a661ddeb8cb7954b61e5ca1f3f6b4ce2
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.20.0-alpha.2
version: 1.21.0-alpha.1
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
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: d4c5b1003fdc829d2d1d64952e0f0bce5ff58b2d
manifestHash: d8e045435539cc5353d3817f5998a55a7219fb10
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.20.0-alpha.2
version: 1.21.0-alpha.1
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
Expand Down
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: 56e24f1a62bc259aef0f634ab6e036e2ec553cfd
manifestHash: 61e66ba2a661ddeb8cb7954b61e5ca1f3f6b4ce2
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.20.0-alpha.2
version: 1.21.0-alpha.1
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
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: d4c5b1003fdc829d2d1d64952e0f0bce5ff58b2d
manifestHash: d8e045435539cc5353d3817f5998a55a7219fb10
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.20.0-alpha.2
version: 1.21.0-alpha.1
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.20.0-alpha.2
version: v1.21.0-alpha.1
name: dns-controller
namespace: kube-system
spec:
Expand All @@ -21,7 +21,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.20.0-alpha.2
version: v1.21.0-alpha.1
spec:
containers:
- command:
Expand All @@ -34,7 +34,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: k8s.gcr.io/kops/dns-controller:1.20.0-alpha.2
image: k8s.gcr.io/kops/dns-controller:1.21.0-alpha.1
name: dns-controller
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ metadata:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.20.0-alpha.2
version: v1.21.0-alpha.1
name: kops-controller
namespace: kube-system
spec:
Expand All @@ -29,14 +29,14 @@ spec:
labels:
k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller
version: v1.20.0-alpha.2
version: v1.21.0-alpha.1
spec:
containers:
- command:
- /kops-controller
- --v=2
- --conf=/etc/kubernetes/kops-controller/config/config.yaml
image: k8s.gcr.io/kops/kops-controller:1.20.0-alpha.2
image: k8s.gcr.io/kops/kops-controller:1.21.0-alpha.1
name: kops-controller
resources:
requests:
Expand Down
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: da1b535bde00a6d8c8867d7eb5466f49bb549523
manifestHash: 9ef65a8b68b39b5222609e3bd0f16e1beab7c561
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.20.0-alpha.2
version: 1.21.0-alpha.1
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
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: d4c5b1003fdc829d2d1d64952e0f0bce5ff58b2d
manifestHash: d8e045435539cc5353d3817f5998a55a7219fb10
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.20.0-alpha.2
version: 1.21.0-alpha.1
- id: v1.15.0
kubernetesVersion: '>=1.15.0'
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
name: anonymous-access.addons.k8s.io
selector:
k8s-addon: anonymous-access.addons.k8s.io
version: 1.20.0-alpha.2
version: 1.21.0-alpha.1
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.20.0-alpha.2
version: v1.21.0-alpha.1
name: dns-controller
namespace: kube-system
spec:
Expand All @@ -21,7 +21,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.20.0-alpha.2
version: v1.21.0-alpha.1
spec:
containers:
- command:
Expand All @@ -38,7 +38,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.20.0-alpha.2
image: k8s.gcr.io/kops/dns-controller:1.21.0-alpha.1
name: dns-controller
resources:
requests:
Expand Down
Loading

0 comments on commit 7a9fc86

Please sign in to comment.