scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #129232 from DamianSawicki/bumpKubeDNS-1-24-0-fixed

Browse Source 
Bump kubedns and nodelocaldns to 1.24.0 (fixed)
This commit is contained in:
Kubernetes Prow Robot
2024-12-18 12:22:08 +01:00
committed by GitHub
parent 4a0b0365ef e67c24bdbb
commit 9709d36dda
4 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cluster/addons/dns/kube-dns/kube-dns.yaml.base
View File

@@ -114,7 +114,7 @@ spec:
kubernetes.io/os: linux kubernetes.io/os: linux
containers: containers:
- name: kubedns - name: kubedns
image: registry.k8s.io/dns/k8s-dns-kube-dns:1.23.1 image: registry.k8s.io/dns/k8s-dns-kube-dns:1.24.0
resources: resources:
# TODO: Set memory limits when we've profiled the container for large # TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in # clusters, then set request = limit to keep this container in
@@ -170,7 +170,7 @@ spec:
runAsUser: 1001 runAsUser: 1001
runAsGroup: 1001 runAsGroup: 1001
- name: dnsmasq - name: dnsmasq
image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.23.1 image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.24.0
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthcheck/dnsmasq path: /healthcheck/dnsmasq
@@ -182,7 +182,6 @@ spec:
failureThreshold: 5 failureThreshold: 5
args: args:
- -v=2 - -v=2
- -logtostderr
- -configDir=/etc/k8s/dns/dnsmasq-nanny - -configDir=/etc/k8s/dns/dnsmasq-nanny
- -restartDnsmasq=true - -restartDnsmasq=true
- -- - --
@@ -217,7 +216,7 @@ spec:
- NET_BIND_SERVICE - NET_BIND_SERVICE
- SETGID - SETGID
- name: sidecar - name: sidecar
image: registry.k8s.io/dns/k8s-dns-sidecar:1.23.1 image: registry.k8s.io/dns/k8s-dns-sidecar:1.24.0
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /metrics path: /metrics
@@ -229,7 +228,6 @@ spec:
failureThreshold: 5 failureThreshold: 5
args: args:
- --v=2 - --v=2
- --logtostderr
- --probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.__DNS__DOMAIN__,5,SRV - --probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.__DNS__DOMAIN__,5,SRV
- --probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.__DNS__DOMAIN__,5,SRV - --probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.__DNS__DOMAIN__,5,SRV
ports: ports:

8
cluster/addons/dns/kube-dns/kube-dns.yaml.in
View File

@@ -114,7 +114,7 @@ spec:
kubernetes.io/os: linux kubernetes.io/os: linux
containers: containers:
- name: kubedns - name: kubedns
image: registry.k8s.io/dns/k8s-dns-kube-dns:1.23.1 image: registry.k8s.io/dns/k8s-dns-kube-dns:1.24.0
resources: resources:
# TODO: Set memory limits when we've profiled the container for large # TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in # clusters, then set request = limit to keep this container in
@@ -170,7 +170,7 @@ spec:
runAsUser: 1001 runAsUser: 1001
runAsGroup: 1001 runAsGroup: 1001
- name: dnsmasq - name: dnsmasq
image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.23.1 image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.24.0
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthcheck/dnsmasq path: /healthcheck/dnsmasq
@@ -182,7 +182,6 @@ spec:
failureThreshold: 5 failureThreshold: 5
args: args:
- -v=2 - -v=2
- -logtostderr
- -configDir=/etc/k8s/dns/dnsmasq-nanny - -configDir=/etc/k8s/dns/dnsmasq-nanny
- -restartDnsmasq=true - -restartDnsmasq=true
- -- - --
@@ -217,7 +216,7 @@ spec:
- NET_BIND_SERVICE - NET_BIND_SERVICE
- SETGID - SETGID
- name: sidecar - name: sidecar
image: registry.k8s.io/dns/k8s-dns-sidecar:1.23.1 image: registry.k8s.io/dns/k8s-dns-sidecar:1.24.0
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /metrics path: /metrics
@@ -229,7 +228,6 @@ spec:
failureThreshold: 5 failureThreshold: 5
args: args:
- --v=2 - --v=2
- --logtostderr
- --probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.dns_domain,5,SRV - --probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.dns_domain,5,SRV
- --probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.dns_domain,5,SRV - --probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.dns_domain,5,SRV
ports: ports:

8
cluster/addons/dns/kube-dns/kube-dns.yaml.sed
View File

@@ -114,7 +114,7 @@ spec:
kubernetes.io/os: linux kubernetes.io/os: linux
containers: containers:
- name: kubedns - name: kubedns
image: registry.k8s.io/dns/k8s-dns-kube-dns:1.23.1 image: registry.k8s.io/dns/k8s-dns-kube-dns:1.24.0
resources: resources:
# TODO: Set memory limits when we've profiled the container for large # TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in # clusters, then set request = limit to keep this container in
@@ -170,7 +170,7 @@ spec:
runAsUser: 1001 runAsUser: 1001
runAsGroup: 1001 runAsGroup: 1001
- name: dnsmasq - name: dnsmasq
image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.23.1 image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.24.0
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthcheck/dnsmasq path: /healthcheck/dnsmasq
@@ -182,7 +182,6 @@ spec:
failureThreshold: 5 failureThreshold: 5
args: args:
- -v=2 - -v=2
- -logtostderr
- -configDir=/etc/k8s/dns/dnsmasq-nanny - -configDir=/etc/k8s/dns/dnsmasq-nanny
- -restartDnsmasq=true - -restartDnsmasq=true
- -- - --
@@ -217,7 +216,7 @@ spec:
- NET_BIND_SERVICE - NET_BIND_SERVICE
- SETGID - SETGID
- name: sidecar - name: sidecar
image: registry.k8s.io/dns/k8s-dns-sidecar:1.23.1 image: registry.k8s.io/dns/k8s-dns-sidecar:1.24.0
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /metrics path: /metrics
@@ -229,7 +228,6 @@ spec:
failureThreshold: 5 failureThreshold: 5
args: args:
- --v=2 - --v=2
- --logtostderr
- --probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.$DNS_DOMAIN,5,SRV - --probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.$DNS_DOMAIN,5,SRV
- --probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.$DNS_DOMAIN,5,SRV - --probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.$DNS_DOMAIN,5,SRV
ports: ports:

2
cluster/addons/dns/nodelocaldns/nodelocaldns.yaml
View File

@@ -138,7 +138,7 @@ spec:
operator: "Exists" operator: "Exists"
containers: containers:
- name: node-cache - name: node-cache
image: registry.k8s.io/dns/k8s-dns-node-cache:1.23.1 image: registry.k8s.io/dns/k8s-dns-node-cache:1.24.0
resources: resources:
requests: requests:
cpu: 25m cpu: 25m