Skip to content

Commit

Permalink
Merge pull request #10880 from justinsb/release-1.19.1
Browse files Browse the repository at this point in the history
Release 1.19.1
  • Loading branch information
k8s-ci-robot authored Feb 19, 2021
2 parents 8d6b831 + 171a414 commit 8589b4d
Show file tree
Hide file tree
Showing 24 changed files with 106 additions and 106 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,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.19.0
DNS_CONTROLLER_TAG=1.19.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.19.0
KOPS_CONTROLLER_TAG=1.19.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.19.0
KUBE_APISERVER_HEALTHCHECK_TAG=1.19.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.19.0
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.19.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 @@ -14,7 +14,7 @@ Contents:
- --client-key=/secrets/client.key
command:
- /kube-apiserver-healthcheck
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.19.0
image: k8s.gcr.io/kops/kube-apiserver-healthcheck:1.19.1
livenessProbe:
httpGet:
host: 127.0.0.1
Expand Down
18 changes: 9 additions & 9 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.19.0
version: v1.19.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.19.0
version: v1.19.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.19.0
image: k8s.gcr.io/kops/dns-controller:1.19.1
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"
Expand Down
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.19.0
version: v1.19.1
spec:
replicas: 1
selector:
Expand All @@ -17,7 +17,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.19.0
version: v1.19.1
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
# For 1.6, we keep the old tolerations in case of a downgrade to 1.5
Expand All @@ -33,7 +33,7 @@ spec:
serviceAccount: dns-controller
containers:
- name: dns-controller
image: k8s.gcr.io/kops/dns-controller:1.19.0
image: k8s.gcr.io/kops/dns-controller:1.19.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.19.0
version: v1.19.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.19.0
version: v1.19.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.19.0
image: k8s.gcr.io/kops/kops-controller:1.19.1
volumeMounts:
{{ if .UseHostCertificates }}
- mountPath: /etc/ssl/certs
Expand Down
8 changes: 4 additions & 4 deletions upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann

{
key := "kops-controller.addons.k8s.io"
version := "1.19.0"
version := "1.19.1"

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

if featureflag.PublicJWKS.Enabled() {
key := "anonymous-issuer-discovery.addons.k8s.io"
version := "1.19.0"
version := "1.19.1"

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

{
location := key + "/k8s-1.6.yaml"
Expand Down Expand Up @@ -545,7 +545,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann
if b.Cluster.Spec.ClusterAutoscaler != nil && fi.BoolValue(b.Cluster.Spec.ClusterAutoscaler.Enabled) {
{
key := "cluster-autoscaler.addons.k8s.io"
version := "1.19.0"
version := "1.19.1"

{
location := key + "/k8s-1.15.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: 415a02a022f0894559aac5a9e32d4b6b89c5ffd8
manifestHash: efc41482d1b80797223e2ab22999f7d321de0db4
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.19.0
version: 1.19.1
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io
Expand Down Expand Up @@ -57,19 +57,19 @@ spec:
- id: k8s-1.6
kubernetesVersion: <1.12.0
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: 985c1873809dd782f31156b3bcaa23c1085e2d84
manifestHash: adf2fca10046c057f5a016b61d54721b107d9504
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.19.0
version: 1.19.1
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 1f2bff9d1362491d417db7051248d8c015c6825a
manifestHash: 0bfda5a84fd03898fa8a44ce89e1cfed1a2609f9
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.19.0
version: 1.19.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: 415a02a022f0894559aac5a9e32d4b6b89c5ffd8
manifestHash: efc41482d1b80797223e2ab22999f7d321de0db4
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.19.0
version: 1.19.1
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io
Expand Down Expand Up @@ -57,19 +57,19 @@ spec:
- id: k8s-1.6
kubernetesVersion: <1.12.0
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: 985c1873809dd782f31156b3bcaa23c1085e2d84
manifestHash: adf2fca10046c057f5a016b61d54721b107d9504
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.19.0
version: 1.19.1
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 1f2bff9d1362491d417db7051248d8c015c6825a
manifestHash: 0bfda5a84fd03898fa8a44ce89e1cfed1a2609f9
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.19.0
version: 1.19.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: 19a327a31133fa457fac0e830ff6b0d2f4bc3d19
manifestHash: 506dd4e6b3c24131f4b4f7ba396d888a3103b286
name: kops-controller.addons.k8s.io
selector:
k8s-addon: kops-controller.addons.k8s.io
version: 1.19.0
version: 1.19.1
- manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io
Expand Down Expand Up @@ -50,19 +50,19 @@ spec:
- id: k8s-1.6
kubernetesVersion: <1.12.0
manifest: dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash: 985c1873809dd782f31156b3bcaa23c1085e2d84
manifestHash: adf2fca10046c057f5a016b61d54721b107d9504
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.19.0
version: 1.19.1
- id: k8s-1.12
kubernetesVersion: '>=1.12.0'
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash: 1f2bff9d1362491d417db7051248d8c015c6825a
manifestHash: 0bfda5a84fd03898fa8a44ce89e1cfed1a2609f9
name: dns-controller.addons.k8s.io
selector:
k8s-addon: dns-controller.addons.k8s.io
version: 1.19.0
version: 1.19.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.19.0
version: v1.19.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.19.0
version: v1.19.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.19.0
image: k8s.gcr.io/kops/dns-controller:1.19.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.19.0
version: v1.19.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.19.0
version: v1.19.1
spec:
containers:
- command:
- /kops-controller
- --v=2
- --conf=/etc/kubernetes/kops-controller/config/config.yaml
image: k8s.gcr.io/kops/kops-controller:1.19.0
image: k8s.gcr.io/kops/kops-controller:1.19.1
name: kops-controller
resources:
requests:
Expand Down
Loading

0 comments on commit 8589b4d

Please sign in to comment.