mirror of https://github.com/k3s-io/k3s
Update reference to dns sidecar (was dnsmasq-metrics); remove exec-healthz
k8s-dns-sidecar --probe will be used to maintain a health check of the DNS related daemons. This removes the need for exec-healthz.pull/6/head
Bowei Du
parent
4474263a26
commit
4177639d34
|
|
@ -60,8 +60,8 @@ spec:
|
||||||
memory: 70Mi
|
memory: 70Mi
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /healthz-kubedns
|
path: /healthcheck/kubedns
|
||||||
port: 8080
|
port: 10054
|
||||||
scheme: HTTP
|
scheme: HTTP
|
||||||
initialDelaySeconds: 60
|
initialDelaySeconds: 60
|
||||||
timeoutSeconds: 5
|
timeoutSeconds: 5
|
||||||
|
|
@ -99,8 +99,8 @@ spec:
|
||||||
image: gcr.io/google_containers/kube-dnsmasq-amd64:1.4
|
image: gcr.io/google_containers/kube-dnsmasq-amd64:1.4
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /healthz-dnsmasq
|
path: /healthcheck/dnsmasq
|
||||||
port: 8080
|
port: 10054
|
||||||
scheme: HTTP
|
scheme: HTTP
|
||||||
initialDelaySeconds: 60
|
initialDelaySeconds: 60
|
||||||
timeoutSeconds: 5
|
timeoutSeconds: 5
|
||||||
|
|
@ -123,8 +123,8 @@ spec:
|
||||||
requests:
|
requests:
|
||||||
cpu: 150m
|
cpu: 150m
|
||||||
memory: 10Mi
|
memory: 10Mi
|
||||||
- name: dnsmasq-metrics
|
- name: sidecar
|
||||||
image: gcr.io/google_containers/dnsmasq-metrics-amd64:1.0
|
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.10.0
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /metrics
|
path: /metrics
|
||||||
|
|
@ -137,33 +137,14 @@ spec:
|
||||||
args:
|
args:
|
||||||
- --v=2
|
- --v=2
|
||||||
- --logtostderr
|
- --logtostderr
|
||||||
|
- --probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.__PILLAR__DNS__DOMAIN__,5,A
|
||||||
|
- --probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.__PILLAR__DNS__DOMAIN__,5,A
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 10054
|
- containerPort: 10054
|
||||||
name: metrics
|
name: metrics
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
memory: 10Mi
|
memory: 20Mi
|
||||||
- name: healthz
|
|
||||||
image: gcr.io/google_containers/exechealthz-amd64:1.2
|
|
||||||
resources:
|
|
||||||
limits:
|
|
||||||
memory: 50Mi
|
|
||||||
requests:
|
|
||||||
cpu: 10m
|
cpu: 10m
|
||||||
# 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:
|
|
||||||
- --cmd=nslookup kubernetes.default.svc.__PILLAR__DNS__DOMAIN__ 127.0.0.1 >/dev/null
|
|
||||||
- --url=/healthz-dnsmasq
|
|
||||||
- --cmd=nslookup kubernetes.default.svc.__PILLAR__DNS__DOMAIN__ 127.0.0.1:10053 >/dev/null
|
|
||||||
- --url=/healthz-kubedns
|
|
||||||
- --port=8080
|
|
||||||
- --quiet
|
|
||||||
ports:
|
|
||||||
- containerPort: 8080
|
|
||||||
protocol: TCP
|
|
||||||
dnsPolicy: Default # Don't use cluster DNS.
|
dnsPolicy: Default # Don't use cluster DNS.
|
||||||
|
|
|
||||||
|
|
@ -60,8 +60,8 @@ spec:
|
||||||
memory: 70Mi
|
memory: 70Mi
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /healthz-kubedns
|
path: /healthcheck/kubedns
|
||||||
port: 8080
|
port: 10054
|
||||||
scheme: HTTP
|
scheme: HTTP
|
||||||
initialDelaySeconds: 60
|
initialDelaySeconds: 60
|
||||||
timeoutSeconds: 5
|
timeoutSeconds: 5
|
||||||
|
|
@ -99,8 +99,8 @@ spec:
|
||||||
image: gcr.io/google_containers/kube-dnsmasq-amd64:1.4
|
image: gcr.io/google_containers/kube-dnsmasq-amd64:1.4
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /healthz-dnsmasq
|
path: /healthcheck/dnsmasq
|
||||||
port: 8080
|
port: 10054
|
||||||
scheme: HTTP
|
scheme: HTTP
|
||||||
initialDelaySeconds: 60
|
initialDelaySeconds: 60
|
||||||
timeoutSeconds: 5
|
timeoutSeconds: 5
|
||||||
|
|
@ -123,8 +123,8 @@ spec:
|
||||||
requests:
|
requests:
|
||||||
cpu: 150m
|
cpu: 150m
|
||||||
memory: 10Mi
|
memory: 10Mi
|
||||||
- name: dnsmasq-metrics
|
- name: sidecar
|
||||||
image: gcr.io/google_containers/dnsmasq-metrics-amd64:1.0
|
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.10.0
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /metrics
|
path: /metrics
|
||||||
|
|
@ -137,33 +137,14 @@ spec:
|
||||||
args:
|
args:
|
||||||
- --v=2
|
- --v=2
|
||||||
- --logtostderr
|
- --logtostderr
|
||||||
|
- --probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.{{ pillar['dns_domain'] }},5,A
|
||||||
|
- --probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.{{ pillar['dns_domain'] }},5,A
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 10054
|
- containerPort: 10054
|
||||||
name: metrics
|
name: metrics
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
memory: 10Mi
|
memory: 20Mi
|
||||||
- name: healthz
|
|
||||||
image: gcr.io/google_containers/exechealthz-amd64:1.2
|
|
||||||
resources:
|
|
||||||
limits:
|
|
||||||
memory: 50Mi
|
|
||||||
requests:
|
|
||||||
cpu: 10m
|
cpu: 10m
|
||||||
# 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:
|
|
||||||
- --cmd=nslookup kubernetes.default.svc.{{ pillar['dns_domain'] }} 127.0.0.1 >/dev/null
|
|
||||||
- --url=/healthz-dnsmasq
|
|
||||||
- --cmd=nslookup kubernetes.default.svc.{{ pillar['dns_domain'] }} 127.0.0.1:10053 >/dev/null
|
|
||||||
- --url=/healthz-kubedns
|
|
||||||
- --port=8080
|
|
||||||
- --quiet
|
|
||||||
ports:
|
|
||||||
- containerPort: 8080
|
|
||||||
protocol: TCP
|
|
||||||
dnsPolicy: Default # Don't use cluster DNS.
|
dnsPolicy: Default # Don't use cluster DNS.
|
||||||
|
|
|
||||||
|
|
@ -60,8 +60,8 @@ spec:
|
||||||
memory: 70Mi
|
memory: 70Mi
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /healthz-kubedns
|
path: /healthcheck/kubedns
|
||||||
port: 8080
|
port: 10054
|
||||||
scheme: HTTP
|
scheme: HTTP
|
||||||
initialDelaySeconds: 60
|
initialDelaySeconds: 60
|
||||||
timeoutSeconds: 5
|
timeoutSeconds: 5
|
||||||
|
|
@ -98,8 +98,8 @@ spec:
|
||||||
image: gcr.io/google_containers/kube-dnsmasq-amd64:1.4
|
image: gcr.io/google_containers/kube-dnsmasq-amd64:1.4
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /healthz-dnsmasq
|
path: /healthcheck/dnsmasq
|
||||||
port: 8080
|
port: 10054
|
||||||
scheme: HTTP
|
scheme: HTTP
|
||||||
initialDelaySeconds: 60
|
initialDelaySeconds: 60
|
||||||
timeoutSeconds: 5
|
timeoutSeconds: 5
|
||||||
|
|
@ -122,8 +122,8 @@ spec:
|
||||||
requests:
|
requests:
|
||||||
cpu: 150m
|
cpu: 150m
|
||||||
memory: 10Mi
|
memory: 10Mi
|
||||||
- name: dnsmasq-metrics
|
- name: sidecar
|
||||||
image: gcr.io/google_containers/dnsmasq-metrics-amd64:1.0
|
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.10.0
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /metrics
|
path: /metrics
|
||||||
|
|
@ -136,33 +136,14 @@ spec:
|
||||||
args:
|
args:
|
||||||
- --v=2
|
- --v=2
|
||||||
- --logtostderr
|
- --logtostderr
|
||||||
|
- --probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.$DNS_DOMAIN,5,A
|
||||||
|
- --probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.$DNS_DOMAIN,5,A
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 10054
|
- containerPort: 10054
|
||||||
name: metrics
|
name: metrics
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
memory: 10Mi
|
memory: 20Mi
|
||||||
- name: healthz
|
|
||||||
image: gcr.io/google_containers/exechealthz-amd64:1.2
|
|
||||||
resources:
|
|
||||||
limits:
|
|
||||||
memory: 50Mi
|
|
||||||
requests:
|
|
||||||
cpu: 10m
|
cpu: 10m
|
||||||
# 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:
|
|
||||||
- --cmd=nslookup kubernetes.default.svc.$DNS_DOMAIN 127.0.0.1 >/dev/null
|
|
||||||
- --url=/healthz-dnsmasq
|
|
||||||
- --cmd=nslookup kubernetes.default.svc.$DNS_DOMAIN 127.0.0.1:10053 >/dev/null
|
|
||||||
- --url=/healthz-kubedns
|
|
||||||
- --port=8080
|
|
||||||
- --quiet
|
|
||||||
ports:
|
|
||||||
- containerPort: 8080
|
|
||||||
protocol: TCP
|
|
||||||
dnsPolicy: Default # Don't use cluster DNS.
|
dnsPolicy: Default # Don't use cluster DNS.
|
||||||
|
|
|
||||||
|
|
@ -59,8 +59,8 @@ spec:
|
||||||
memory: 100Mi
|
memory: 100Mi
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /healthz-kubedns
|
path: /healthcheck/kubedns
|
||||||
port: 8080
|
port: 10054
|
||||||
scheme: HTTP
|
scheme: HTTP
|
||||||
initialDelaySeconds: 60
|
initialDelaySeconds: 60
|
||||||
timeoutSeconds: 5
|
timeoutSeconds: 5
|
||||||
|
|
@ -100,8 +100,8 @@ spec:
|
||||||
image: gcr.io/google_containers/kube-dnsmasq-{{ arch }}:1.4
|
image: gcr.io/google_containers/kube-dnsmasq-{{ arch }}:1.4
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /healthz-dnsmasq
|
path: /healthcheck/dnsmasq
|
||||||
port: 8080
|
port: 10054
|
||||||
scheme: HTTP
|
scheme: HTTP
|
||||||
initialDelaySeconds: 60
|
initialDelaySeconds: 60
|
||||||
timeoutSeconds: 5
|
timeoutSeconds: 5
|
||||||
|
|
@ -119,8 +119,8 @@ spec:
|
||||||
- containerPort: 53
|
- containerPort: 53
|
||||||
name: dns-tcp
|
name: dns-tcp
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
- name: dnsmasq-metrics
|
- name: sidecar
|
||||||
image: gcr.io/google_containers/dnsmasq-metrics-amd64:1.0
|
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.10.0
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /metrics
|
path: /metrics
|
||||||
|
|
@ -133,33 +133,14 @@ spec:
|
||||||
args:
|
args:
|
||||||
- --v=2
|
- --v=2
|
||||||
- --logtostderr
|
- --logtostderr
|
||||||
|
- --probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.{{ pillar['dns_domain'] }},5,A
|
||||||
|
- --probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.{{ pillar['dns_domain'] }},5,A
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 10054
|
- containerPort: 10054
|
||||||
name: metrics
|
name: metrics
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
memory: 10Mi
|
memory: 20Mi
|
||||||
- name: healthz
|
|
||||||
image: gcr.io/google_containers/exechealthz-{{ arch }}:1.2
|
|
||||||
resources:
|
|
||||||
limits:
|
|
||||||
memory: 50Mi
|
|
||||||
requests:
|
|
||||||
cpu: 10m
|
cpu: 10m
|
||||||
# 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:
|
|
||||||
- --cmd=nslookup kubernetes.default.svc.{{ pillar['dns_domain'] }} 127.0.0.1 >/dev/null
|
|
||||||
- --url=/healthz-dnsmasq
|
|
||||||
- --cmd=nslookup kubernetes.default.svc.{{ pillar['dns_domain'] }} 127.0.0.1:10053 >/dev/null
|
|
||||||
- --url=/healthz-kubedns
|
|
||||||
- --port=8080
|
|
||||||
- --quiet
|
|
||||||
ports:
|
|
||||||
- containerPort: 8080
|
|
||||||
protocol: TCP
|
|
||||||
dnsPolicy: Default # Don't use cluster DNS.
|
dnsPolicy: Default # Don't use cluster DNS.
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue