Skip to content

Commit bfb809f

Browse files
committed
revert coredns to 1.3.1
1 parent 99f2e78 commit bfb809f

File tree

4 files changed

+9
-17
lines changed

4 files changed

+9
-17
lines changed

cluster/addons/dns/coredns/coredns.yaml.base

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ data:
6464
.:53 {
6565
errors
6666
health
67-
ready
6867
kubernetes __PILLAR__DNS__DOMAIN__ in-addr.arpa ip6.arpa {
6968
pods insecure
7069
fallthrough in-addr.arpa ip6.arpa
@@ -116,7 +115,7 @@ spec:
116115
beta.kubernetes.io/os: linux
117116
containers:
118117
- name: coredns
119-
image: k8s.gcr.io/coredns:1.5.0
118+
image: k8s.gcr.io/coredns:1.3.1
120119
imagePullPolicy: IfNotPresent
121120
resources:
122121
limits:
@@ -150,8 +149,8 @@ spec:
150149
failureThreshold: 5
151150
readinessProbe:
152151
httpGet:
153-
path: /ready
154-
port: 8181
152+
path: /health
153+
port: 8080
155154
scheme: HTTP
156155
securityContext:
157156
allowPrivilegeEscalation: false

cluster/addons/dns/coredns/coredns.yaml.in

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ data:
6464
.:53 {
6565
errors
6666
health
67-
ready
6867
kubernetes {{ pillar['dns_domain'] }} in-addr.arpa ip6.arpa {
6968
pods insecure
7069
fallthrough in-addr.arpa ip6.arpa
@@ -116,7 +115,7 @@ spec:
116115
beta.kubernetes.io/os: linux
117116
containers:
118117
- name: coredns
119-
image: k8s.gcr.io/coredns:1.5.0
118+
image: k8s.gcr.io/coredns:1.3.1
120119
imagePullPolicy: IfNotPresent
121120
resources:
122121
limits:
@@ -150,8 +149,8 @@ spec:
150149
failureThreshold: 5
151150
readinessProbe:
152151
httpGet:
153-
path: /ready
154-
port: 8181
152+
path: /health
153+
port: 8080
155154
scheme: HTTP
156155
securityContext:
157156
allowPrivilegeEscalation: false

cluster/addons/dns/coredns/coredns.yaml.sed

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ data:
6464
.:53 {
6565
errors
6666
health
67-
ready
6867
kubernetes $DNS_DOMAIN in-addr.arpa ip6.arpa {
6968
pods insecure
7069
fallthrough in-addr.arpa ip6.arpa
@@ -116,7 +115,7 @@ spec:
116115
beta.kubernetes.io/os: linux
117116
containers:
118117
- name: coredns
119-
image: k8s.gcr.io/coredns:1.5.0
118+
image: k8s.gcr.io/coredns:1.3.1
120119
imagePullPolicy: IfNotPresent
121120
resources:
122121
limits:
@@ -150,8 +149,8 @@ spec:
150149
failureThreshold: 5
151150
readinessProbe:
152151
httpGet:
153-
path: /ready
154-
port: 8181
152+
path: /health
153+
port: 8080
155154
scheme: HTTP
156155
securityContext:
157156
allowPrivilegeEscalation: false

test/e2e/network/dns_configmap.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ func (t *dnsFederationsConfigMapTest) run() {
6767
valid1 := map[string]string{
6868
"Corefile": fmt.Sprintf(`.:53 {
6969
health
70-
ready
7170
kubernetes %v in-addr.arpa ip6.arpa {
7271
pods insecure
7372
upstream
@@ -84,7 +83,6 @@ func (t *dnsFederationsConfigMapTest) run() {
8483
valid2 := map[string]string{
8584
"Corefile": fmt.Sprintf(`:53 {
8685
health
87-
ready
8886
kubernetes %v in-addr.arpa ip6.arpa {
8987
pods insecure
9088
upstream
@@ -235,7 +233,6 @@ func (t *dnsNameserverTest) run(isIPv6 bool) {
235233
t.setConfigMap(&v1.ConfigMap{Data: map[string]string{
236234
"Corefile": fmt.Sprintf(`.:53 {
237235
health
238-
ready
239236
kubernetes %v in-addr.arpa ip6.arpa {
240237
pods insecure
241238
upstream
@@ -335,7 +332,6 @@ func (t *dnsPtrFwdTest) run(isIPv6 bool) {
335332
t.setConfigMap(&v1.ConfigMap{Data: map[string]string{
336333
"Corefile": fmt.Sprintf(`.:53 {
337334
health
338-
ready
339335
kubernetes %v in-addr.arpa ip6.arpa {
340336
pods insecure
341337
upstream
@@ -447,7 +443,6 @@ func (t *dnsExternalNameTest) run(isIPv6 bool) {
447443
t.setConfigMap(&v1.ConfigMap{Data: map[string]string{
448444
"Corefile": fmt.Sprintf(`.:53 {
449445
health
450-
ready
451446
kubernetes %v in-addr.arpa ip6.arpa {
452447
pods insecure
453448
upstream

0 commit comments

Comments
 (0)