Skip to content

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

Merge pull request #32406 from MrHohn/kubedns-healthz

Automatic merge from submit-queue Split dns healthcheck into two different urls Attempt to fix #30633. <s>This new kube-dns pod template creates two exechealthz processes listen on two different ports for kubedns and dnsmasq correspondingly. @thockin @girishkalele
parents 1654fd40 d17cd1a5
Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 48 deletions
cluster/addons/dns/skydns-rc.yaml.base
View file @ b79c99da
...@@ -35,7 +35,6 @@ spec: ...@@ -35,7 +35,6 @@ spec:
labels: labels:
k8s-app: kube-dns k8s-app: kube-dns
version: v19 version: v19
kubernetes.io/cluster-service: "true"
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]' scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
...@@ -55,7 +54,7 @@ spec: ...@@ -55,7 +54,7 @@ spec:
memory: 70Mi memory: 70Mi
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthz path: /healthz-kubedns
port: 8080 port: 8080
scheme: HTTP scheme: HTTP
initialDelaySeconds: 60 initialDelaySeconds: 60
...@@ -85,6 +84,15 @@ spec: ...@@ -85,6 +84,15 @@ spec:
protocol: TCP protocol: TCP
- name: dnsmasq - name: dnsmasq
image: gcr.io/google_containers/kube-dnsmasq-amd64:1.3 image: gcr.io/google_containers/kube-dnsmasq-amd64:1.3
livenessProbe:
httpGet:
path: /healthz-dnsmasq
port: 8080
scheme: HTTP
initialDelaySeconds: 60
timeoutSeconds: 5
successThreshold: 1
failureThreshold: 5
args: args:
- --cache-size=1000 - --cache-size=1000
- --no-resolv - --no-resolv
...@@ -98,7 +106,7 @@ spec: ...@@ -98,7 +106,7 @@ spec:
name: dns-tcp name: dns-tcp
protocol: TCP protocol: TCP
- name: healthz - name: healthz
image: gcr.io/google_containers/exechealthz-amd64:1.1 image: gcr.io/google_containers/exechealthz-amd64:1.2
resources: resources:
limits: limits:
memory: 50Mi memory: 50Mi
...@@ -110,9 +118,12 @@ spec: ...@@ -110,9 +118,12 @@ spec:
# net memory requested by the pod constant. # net memory requested by the pod constant.
memory: 50Mi memory: 50Mi
args: args:
- -cmd=nslookup kubernetes.default.svc.__PILLAR__DNS__DOMAIN__ 127.0.0.1 >/dev/null && nslookup kubernetes.default.svc.__PILLAR__DNS__DOMAIN__ 127.0.0.1:10053 >/dev/null - --cmd=nslookup kubernetes.default.svc.__PILLAR__DNS__DOMAIN__ 127.0.0.1 >/dev/null
- -port=8080 - --url=/healthz-dnsmasq
- -quiet - --cmd=nslookup kubernetes.default.svc.__PILLAR__DNS__DOMAIN__ 127.0.0.1:10053 >/dev/null
- --url=/healthz-kubedns
- --port=8080
- --quiet
ports: ports:
- containerPort: 8080 - containerPort: 8080
protocol: TCP protocol: TCP
......
cluster/addons/dns/skydns-rc.yaml.in
View file @ b79c99da
...@@ -55,7 +55,7 @@ spec: ...@@ -55,7 +55,7 @@ spec:
memory: 70Mi memory: 70Mi
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthz path: /healthz-kubedns
port: 8080 port: 8080
scheme: HTTP scheme: HTTP
initialDelaySeconds: 60 initialDelaySeconds: 60
...@@ -97,8 +97,17 @@ spec: ...@@ -97,8 +97,17 @@ spec:
- containerPort: 53 - containerPort: 53
name: dns-tcp name: dns-tcp
protocol: TCP protocol: TCP
livenessProbe:
httpGet:
path: /healthz-dnsmasq
port: 8080
scheme: HTTP
initialDelaySeconds: 60
timeoutSeconds: 5
successThreshold: 1
failureThreshold: 5
- name: healthz - name: healthz
image: gcr.io/google_containers/exechealthz-amd64:1.1 image: gcr.io/google_containers/exechealthz-amd64:1.2
resources: resources:
limits: limits:
memory: 50Mi memory: 50Mi
...@@ -110,9 +119,12 @@ spec: ...@@ -110,9 +119,12 @@ spec:
# net memory requested by the pod constant. # net memory requested by the pod constant.
memory: 50Mi memory: 50Mi
args: args:
- -cmd=nslookup kubernetes.default.svc.{{ pillar['dns_domain'] }} 127.0.0.1 >/dev/null && nslookup kubernetes.default.svc.{{ pillar['dns_domain'] }} 127.0.0.1:10053 >/dev/null - --cmd=nslookup kubernetes.default.svc.{{ pillar['dns_domain'] }} 127.0.0.1 >/dev/null
- -port=8080 - --url=/healthz-dnsmasq
- -quiet - --cmd=nslookup kubernetes.default.svc.{{ pillar['dns_domain'] }} 127.0.0.1:10053 >/dev/null
- --url=/healthz-kubedns
- --port=8080
- --quiet
ports: ports:
- containerPort: 8080 - containerPort: 8080
protocol: TCP protocol: TCP
......
cluster/addons/dns/skydns-rc.yaml.sed
View file @ b79c99da
...@@ -55,7 +55,7 @@ spec: ...@@ -55,7 +55,7 @@ spec:
memory: 70Mi memory: 70Mi
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthz path: /healthz-kubedns
port: 8080 port: 8080
scheme: HTTP scheme: HTTP
initialDelaySeconds: 60 initialDelaySeconds: 60
...@@ -96,8 +96,17 @@ spec: ...@@ -96,8 +96,17 @@ spec:
- containerPort: 53 - containerPort: 53
name: dns-tcp name: dns-tcp
protocol: TCP protocol: TCP
livenessProbe:
httpGet:
path: /healthz-dnsmasq
port: 8080
scheme: HTTP
initialDelaySeconds: 60
timeoutSeconds: 5
successThreshold: 1
failureThreshold: 5
- name: healthz - name: healthz
image: gcr.io/google_containers/exechealthz-amd64:1.1 image: gcr.io/google_containers/exechealthz-amd64:1.2
resources: resources:
limits: limits:
memory: 50Mi memory: 50Mi
...@@ -109,9 +118,12 @@ spec: ...@@ -109,9 +118,12 @@ spec:
# net memory requested by the pod constant. # net memory requested by the pod constant.
memory: 50Mi memory: 50Mi
args: args:
- -cmd=nslookup kubernetes.default.svc.$DNS_DOMAIN 127.0.0.1 >/dev/null && nslookup kubernetes.default.svc.$DNS_DOMAIN 127.0.0.1:10053 >/dev/null - --cmd=nslookup kubernetes.default.svc.$DNS_DOMAIN 127.0.0.1 >/dev/null
- -port=8080 - --url=/healthz-dnsmasq
- -quiet - --cmd=nslookup kubernetes.default.svc.$DNS_DOMAIN 127.0.0.1:10053 >/dev/null
- --url=/healthz-kubedns
- --port=8080
- --quiet
ports: ports:
- containerPort: 8080 - containerPort: 8080
protocol: TCP protocol: TCP
......
cluster/gce/coreos/kube-manifests/addons/dns/skydns-rc.yaml
View file @ b79c99da
apiVersion: v1 apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
name: kube-dns-v15 name: kube-dns-v19
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: kube-dns k8s-app: kube-dns
version: v15 version: v19
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
replicas: ${DNS_REPLICAS} replicas: ${DNS_REPLICAS}
selector: selector:
k8s-app: kube-dns k8s-app: kube-dns
version: v15 version: v19
template: template:
metadata: metadata:
labels: labels:
k8s-app: kube-dns k8s-app: kube-dns
version: v15 version: v19
kubernetes.io/cluster-service: "true" annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
spec: spec:
containers: containers:
- name: kubedns - name: kubedns
...@@ -28,14 +30,13 @@ spec: ...@@ -28,14 +30,13 @@ spec:
# guaranteed class. Currently, this container falls into the # guaranteed class. Currently, this container falls into the
# "burstable" category so the kubelet doesn't backoff from restarting it. # "burstable" category so the kubelet doesn't backoff from restarting it.
limits: limits:
cpu: 100m
memory: 200Mi memory: 200Mi
requests: requests:
cpu: 100m cpu: 100m
memory: 100Mi memory: 100Mi
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthz path: /healthz-kubedns
port: 8080 port: 8080
scheme: HTTP scheme: HTTP
initialDelaySeconds: 60 initialDelaySeconds: 60
...@@ -63,7 +64,16 @@ spec: ...@@ -63,7 +64,16 @@ spec:
name: dns-tcp-local name: dns-tcp-local
protocol: TCP protocol: TCP
- name: dnsmasq - name: dnsmasq
image: gcr.io/google_containers/dnsmasq:1.1 image: gcr.io/google_containers/dnsmasq:1.3
livenessProbe:
httpGet:
path: /healthz-dnsmasq
port: 8080
scheme: HTTP
initialDelaySeconds: 60
timeoutSeconds: 5
successThreshold: 1
failureThreshold: 5
args: args:
- --cache-size=1000 - --cache-size=1000
- --no-resolv - --no-resolv
...@@ -77,18 +87,24 @@ spec: ...@@ -77,18 +87,24 @@ spec:
name: dns-tcp name: dns-tcp
protocol: TCP protocol: TCP
- name: healthz - name: healthz
image: gcr.io/google_containers/exechealthz-amd64:1.0 image: gcr.io/google_containers/exechealthz-amd64:1.2
resources: resources:
# keep request = limit to keep this container in guaranteed class
limits: limits:
cpu: 10m memory: 50Mi
memory: 20Mi
requests: requests:
cpu: 10m cpu: 10m
memory: 20Mi # Note that this container shouldn't really need 50Mi of memory. The
# limits are set higher than expected pending investigation on #29688.
# The extra memory was stolen from the kubedns container to keep the
# net memory requested by the pod constant.
memory: 50Mi
args: args:
- -cmd=nslookup kubernetes.default.svc.${DNS_DOMAIN} 127.0.0.1 >/dev/null - --cmd=nslookup kubernetes.default.svc.${DNS_DOMAIN} 127.0.0.1 >/dev/null
- -port=8080 - --url=/healthz-dnsmasq
- --cmd=nslookup kubernetes.default.svc.${DNS_DOMAIN} 127.0.0.1:10053 >/dev/null
- --url=/healthz-kubedns
- --port=8080
- --quiet
ports: ports:
- containerPort: 8080 - containerPort: 8080
protocol: TCP protocol: TCP
......
cluster/juju/layers/kubernetes/templates/kubedns-rc.yaml
View file @ b79c99da
...@@ -12,30 +12,30 @@ ...@@ -12,30 +12,30 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# This file should be kept in sync with cluster/images/hyperkube/dns-rc.yaml
# Warning: This is a file generated from the base underscore template file: skydns-rc.yaml.base # Warning: This is a file generated from the base underscore template file: skydns-rc.yaml.base
apiVersion: v1 apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
name: kube-dns-v18 name: kube-dns-v19
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: kube-dns k8s-app: kube-dns
version: v18 version: v19
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
replicas: {{ pillar['dns_replicas'] }} replicas: {{ pillar['dns_replicas'] }}
selector: selector:
k8s-app: kube-dns k8s-app: kube-dns
version: v18 version: v19
template: template:
metadata: metadata:
labels: labels:
k8s-app: kube-dns k8s-app: kube-dns
version: v18 version: v19
kubernetes.io/cluster-service: "true" annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
spec: spec:
containers: containers:
- name: kubedns - name: kubedns
...@@ -46,14 +46,13 @@ spec: ...@@ -46,14 +46,13 @@ spec:
# guaranteed class. Currently, this container falls into the # guaranteed class. Currently, this container falls into the
# "burstable" category so the kubelet doesn't backoff from restarting it. # "burstable" category so the kubelet doesn't backoff from restarting it.
limits: limits:
cpu: 100m
memory: 200Mi memory: 200Mi
requests: requests:
cpu: 100m cpu: 100m
memory: 100Mi memory: 100Mi
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthz path: /healthz-kubedns
port: 8080 port: 8080
scheme: HTTP scheme: HTTP
initialDelaySeconds: 60 initialDelaySeconds: 60
...@@ -84,6 +83,15 @@ spec: ...@@ -84,6 +83,15 @@ spec:
protocol: TCP protocol: TCP
- name: dnsmasq - name: dnsmasq
image: gcr.io/google_containers/kube-dnsmasq-{{ arch }}:1.3 image: gcr.io/google_containers/kube-dnsmasq-{{ arch }}:1.3
livenessProbe:
httpGet:
path: /healthz-dnsmasq
port: 8080
scheme: HTTP
initialDelaySeconds: 60
timeoutSeconds: 5
successThreshold: 1
failureThreshold: 5
args: args:
- --cache-size=1000 - --cache-size=1000
- --no-resolv - --no-resolv
...@@ -97,19 +105,24 @@ spec: ...@@ -97,19 +105,24 @@ spec:
name: dns-tcp name: dns-tcp
protocol: TCP protocol: TCP
- name: healthz - name: healthz
image: gcr.io/google_containers/exechealthz-{{ arch }}:1.0 image: gcr.io/google_containers/exechealthz-{{ arch }}:1.2
resources: resources:
# keep request = limit to keep this container in guaranteed class
limits: limits:
cpu: 10m memory: 50Mi
memory: 20Mi
requests: requests:
cpu: 10m cpu: 10m
memory: 20Mi # Note that this container shouldn't really need 50Mi of memory. The
# limits are set higher than expected pending investigation on #29688.
# The extra memory was stolen from the kubedns container to keep the
# net memory requested by the pod constant.
memory: 50Mi
args: args:
- -cmd=nslookup kubernetes.default.svc.{{ pillar['dns_domain'] }} 127.0.0.1 >/dev/null && nslookup kubernetes.default.svc.{{ pillar['dns_domain'] }} 127.0.0.1:10053 >/dev/null - --cmd=nslookup kubernetes.default.svc.{{ pillar['dns_domain'] }} 127.0.0.1 >/dev/null
- -port=8080 - --url=/healthz-dnsmasq
- -quiet - --cmd=nslookup kubernetes.default.svc.{{ pillar['dns_domain'] }} 127.0.0.1:10053 >/dev/null
- --url=/healthz-kubedns
- --port=8080
- --quiet
ports: ports:
- containerPort: 8080 - containerPort: 8080
protocol: TCP protocol: TCP
......
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