github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #78691 from rajansandeep/revertto131

Browse Source 
Revert CoreDNS to 1.3.1 in kube-up
This commit is contained in:
Kubernetes Prow Robot 2019-06-10 10:55:10 -07:00 committed by GitHub
commit 32ec6c212e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

5
test/e2e/network/dns_configmap.go
View File

@ -67,7 +67,6 @@ func (t *dnsFederationsConfigMapTest) run() {
valid1 := map[string]string{ valid1 := map[string]string{
"Corefile": fmt.Sprintf(`.:53 { "Corefile": fmt.Sprintf(`.:53 {
health health
ready
kubernetes %v in-addr.arpa ip6.arpa { kubernetes %v in-addr.arpa ip6.arpa {
pods insecure pods insecure
upstream upstream
@ -84,7 +83,6 @@ func (t *dnsFederationsConfigMapTest) run() {
valid2 := map[string]string{ valid2 := map[string]string{
"Corefile": fmt.Sprintf(`:53 { "Corefile": fmt.Sprintf(`:53 {
health health
ready
kubernetes %v in-addr.arpa ip6.arpa { kubernetes %v in-addr.arpa ip6.arpa {
pods insecure pods insecure
upstream upstream
@ -235,7 +233,6 @@ func (t *dnsNameserverTest) run(isIPv6 bool) {
t.setConfigMap(&v1.ConfigMap{Data: map[string]string{ t.setConfigMap(&v1.ConfigMap{Data: map[string]string{
"Corefile": fmt.Sprintf(`.:53 { "Corefile": fmt.Sprintf(`.:53 {
health health
ready
kubernetes %v in-addr.arpa ip6.arpa { kubernetes %v in-addr.arpa ip6.arpa {
pods insecure pods insecure
upstream upstream
@ -335,7 +332,6 @@ func (t *dnsPtrFwdTest) run(isIPv6 bool) {
t.setConfigMap(&v1.ConfigMap{Data: map[string]string{ t.setConfigMap(&v1.ConfigMap{Data: map[string]string{
"Corefile": fmt.Sprintf(`.:53 { "Corefile": fmt.Sprintf(`.:53 {
health health
ready
kubernetes %v in-addr.arpa ip6.arpa { kubernetes %v in-addr.arpa ip6.arpa {
pods insecure pods insecure
upstream upstream
@ -447,7 +443,6 @@ func (t *dnsExternalNameTest) run(isIPv6 bool) {
t.setConfigMap(&v1.ConfigMap{Data: map[string]string{ t.setConfigMap(&v1.ConfigMap{Data: map[string]string{
"Corefile": fmt.Sprintf(`.:53 { "Corefile": fmt.Sprintf(`.:53 {
health health
ready
kubernetes %v in-addr.arpa ip6.arpa { kubernetes %v in-addr.arpa ip6.arpa {
pods insecure pods insecure
upstream upstream