Skip to content

K
k3s
Commit 44aa1679 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #41657 from bowei/update-dns

Automatic merge from submit-queue (batch tested with PRs 41349, 41532, 41256, 41587, 41657) Update dns ```release-note NONE ```
parents fe34705f f8b74640
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 11 deletions
cluster/addons/dns/kubedns-controller.yaml.base
View file @ 44aa1679
...@@ -52,7 +52,7 @@ spec: ...@@ -52,7 +52,7 @@ spec:
optional: true optional: true
containers: containers:
- name: kubedns - name: kubedns
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.12.1 image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.13.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
...@@ -104,7 +104,7 @@ spec: ...@@ -104,7 +104,7 @@ spec:
- name: kube-dns-config - name: kube-dns-config
mountPath: /kube-dns-config mountPath: /kube-dns-config
- name: dnsmasq - name: dnsmasq
image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.12.1 image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.13.0
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthcheck/dnsmasq path: /healthcheck/dnsmasq
...@@ -133,7 +133,7 @@ spec: ...@@ -133,7 +133,7 @@ spec:
cpu: 150m cpu: 150m
memory: 10Mi memory: 10Mi
- name: sidecar - name: sidecar
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.12.1 image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.13.0
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /metrics path: /metrics
......
cluster/addons/dns/kubedns-controller.yaml.in
View file @ 44aa1679
...@@ -52,7 +52,7 @@ spec: ...@@ -52,7 +52,7 @@ spec:
optional: true optional: true
containers: containers:
- name: kubedns - name: kubedns
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.12.1 image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.13.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
...@@ -104,7 +104,7 @@ spec: ...@@ -104,7 +104,7 @@ spec:
- name: kube-dns-config - name: kube-dns-config
mountPath: /kube-dns-config mountPath: /kube-dns-config
- name: dnsmasq - name: dnsmasq
image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.12.1 image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.13.0
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthcheck/dnsmasq path: /healthcheck/dnsmasq
...@@ -133,7 +133,7 @@ spec: ...@@ -133,7 +133,7 @@ spec:
cpu: 150m cpu: 150m
memory: 10Mi memory: 10Mi
- name: sidecar - name: sidecar
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.12.1 image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.13.0
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /metrics path: /metrics
......
cluster/addons/dns/kubedns-controller.yaml.sed
View file @ 44aa1679
...@@ -52,7 +52,7 @@ spec: ...@@ -52,7 +52,7 @@ spec:
optional: true optional: true
containers: containers:
- name: kubedns - name: kubedns
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.12.1 image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.13.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
...@@ -103,7 +103,7 @@ spec: ...@@ -103,7 +103,7 @@ spec:
- name: kube-dns-config - name: kube-dns-config
mountPath: /kube-dns-config mountPath: /kube-dns-config
- name: dnsmasq - name: dnsmasq
image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.12.1 image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.13.0
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthcheck/dnsmasq path: /healthcheck/dnsmasq
...@@ -132,7 +132,7 @@ spec: ...@@ -132,7 +132,7 @@ spec:
cpu: 150m cpu: 150m
memory: 10Mi memory: 10Mi
- name: sidecar - name: sidecar
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.12.1 image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.13.0
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /metrics path: /metrics
......
cmd/kubeadm/app/phases/addons/manifests.go
View file @ 44aa1679
...@@ -93,7 +93,7 @@ spec: ...@@ -93,7 +93,7 @@ spec:
name: kube-proxy name: kube-proxy
` `
KubeDNSVersion = "1.12.1" KubeDNSVersion = "1.13.0"
KubeDNSDeployment = ` KubeDNSDeployment = `
...@@ -198,7 +198,6 @@ spec: ...@@ -198,7 +198,6 @@ spec:
failureThreshold: 5 failureThreshold: 5
args: args:
- --cache-size=1000 - --cache-size=1000
- --no-resolv
- --server=/{{ .DNSDomain }}/127.0.0.1#10053 - --server=/{{ .DNSDomain }}/127.0.0.1#10053
- --server=/in-addr.arpa/127.0.0.1#10053 - --server=/in-addr.arpa/127.0.0.1#10053
- --server=/ip6.arpa/127.0.0.1#10053 - --server=/ip6.arpa/127.0.0.1#10053
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment