Skip to content

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

Merge pull request #36261 from bowei/dnsmasq-metrics-in-dns-pod

Automatic merge from submit-queue Add dnsmasq-metrics to the standard DNS pod
parents f70c2ef2 9478c4b0
Hide whitespace changes
Inline Side-by-side
Showing with 161 additions and 3 deletions
cluster/addons/dns/skydns-rc.yaml.base
View file @ 52ca344c
...@@ -74,10 +74,15 @@ spec: ...@@ -74,10 +74,15 @@ spec:
initialDelaySeconds: 3 initialDelaySeconds: 3
timeoutSeconds: 5 timeoutSeconds: 5
args: args:
# command = "/kube-dns"
- --domain=__PILLAR__DNS__DOMAIN__. - --domain=__PILLAR__DNS__DOMAIN__.
- --dns-port=10053 - --dns-port=10053
# This should be set to v=2 only after the new image (cut from 1.5) has
# been released, otherwise we will flood the logs.
- --v=0
__PILLAR__FEDERATIONS__DOMAIN__MAP__ __PILLAR__FEDERATIONS__DOMAIN__MAP__
env:
- name: PROMETHEUS_PORT
value: "10055"
ports: ports:
- containerPort: 10053 - containerPort: 10053
name: dns-local name: dns-local
...@@ -85,6 +90,9 @@ spec: ...@@ -85,6 +90,9 @@ spec:
- containerPort: 10053 - containerPort: 10053
name: dns-tcp-local name: dns-tcp-local
protocol: TCP protocol: TCP
- containerPort: 10055
name: metrics
protocol: TCP
- name: dnsmasq - name: dnsmasq
image: gcr.io/google_containers/kube-dnsmasq-amd64:1.4 image: gcr.io/google_containers/kube-dnsmasq-amd64:1.4
livenessProbe: livenessProbe:
...@@ -108,6 +116,32 @@ spec: ...@@ -108,6 +116,32 @@ spec:
- containerPort: 53 - containerPort: 53
name: dns-tcp name: dns-tcp
protocol: TCP protocol: TCP
# see: https://github.com/kubernetes/kubernetes/issues/29055 for details
resources:
requests:
cpu: 150m
memory: 10Mi
- name: dnsmasq-metrics
image: gcr.io/google_containers/dnsmasq-metrics-amd64:1.0
livenessProbe:
httpGet:
path: /metrics
port: 10054
scheme: HTTP
initialDelaySeconds: 60
timeoutSeconds: 5
successThreshold: 1
failureThreshold: 5
args:
- --v=2
- --logtostderr
ports:
- containerPort: 10054
name: metrics
protocol: TCP
resources:
requests:
memory: 10Mi
- name: healthz - name: healthz
image: gcr.io/google_containers/exechealthz-amd64:1.2 image: gcr.io/google_containers/exechealthz-amd64:1.2
resources: resources:
......
cluster/addons/dns/skydns-rc.yaml.in
View file @ 52ca344c
...@@ -74,10 +74,15 @@ spec: ...@@ -74,10 +74,15 @@ spec:
initialDelaySeconds: 3 initialDelaySeconds: 3
timeoutSeconds: 5 timeoutSeconds: 5
args: args:
# command = "/kube-dns"
- --domain={{ pillar['dns_domain'] }}. - --domain={{ pillar['dns_domain'] }}.
- --dns-port=10053 - --dns-port=10053
# This should be set to v=2 only after the new image (cut from 1.5) has
# been released, otherwise we will flood the logs.
- --v=0
{{ pillar['federations_domain_map'] }} {{ pillar['federations_domain_map'] }}
env:
- name: PROMETHEUS_PORT
value: "10055"
ports: ports:
- containerPort: 10053 - containerPort: 10053
name: dns-local name: dns-local
...@@ -85,6 +90,9 @@ spec: ...@@ -85,6 +90,9 @@ spec:
- containerPort: 10053 - containerPort: 10053
name: dns-tcp-local name: dns-tcp-local
protocol: TCP protocol: TCP
- containerPort: 10055
name: metrics
protocol: TCP
- name: dnsmasq - name: dnsmasq
image: gcr.io/google_containers/kube-dnsmasq-amd64:1.4 image: gcr.io/google_containers/kube-dnsmasq-amd64:1.4
livenessProbe: livenessProbe:
...@@ -108,6 +116,32 @@ spec: ...@@ -108,6 +116,32 @@ spec:
- containerPort: 53 - containerPort: 53
name: dns-tcp name: dns-tcp
protocol: TCP protocol: TCP
# see: https://github.com/kubernetes/kubernetes/issues/29055 for details
resources:
requests:
cpu: 150m
memory: 10Mi
- name: dnsmasq-metrics
image: gcr.io/google_containers/dnsmasq-metrics-amd64:1.0
livenessProbe:
httpGet:
path: /metrics
port: 10054
scheme: HTTP
initialDelaySeconds: 60
timeoutSeconds: 5
successThreshold: 1
failureThreshold: 5
args:
- --v=2
- --logtostderr
ports:
- containerPort: 10054
name: metrics
protocol: TCP
resources:
requests:
memory: 10Mi
- name: healthz - name: healthz
image: gcr.io/google_containers/exechealthz-amd64:1.2 image: gcr.io/google_containers/exechealthz-amd64:1.2
resources: resources:
......
cluster/addons/dns/skydns-rc.yaml.sed
View file @ 52ca344c
...@@ -74,9 +74,14 @@ spec: ...@@ -74,9 +74,14 @@ spec:
initialDelaySeconds: 3 initialDelaySeconds: 3
timeoutSeconds: 5 timeoutSeconds: 5
args: args:
# command = "/kube-dns"
- --domain=$DNS_DOMAIN. - --domain=$DNS_DOMAIN.
- --dns-port=10053 - --dns-port=10053
# This should be set to v=2 only after the new image (cut from 1.5) has
# been released, otherwise we will flood the logs.
- --v=0
env:
- name: PROMETHEUS_PORT
value: "10055"
ports: ports:
- containerPort: 10053 - containerPort: 10053
name: dns-local name: dns-local
...@@ -84,6 +89,9 @@ spec: ...@@ -84,6 +89,9 @@ spec:
- containerPort: 10053 - containerPort: 10053
name: dns-tcp-local name: dns-tcp-local
protocol: TCP protocol: TCP
- containerPort: 10055
name: metrics
protocol: TCP
- name: dnsmasq - name: dnsmasq
image: gcr.io/google_containers/kube-dnsmasq-amd64:1.4 image: gcr.io/google_containers/kube-dnsmasq-amd64:1.4
livenessProbe: livenessProbe:
...@@ -107,6 +115,32 @@ spec: ...@@ -107,6 +115,32 @@ spec:
- containerPort: 53 - containerPort: 53
name: dns-tcp name: dns-tcp
protocol: TCP protocol: TCP
# see: https://github.com/kubernetes/kubernetes/issues/29055 for details
resources:
requests:
cpu: 150m
memory: 10Mi
- name: dnsmasq-metrics
image: gcr.io/google_containers/dnsmasq-metrics-amd64:1.0
livenessProbe:
httpGet:
path: /metrics
port: 10054
scheme: HTTP
initialDelaySeconds: 60
timeoutSeconds: 5
successThreshold: 1
failureThreshold: 5
args:
- --v=2
- --logtostderr
ports:
- containerPort: 10054
name: metrics
protocol: TCP
resources:
requests:
memory: 10Mi
- name: healthz - name: healthz
image: gcr.io/google_containers/exechealthz-amd64:1.2 image: gcr.io/google_containers/exechealthz-amd64:1.2
resources: resources:
......
cluster/gce/coreos/kube-manifests/addons/dns/skydns-rc.yaml
View file @ 52ca344c
...@@ -57,6 +57,10 @@ spec: ...@@ -57,6 +57,10 @@ spec:
# command = "/kube-dns" # command = "/kube-dns"
- --domain=${DNS_DOMAIN}. - --domain=${DNS_DOMAIN}.
- --dns-port=10053 - --dns-port=10053
- --v=0
env:
- name: PROMETHEUS_PORT
value: "10055"
ports: ports:
- containerPort: 10053 - containerPort: 10053
name: dns-local name: dns-local
...@@ -64,6 +68,9 @@ spec: ...@@ -64,6 +68,9 @@ spec:
- containerPort: 10053 - containerPort: 10053
name: dns-tcp-local name: dns-tcp-local
protocol: TCP protocol: TCP
- containerPort: 10055
name: metrics
protocol: TCP
- name: dnsmasq - name: dnsmasq
image: gcr.io/google_containers/kube-dnsmasq-amd64:1.4 image: gcr.io/google_containers/kube-dnsmasq-amd64:1.4
livenessProbe: livenessProbe:
...@@ -87,6 +94,27 @@ spec: ...@@ -87,6 +94,27 @@ spec:
- containerPort: 53 - containerPort: 53
name: dns-tcp name: dns-tcp
protocol: TCP protocol: TCP
- name: dnsmasq-metrics
image: gcr.io/google_containers/dnsmasq-metrics-amd64:1.0
livenessProbe:
httpGet:
path: /metrics
port: 10054
scheme: HTTP
initialDelaySeconds: 60
timeoutSeconds: 5
successThreshold: 1
failureThreshold: 5
args:
- --v=2
- --logtostderr
ports:
- containerPort: 10054
name: metrics
protocol: TCP
resources:
requests:
memory: 10Mi
- name: healthz - name: healthz
image: gcr.io/google_containers/exechealthz-amd64:1.2 image: gcr.io/google_containers/exechealthz-amd64:1.2
resources: resources:
......
cluster/juju/layers/kubernetes/templates/kubedns-rc.yaml
View file @ 52ca344c
...@@ -73,8 +73,12 @@ spec: ...@@ -73,8 +73,12 @@ spec:
# command = "/kube-dns" # command = "/kube-dns"
- --domain={{ pillar['dns_domain'] }}. - --domain={{ pillar['dns_domain'] }}.
- --dns-port=10053 - --dns-port=10053
- --v=0
- --kube_master_url=http://{{ private_address }}:8080 - --kube_master_url=http://{{ private_address }}:8080
{{ pillar['federations_domain_map'] }} {{ pillar['federations_domain_map'] }}
env:
- name: PROMETHEUS_PORT
value: "10055"
ports: ports:
- containerPort: 10053 - containerPort: 10053
name: dns-local name: dns-local
...@@ -82,6 +86,9 @@ spec: ...@@ -82,6 +86,9 @@ spec:
- containerPort: 10053 - containerPort: 10053
name: dns-tcp-local name: dns-tcp-local
protocol: TCP protocol: TCP
- containerPort: 10055
name: metrics
protocol: TCP
- name: dnsmasq - name: dnsmasq
image: gcr.io/google_containers/kube-dnsmasq-{{ arch }}:1.4 image: gcr.io/google_containers/kube-dnsmasq-{{ arch }}:1.4
livenessProbe: livenessProbe:
...@@ -105,6 +112,27 @@ spec: ...@@ -105,6 +112,27 @@ spec:
- containerPort: 53 - containerPort: 53
name: dns-tcp name: dns-tcp
protocol: TCP protocol: TCP
- name: dnsmasq-metrics
image: gcr.io/google_containers/dnsmasq-metrics-amd64:1.0
livenessProbe:
httpGet:
path: /metrics
port: 10054
scheme: HTTP
initialDelaySeconds: 60
timeoutSeconds: 5
successThreshold: 1
failureThreshold: 5
args:
- --v=2
- --logtostderr
ports:
- containerPort: 10054
name: metrics
protocol: TCP
resources:
requests:
memory: 10Mi
- name: healthz - name: healthz
image: gcr.io/google_containers/exechealthz-{{ arch }}:1.2 image: gcr.io/google_containers/exechealthz-{{ arch }}:1.2
resources: resources:
......
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