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

Bump CoreDNS version to 1.5.0 and update manifest #78030

Merged
merged 1 commit into from May 18, 2019
Merged

Bump CoreDNS version to 1.5.0 and update manifest #78030

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions cluster/addons/dns/coredns/coredns.yaml.base
View file
Open in desktop
Expand Up @@ -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
}
Expand Down Expand Up @@ -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.5.0
imagePullPolicy: IfNotPresent
resources:
limits:
Expand Down Expand Up @@ -150,8 +150,8 @@ spec:
failureThreshold: 5
readinessProbe:
httpGet:
path: /health
port: 8080
path: /ready
port: 8181
scheme: HTTP
securityContext:
allowPrivilegeEscalation: false
Expand Down
8 changes: 4 additions & 4 deletions cluster/addons/dns/coredns/coredns.yaml.in
View file
Open in desktop
Expand Up @@ -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
}
Expand Down Expand Up @@ -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.5.0
imagePullPolicy: IfNotPresent
resources:
limits:
Expand Down Expand Up @@ -150,8 +150,8 @@ spec:
failureThreshold: 5
readinessProbe:
httpGet:
path: /health
port: 8080
path: /ready
port: 8181
scheme: HTTP
securityContext:
allowPrivilegeEscalation: false
Expand Down
8 changes: 4 additions & 4 deletions cluster/addons/dns/coredns/coredns.yaml.sed
View file
Open in desktop
Expand Up @@ -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
}
Expand Down Expand Up @@ -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.5.0
imagePullPolicy: IfNotPresent
resources:
limits:
Expand Down Expand Up @@ -150,8 +150,8 @@ spec:
failureThreshold: 5
readinessProbe:
httpGet:
path: /health
port: 8080
path: /ready
port: 8181
scheme: HTTP
securityContext:
allowPrivilegeEscalation: false
Expand Down
2 changes: 1 addition & 1 deletion cmd/kubeadm/app/constants/constants.go
View file
Open in desktop
Expand Up @@ -328,7 +328,7 @@ const (
KubeDNSVersion = "1.14.13"

// CoreDNSVersion is the version of CoreDNS to be deployed if it is used
CoreDNSVersion = "1.3.1"
CoreDNSVersion = "1.5.0"

// ClusterConfigurationKind is the string kind value for the ClusterConfiguration struct
ClusterConfigurationKind = "ClusterConfiguration"
Expand Down
6 changes: 3 additions & 3 deletions cmd/kubeadm/app/phases/addons/dns/manifests.go
View file
Open in desktop
Expand Up @@ -281,8 +281,8 @@ spec:
failureThreshold: 5
readinessProbe:
httpGet:
path: /health
port: 8080
path: /ready
port: 8181
scheme: HTTP
securityContext:
allowPrivilegeEscalation: false
Expand Down Expand Up @@ -314,9 +314,9 @@ data:
.:53 {
errors
health
ready
kubernetes {{ .DNSDomain }} in-addr.arpa ip6.arpa {
pods insecure
upstream
fallthrough in-addr.arpa ip6.arpa
ttl 30
}{{ .Federation }}
Expand Down
28 changes: 14 additions & 14 deletions cmd/kubeadm/app/phases/upgrade/compute_test.go
View file
Open in desktop
Expand Up @@ -186,7 +186,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: constants.MinimumControlPlaneVersion.WithPatch(3).String(),
KubeadmVersion: constants.MinimumControlPlaneVersion.WithPatch(3).String(),
DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.3.1",
DNSVersion: "1.5.0",
EtcdVersion: getEtcdVersion(constants.MinimumControlPlaneVersion),
},
},
Expand Down Expand Up @@ -225,7 +225,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: constants.MinimumControlPlaneVersion.WithPatch(3).String(),
KubeadmVersion: constants.MinimumControlPlaneVersion.WithPatch(3).String(),
DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.3.1",
DNSVersion: "1.5.0",
EtcdVersion: getEtcdVersion(constants.MinimumControlPlaneVersion),
},
},
Expand Down Expand Up @@ -264,7 +264,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: constants.CurrentKubernetesVersion.String(),
KubeadmVersion: constants.CurrentKubernetesVersion.String(),
DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.3.1",
DNSVersion: "1.5.0",
EtcdVersion: getEtcdVersion(constants.CurrentKubernetesVersion),
},
},
Expand Down Expand Up @@ -303,7 +303,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: constants.MinimumControlPlaneVersion.WithPatch(5).String(),
KubeadmVersion: constants.MinimumControlPlaneVersion.WithPatch(5).String(), // Note: The kubeadm version mustn't be "downgraded" here
DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.3.1",
DNSVersion: "1.5.0",
EtcdVersion: getEtcdVersion(constants.MinimumControlPlaneVersion),
},
},
Expand All @@ -323,7 +323,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: constants.CurrentKubernetesVersion.WithPatch(1).String(),
KubeadmVersion: constants.CurrentKubernetesVersion.WithPatch(1).String(),
DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.3.1",
DNSVersion: "1.5.0",
EtcdVersion: getEtcdVersion(constants.CurrentKubernetesVersion),
},
},
Expand Down Expand Up @@ -382,7 +382,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: constants.CurrentKubernetesVersion.WithPreRelease("alpha.2").String(),
KubeadmVersion: constants.CurrentKubernetesVersion.WithPreRelease("alpha.2").String(),
DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.3.1",
DNSVersion: "1.5.0",
EtcdVersion: getEtcdVersion(constants.CurrentKubernetesVersion),
},
},
Expand Down Expand Up @@ -422,7 +422,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: constants.CurrentKubernetesVersion.WithPreRelease("alpha.2").String(),
KubeadmVersion: constants.CurrentKubernetesVersion.WithPreRelease("alpha.2").String(),
DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.3.1",
DNSVersion: "1.5.0",
EtcdVersion: getEtcdVersion(constants.CurrentKubernetesVersion),
},
},
Expand Down Expand Up @@ -463,7 +463,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: "v1.13.0-beta.1",
KubeadmVersion: "v1.13.0-beta.1",
DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.3.1",
DNSVersion: "1.5.0",
EtcdVersion: "3.2.24",
},
},
Expand Down Expand Up @@ -504,7 +504,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: "v1.13.0-rc.1",
KubeadmVersion: "v1.13.0-rc.1",
DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.3.1",
DNSVersion: "1.5.0",
EtcdVersion: "3.2.24",
},
},
Expand Down Expand Up @@ -545,7 +545,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: "v1.13.6-rc.1",
KubeadmVersion: "v1.13.6-rc.1",
DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.3.1",
DNSVersion: "1.5.0",
EtcdVersion: "3.2.24",
},
},
Expand Down Expand Up @@ -586,7 +586,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: "v1.13.0-rc.1",
KubeadmVersion: "v1.13.0-rc.1",
DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.3.1",
DNSVersion: "1.5.0",
EtcdVersion: "3.2.24",
},
},
Expand All @@ -606,7 +606,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: "v1.12.0-alpha.2",
KubeadmVersion: "v1.12.0-alpha.2",
DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.3.1",
DNSVersion: "1.5.0",
EtcdVersion: "3.2.24",
},
},
Expand Down Expand Up @@ -659,7 +659,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: constants.CurrentKubernetesVersion.WithPatch(1).String(),
KubeadmVersion: constants.CurrentKubernetesVersion.WithPatch(1).String(),
DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.3.1",
DNSVersion: "1.5.0",
EtcdVersion: getEtcdVersion(constants.CurrentKubernetesVersion),
},
},
Expand Down Expand Up @@ -696,7 +696,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: constants.CurrentKubernetesVersion.String(),
KubeadmVersion: constants.CurrentKubernetesVersion.String(),
DNSType: kubeadmapi.CoreDNS,
DNSVersion: "1.3.1",
DNSVersion: "1.5.0",
EtcdVersion: getEtcdVersion(constants.CurrentKubernetesVersion),
},
},
Expand Down