mirror of https://github.com/kubernetes/kops.git
Bump dns-controller version for fixes
This commit is contained in:
parent
3c6689b5b0
commit
8571924843
2
Makefile
2
Makefile
|
|
@ -27,7 +27,7 @@ GOVERSION=1.8.1
|
||||||
MAKEDIR:=$(strip $(shell dirname "$(realpath $(lastword $(MAKEFILE_LIST)))"))
|
MAKEDIR:=$(strip $(shell dirname "$(realpath $(lastword $(MAKEFILE_LIST)))"))
|
||||||
|
|
||||||
# Keep in sync with upup/models/cloudup/resources/addons/dns-controller/
|
# Keep in sync with upup/models/cloudup/resources/addons/dns-controller/
|
||||||
DNS_CONTROLLER_TAG=1.6.1
|
DNS_CONTROLLER_TAG=1.6.2
|
||||||
|
|
||||||
KOPS_RELEASE_VERSION = 1.6.1
|
KOPS_RELEASE_VERSION = 1.6.1
|
||||||
KOPS_CI_VERSION = 1.6.2-beta.1
|
KOPS_CI_VERSION = 1.6.2-beta.1
|
||||||
|
|
|
||||||
|
|
@ -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.6.1
|
version: v1.6.2
|
||||||
spec:
|
spec:
|
||||||
replicas: 1
|
replicas: 1
|
||||||
selector:
|
selector:
|
||||||
|
|
@ -17,7 +17,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.6.1
|
version: v1.6.2
|
||||||
annotations:
|
annotations:
|
||||||
scheduler.alpha.kubernetes.io/critical-pod: ''
|
scheduler.alpha.kubernetes.io/critical-pod: ''
|
||||||
# For 1.6, we keep the old tolerations in case of a downgrade to 1.5
|
# For 1.6, we keep the old tolerations in case of a downgrade to 1.5
|
||||||
|
|
@ -33,7 +33,7 @@ spec:
|
||||||
serviceAccount: dns-controller
|
serviceAccount: dns-controller
|
||||||
containers:
|
containers:
|
||||||
- name: dns-controller
|
- name: dns-controller
|
||||||
image: kope/dns-controller:1.6.1
|
image: kope/dns-controller:1.6.2
|
||||||
command:
|
command:
|
||||||
{{ range $arg := DnsControllerArgv }}
|
{{ range $arg := DnsControllerArgv }}
|
||||||
- "{{ $arg }}"
|
- "{{ $arg }}"
|
||||||
|
|
|
||||||
|
|
@ -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.6.1
|
version: v1.6.2
|
||||||
spec:
|
spec:
|
||||||
replicas: 1
|
replicas: 1
|
||||||
selector:
|
selector:
|
||||||
|
|
@ -17,7 +17,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.6.1
|
version: v1.6.2
|
||||||
annotations:
|
annotations:
|
||||||
scheduler.alpha.kubernetes.io/critical-pod: ''
|
scheduler.alpha.kubernetes.io/critical-pod: ''
|
||||||
scheduler.alpha.kubernetes.io/tolerations: '[{"key": "dedicated", "value": "master"}]'
|
scheduler.alpha.kubernetes.io/tolerations: '[{"key": "dedicated", "value": "master"}]'
|
||||||
|
|
@ -28,7 +28,7 @@ spec:
|
||||||
hostNetwork: true
|
hostNetwork: true
|
||||||
containers:
|
containers:
|
||||||
- name: dns-controller
|
- name: dns-controller
|
||||||
image: {{ DnsControllerImage }}:1.6.1
|
image: {{ DnsControllerImage }}:1.6.2
|
||||||
command:
|
command:
|
||||||
{{ range $arg := DnsControllerArgv }}
|
{{ range $arg := DnsControllerArgv }}
|
||||||
- "{{ $arg }}"
|
- "{{ $arg }}"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue