Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert CoreDNS to 1.3.1 in kube-up #78691

Merged
merged 1 commit into from
Jun 10, 2019
Merged

Revert CoreDNS to 1.3.1 in kube-up #78691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions cluster/addons/dns/coredns/coredns.yaml.base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ data:
.:53 {
errors
health
ready
kubernetes __PILLAR__DNS__DOMAIN__ in-addr.arpa ip6.arpa {
pods insecure
fallthrough in-addr.arpa ip6.arpa
Expand Down Expand Up @@ -116,7 +115,7 @@ spec:
beta.kubernetes.io/os: linux
containers:
- name: coredns
image: k8s.gcr.io/coredns:1.5.0
image: k8s.gcr.io/coredns:1.3.1
imagePullPolicy: IfNotPresent
resources:
limits:
Expand Down Expand Up @@ -150,8 +149,8 @@ spec:
failureThreshold: 5
readinessProbe:
httpGet:
path: /ready
port: 8181
path: /health
port: 8080
scheme: HTTP
securityContext:
allowPrivilegeEscalation: false
Expand Down
7 changes: 3 additions & 4 deletions cluster/addons/dns/coredns/coredns.yaml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ data:
.:53 {
errors
health
ready
kubernetes {{ pillar['dns_domain'] }} in-addr.arpa ip6.arpa {
pods insecure
fallthrough in-addr.arpa ip6.arpa
Expand Down Expand Up @@ -116,7 +115,7 @@ spec:
beta.kubernetes.io/os: linux
containers:
- name: coredns
image: k8s.gcr.io/coredns:1.5.0
image: k8s.gcr.io/coredns:1.3.1
imagePullPolicy: IfNotPresent
resources:
limits:
Expand Down Expand Up @@ -150,8 +149,8 @@ spec:
failureThreshold: 5
readinessProbe:
httpGet:
path: /ready
port: 8181
path: /health
port: 8080
scheme: HTTP
securityContext:
allowPrivilegeEscalation: false
Expand Down
7 changes: 3 additions & 4 deletions cluster/addons/dns/coredns/coredns.yaml.sed
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ data:
.:53 {
errors
health
ready
kubernetes $DNS_DOMAIN in-addr.arpa ip6.arpa {
pods insecure
fallthrough in-addr.arpa ip6.arpa
Expand Down Expand Up @@ -116,7 +115,7 @@ spec:
beta.kubernetes.io/os: linux
containers:
- name: coredns
image: k8s.gcr.io/coredns:1.5.0
image: k8s.gcr.io/coredns:1.3.1
imagePullPolicy: IfNotPresent
resources:
limits:
Expand Down Expand Up @@ -150,8 +149,8 @@ spec:
failureThreshold: 5
readinessProbe:
httpGet:
path: /ready
port: 8181
path: /health
port: 8080
scheme: HTTP
securityContext:
allowPrivilegeEscalation: false
Expand Down
5 changes: 0 additions & 5 deletions test/e2e/network/dns_configmap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ func (t *dnsFederationsConfigMapTest) run() {
valid1 := map[string]string{
"Corefile": fmt.Sprintf(`.:53 {
health
ready
kubernetes %v in-addr.arpa ip6.arpa {
pods insecure
upstream
Expand All @@ -84,7 +83,6 @@ func (t *dnsFederationsConfigMapTest) run() {
valid2 := map[string]string{
"Corefile": fmt.Sprintf(`:53 {
health
ready
kubernetes %v in-addr.arpa ip6.arpa {
pods insecure
upstream
Expand Down Expand Up @@ -235,7 +233,6 @@ func (t *dnsNameserverTest) run(isIPv6 bool) {
t.setConfigMap(&v1.ConfigMap{Data: map[string]string{
"Corefile": fmt.Sprintf(`.:53 {
health
ready
kubernetes %v in-addr.arpa ip6.arpa {
pods insecure
upstream
Expand Down Expand Up @@ -335,7 +332,6 @@ func (t *dnsPtrFwdTest) run(isIPv6 bool) {
t.setConfigMap(&v1.ConfigMap{Data: map[string]string{
"Corefile": fmt.Sprintf(`.:53 {
health
ready
kubernetes %v in-addr.arpa ip6.arpa {
pods insecure
upstream
Expand Down Expand Up @@ -447,7 +443,6 @@ func (t *dnsExternalNameTest) run(isIPv6 bool) {
t.setConfigMap(&v1.ConfigMap{Data: map[string]string{
"Corefile": fmt.Sprintf(`.:53 {
health
ready
kubernetes %v in-addr.arpa ip6.arpa {
pods insecure
upstream
Expand Down