github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-15 22:20:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #82093 from rajansandeep/reconcilecorednscm

Browse Source 
Add the ability to migrate CoreDNS configmap in kube-up
This commit is contained in:
Kubernetes Prow Robot
2019-08-30 07:59:56 -07:00
committed by GitHub
parent 1ade4ce269 620b4a0845
commit 7236850194
5 changed files with 112 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cluster/addons/dns/coredns/coredns.yaml.base
View File

@@ -64,9 +64,9 @@ data:
.:53 {
errors
health
ready
kubernetes __PILLAR__DNS__DOMAIN__ in-addr.arpa ip6.arpa {
pods insecure
upstream
fallthrough in-addr.arpa ip6.arpa
ttl 30
}
@@ -116,7 +116,7 @@ spec:
beta.kubernetes.io/os: linux
containers:
- name: coredns
image: k8s.gcr.io/coredns:1.3.1
image: k8s.gcr.io/coredns:1.6.2
imagePullPolicy: IfNotPresent
resources:
limits:
@@ -150,8 +150,8 @@ spec:
failureThreshold: 5
readinessProbe:
httpGet:
path: /health
port: 8080
path: /ready
port: 8181
scheme: HTTP
securityContext:
allowPrivilegeEscalation: false

8
cluster/addons/dns/coredns/coredns.yaml.in
View File

@@ -64,9 +64,9 @@ data:
.:53 {
errors
health
ready
kubernetes {{ pillar['dns_domain'] }} in-addr.arpa ip6.arpa {
pods insecure
upstream
fallthrough in-addr.arpa ip6.arpa
ttl 30
}
@@ -116,7 +116,7 @@ spec:
beta.kubernetes.io/os: linux
containers:
- name: coredns
image: k8s.gcr.io/coredns:1.3.1
image: k8s.gcr.io/coredns:1.6.2
imagePullPolicy: IfNotPresent
resources:
limits:
@@ -150,8 +150,8 @@ spec:
failureThreshold: 5
readinessProbe:
httpGet:
path: /health
port: 8080
path: /ready
port: 8181
scheme: HTTP
securityContext:
allowPrivilegeEscalation: false

8
cluster/addons/dns/coredns/coredns.yaml.sed
View File

@@ -64,9 +64,9 @@ data:
.:53 {
errors
health
ready
kubernetes $DNS_DOMAIN in-addr.arpa ip6.arpa {
pods insecure
upstream
fallthrough in-addr.arpa ip6.arpa
ttl 30
}
@@ -116,7 +116,7 @@ spec:
beta.kubernetes.io/os: linux
containers:
- name: coredns
image: k8s.gcr.io/coredns:1.3.1
image: k8s.gcr.io/coredns:1.6.2
imagePullPolicy: IfNotPresent
resources:
limits:
@@ -150,8 +150,8 @@ spec:
failureThreshold: 5
readinessProbe:
httpGet:
path: /health
port: 8080
path: /ready
port: 8181
scheme: HTTP
securityContext:
allowPrivilegeEscalation: false