Skip to content

Commit 9709d36

Browse files
authored
Merge pull request kubernetes#129232 from DamianSawicki/bumpKubeDNS-1-24-0-fixed
Bump kubedns and nodelocaldns to 1.24.0 (fixed)
2 parents 4a0b036 + e67c24b commit 9709d36

File tree

4 files changed

+10
-16
lines changed

4 files changed

+10
-16
lines changed

cluster/addons/dns/kube-dns/kube-dns.yaml.base

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ spec:
114114
kubernetes.io/os: linux
115115
containers:
116116
- name: kubedns
117-
image: registry.k8s.io/dns/k8s-dns-kube-dns:1.23.1
117+
image: registry.k8s.io/dns/k8s-dns-kube-dns:1.24.0
118118
resources:
119119
# TODO: Set memory limits when we've profiled the container for large
120120
# clusters, then set request = limit to keep this container in
@@ -170,7 +170,7 @@ spec:
170170
runAsUser: 1001
171171
runAsGroup: 1001
172172
- name: dnsmasq
173-
image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.23.1
173+
image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.24.0
174174
livenessProbe:
175175
httpGet:
176176
path: /healthcheck/dnsmasq
@@ -182,7 +182,6 @@ spec:
182182
failureThreshold: 5
183183
args:
184184
- -v=2
185-
- -logtostderr
186185
- -configDir=/etc/k8s/dns/dnsmasq-nanny
187186
- -restartDnsmasq=true
188187
- --
@@ -217,7 +216,7 @@ spec:
217216
- NET_BIND_SERVICE
218217
- SETGID
219218
- name: sidecar
220-
image: registry.k8s.io/dns/k8s-dns-sidecar:1.23.1
219+
image: registry.k8s.io/dns/k8s-dns-sidecar:1.24.0
221220
livenessProbe:
222221
httpGet:
223222
path: /metrics
@@ -229,7 +228,6 @@ spec:
229228
failureThreshold: 5
230229
args:
231230
- --v=2
232-
- --logtostderr
233231
- --probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.__DNS__DOMAIN__,5,SRV
234232
- --probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.__DNS__DOMAIN__,5,SRV
235233
ports:

cluster/addons/dns/kube-dns/kube-dns.yaml.in

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ spec:
114114
kubernetes.io/os: linux
115115
containers:
116116
- name: kubedns
117-
image: registry.k8s.io/dns/k8s-dns-kube-dns:1.23.1
117+
image: registry.k8s.io/dns/k8s-dns-kube-dns:1.24.0
118118
resources:
119119
# TODO: Set memory limits when we've profiled the container for large
120120
# clusters, then set request = limit to keep this container in
@@ -170,7 +170,7 @@ spec:
170170
runAsUser: 1001
171171
runAsGroup: 1001
172172
- name: dnsmasq
173-
image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.23.1
173+
image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.24.0
174174
livenessProbe:
175175
httpGet:
176176
path: /healthcheck/dnsmasq
@@ -182,7 +182,6 @@ spec:
182182
failureThreshold: 5
183183
args:
184184
- -v=2
185-
- -logtostderr
186185
- -configDir=/etc/k8s/dns/dnsmasq-nanny
187186
- -restartDnsmasq=true
188187
- --
@@ -217,7 +216,7 @@ spec:
217216
- NET_BIND_SERVICE
218217
- SETGID
219218
- name: sidecar
220-
image: registry.k8s.io/dns/k8s-dns-sidecar:1.23.1
219+
image: registry.k8s.io/dns/k8s-dns-sidecar:1.24.0
221220
livenessProbe:
222221
httpGet:
223222
path: /metrics
@@ -229,7 +228,6 @@ spec:
229228
failureThreshold: 5
230229
args:
231230
- --v=2
232-
- --logtostderr
233231
- --probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.dns_domain,5,SRV
234232
- --probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.dns_domain,5,SRV
235233
ports:

cluster/addons/dns/kube-dns/kube-dns.yaml.sed

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ spec:
114114
kubernetes.io/os: linux
115115
containers:
116116
- name: kubedns
117-
image: registry.k8s.io/dns/k8s-dns-kube-dns:1.23.1
117+
image: registry.k8s.io/dns/k8s-dns-kube-dns:1.24.0
118118
resources:
119119
# TODO: Set memory limits when we've profiled the container for large
120120
# clusters, then set request = limit to keep this container in
@@ -170,7 +170,7 @@ spec:
170170
runAsUser: 1001
171171
runAsGroup: 1001
172172
- name: dnsmasq
173-
image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.23.1
173+
image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.24.0
174174
livenessProbe:
175175
httpGet:
176176
path: /healthcheck/dnsmasq
@@ -182,7 +182,6 @@ spec:
182182
failureThreshold: 5
183183
args:
184184
- -v=2
185-
- -logtostderr
186185
- -configDir=/etc/k8s/dns/dnsmasq-nanny
187186
- -restartDnsmasq=true
188187
- --
@@ -217,7 +216,7 @@ spec:
217216
- NET_BIND_SERVICE
218217
- SETGID
219218
- name: sidecar
220-
image: registry.k8s.io/dns/k8s-dns-sidecar:1.23.1
219+
image: registry.k8s.io/dns/k8s-dns-sidecar:1.24.0
221220
livenessProbe:
222221
httpGet:
223222
path: /metrics
@@ -229,7 +228,6 @@ spec:
229228
failureThreshold: 5
230229
args:
231230
- --v=2
232-
- --logtostderr
233231
- --probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.$DNS_DOMAIN,5,SRV
234232
- --probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.$DNS_DOMAIN,5,SRV
235233
ports:

cluster/addons/dns/nodelocaldns/nodelocaldns.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ spec:
138138
operator: "Exists"
139139
containers:
140140
- name: node-cache
141-
image: registry.k8s.io/dns/k8s-dns-node-cache:1.23.1
141+
image: registry.k8s.io/dns/k8s-dns-node-cache:1.24.0
142142
resources:
143143
requests:
144144
cpu: 25m

0 commit comments

Comments
 (0)