github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #53153 from bowei/update-kube-dns-1.14.5

Browse Source 
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Update kube dns 1.14.5

```release-note
Update kube-dns to 1.14.5
```
This commit is contained in:
Kubernetes Submit Queue 2017-09-27 16:07:34 -07:00 committed by GitHub
commit acbfde3914
7 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/addons/dns/kubedns-controller.yaml.base
View File

@ -55,7 +55,7 @@ spec:
optional: true
containers:
- name: kubedns
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.4
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5
resources:
# TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in
@ -106,7 +106,7 @@ spec:
- name: kube-dns-config
mountPath: /kube-dns-config
- name: dnsmasq
image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.4
image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5
livenessProbe:
httpGet:
path: /healthcheck/dnsmasq
@ -144,7 +144,7 @@ spec:
- name: kube-dns-config
mountPath: /etc/k8s/dns/dnsmasq-nanny
- name: sidecar
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.4
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
livenessProbe:
httpGet:
path: /metrics

6
cluster/addons/dns/kubedns-controller.yaml.in
View File

@ -55,7 +55,7 @@ spec:
optional: true
containers:
- name: kubedns
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.4
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5
resources:
# TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in
@ -106,7 +106,7 @@ spec:
- name: kube-dns-config
mountPath: /kube-dns-config
- name: dnsmasq
image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.4
image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5
livenessProbe:
httpGet:
path: /healthcheck/dnsmasq
@ -144,7 +144,7 @@ spec:
- name: kube-dns-config
mountPath: /etc/k8s/dns/dnsmasq-nanny
- name: sidecar
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.4
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
livenessProbe:
httpGet:
path: /metrics

6
cluster/addons/dns/kubedns-controller.yaml.sed
View File

@ -55,7 +55,7 @@ spec:
optional: true
containers:
- name: kubedns
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.4
image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5
resources:
# TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in
@ -106,7 +106,7 @@ spec:
- name: kube-dns-config
mountPath: /kube-dns-config
- name: dnsmasq
image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.4
image: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5
livenessProbe:
httpGet:
path: /healthcheck/dnsmasq
@ -144,7 +144,7 @@ spec:
- name: kube-dns-config
mountPath: /etc/k8s/dns/dnsmasq-nanny
- name: sidecar
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.4
image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
livenessProbe:
httpGet:
path: /metrics

36
cmd/kubeadm/app/cmd/upgrade/plan_test.go
View File

@ -80,12 +80,12 @@ func TestPrintAvailableUpgrades(t *testing.T) {
"v1.7.1": 1,
},
KubeadmVersion: "v1.7.2",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
After: upgrade.ClusterState{
KubeVersion: "v1.7.3",
KubeadmVersion: "v1.7.3",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
},
},
@ -100,7 +100,7 @@ API Server v1.7.1 v1.7.3
Controller Manager v1.7.1 v1.7.3
Scheduler v1.7.1 v1.7.3
Kube Proxy v1.7.1 v1.7.3
Kube DNS 1.14.4 1.14.4
Kube DNS 1.14.5 1.14.5
You can now apply the upgrade by executing the following command:
@ -122,12 +122,12 @@ _____________________________________________________________________
"v1.7.3": 1,
},
KubeadmVersion: "v1.8.0",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
After: upgrade.ClusterState{
KubeVersion: "v1.8.0",
KubeadmVersion: "v1.8.0",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
},
},
@ -142,7 +142,7 @@ API Server v1.7.3 v1.8.0
Controller Manager v1.7.3 v1.8.0
Scheduler v1.7.3 v1.8.0
Kube Proxy v1.7.3 v1.8.0
Kube DNS 1.14.4 1.14.4
Kube DNS 1.14.5 1.14.5
You can now apply the upgrade by executing the following command:
@ -162,12 +162,12 @@ _____________________________________________________________________
"v1.7.3": 1,
},
KubeadmVersion: "v1.8.1",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
After: upgrade.ClusterState{
KubeVersion: "v1.7.5",
KubeadmVersion: "v1.8.1",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
},
{
@ -178,12 +178,12 @@ _____________________________________________________________________
"v1.7.3": 1,
},
KubeadmVersion: "v1.8.1",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
After: upgrade.ClusterState{
KubeVersion: "v1.8.2",
KubeadmVersion: "v1.8.2",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
},
},
@ -198,7 +198,7 @@ API Server v1.7.3 v1.7.5
Controller Manager v1.7.3 v1.7.5
Scheduler v1.7.3 v1.7.5
Kube Proxy v1.7.3 v1.7.5
Kube DNS 1.14.4 1.14.4
Kube DNS 1.14.5 1.14.5
You can now apply the upgrade by executing the following command:
@ -217,7 +217,7 @@ API Server v1.7.3 v1.8.2
Controller Manager v1.7.3 v1.8.2
Scheduler v1.7.3 v1.8.2
Kube Proxy v1.7.3 v1.8.2
Kube DNS 1.14.4 1.14.4
Kube DNS 1.14.5 1.14.5
You can now apply the upgrade by executing the following command:
@ -239,12 +239,12 @@ _____________________________________________________________________
"v1.7.5": 1,
},
KubeadmVersion: "v1.7.5",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
After: upgrade.ClusterState{
KubeVersion: "v1.8.0-beta.1",
KubeadmVersion: "v1.8.0-beta.1",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
},
},
@ -259,7 +259,7 @@ API Server v1.7.5 v1.8.0-beta.1
Controller Manager v1.7.5 v1.8.0-beta.1
Scheduler v1.7.5 v1.8.0-beta.1
Kube Proxy v1.7.5 v1.8.0-beta.1
Kube DNS 1.14.4 1.14.4
Kube DNS 1.14.5 1.14.5
You can now apply the upgrade by executing the following command:
@ -281,12 +281,12 @@ _____________________________________________________________________
"v1.7.5": 1,
},
KubeadmVersion: "v1.7.5",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
After: upgrade.ClusterState{
KubeVersion: "v1.8.0-rc.1",
KubeadmVersion: "v1.8.0-rc.1",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
},
},
@ -301,7 +301,7 @@ API Server v1.7.5 v1.8.0-rc.1
Controller Manager v1.7.5 v1.8.0-rc.1
Scheduler v1.7.5 v1.8.0-rc.1
Kube Proxy v1.7.5 v1.8.0-rc.1
Kube DNS 1.14.4 1.14.4
Kube DNS 1.14.5 1.14.5
You can now apply the upgrade by executing the following command:

4
cmd/kubeadm/app/phases/addons/dns/versions.go
View File

@ -21,12 +21,12 @@ import (
)
const (
kubeDNSv170AndAboveVersion = "1.14.4"
kubeDNSv170AndAboveVersion = "1.14.5"
)
// GetKubeDNSVersion returns the right kube-dns version for a specific k8s version
func GetKubeDNSVersion(kubeVersion *version.Version) string {
// v1.7.0+ uses 1.14.4, just return that here
// v1.7.0+ uses 1.14.5, just return that here
// In the future when the kube-dns version is bumped at HEAD; add conditional logic to return the right versions
// Also, the version might be bumped for different k8s releases on the same branch
return kubeDNSv170AndAboveVersion

12
cmd/kubeadm/app/phases/addons/dns/versions_test.go
View File

@ -28,27 +28,27 @@ func TestGetKubeDNSVersion(t *testing.T) {
}{
{
k8sVersion: "v1.7.0",
expected: "1.14.4",
expected: "1.14.5",
},
{
k8sVersion: "v1.7.1",
expected: "1.14.4",
expected: "1.14.5",
},
{
k8sVersion: "v1.7.2",
expected: "1.14.4",
expected: "1.14.5",
},
{
k8sVersion: "v1.7.3",
expected: "1.14.4",
expected: "1.14.5",
},
{
k8sVersion: "v1.8.0-alpha.2",
expected: "1.14.4",
expected: "1.14.5",
},
{
k8sVersion: "v1.8.0",
expected: "1.14.4",
expected: "1.14.5",
},
}
for _, rt := range tests {

44
cmd/kubeadm/app/phases/upgrade/compute_test.go
View File

@ -98,12 +98,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.1": 1,
},
KubeadmVersion: "v1.7.2",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
After: ClusterState{
KubeVersion: "v1.7.3",
KubeadmVersion: "v1.7.3",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
},
},
@ -128,12 +128,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.3": 1,
},
KubeadmVersion: "v1.8.0",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
After: ClusterState{
KubeVersion: "v1.8.0",
KubeadmVersion: "v1.8.0",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
},
},
@ -158,12 +158,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.3": 1,
},
KubeadmVersion: "v1.8.1",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
After: ClusterState{
KubeVersion: "v1.7.5",
KubeadmVersion: "v1.8.1", // Note: The kubeadm version mustn't be "downgraded" here
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
},
{
@ -174,12 +174,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.3": 1,
},
KubeadmVersion: "v1.8.1",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
After: ClusterState{
KubeVersion: "v1.8.2",
KubeadmVersion: "v1.8.2",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
},
},
@ -219,12 +219,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.5": 1,
},
KubeadmVersion: "v1.7.5",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
After: ClusterState{
KubeVersion: "v1.8.0-alpha.2",
KubeadmVersion: "v1.8.0-alpha.2",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
},
},
@ -250,12 +250,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.5": 1,
},
KubeadmVersion: "v1.7.5",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
After: ClusterState{
KubeVersion: "v1.8.0-alpha.2",
KubeadmVersion: "v1.8.0-alpha.2",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
},
},
@ -282,12 +282,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.5": 1,
},
KubeadmVersion: "v1.7.5",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
After: ClusterState{
KubeVersion: "v1.8.0-beta.1",
KubeadmVersion: "v1.8.0-beta.1",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
},
},
@ -314,12 +314,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.5": 1,
},
KubeadmVersion: "v1.7.5",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
After: ClusterState{
KubeVersion: "v1.8.0-rc.1",
KubeadmVersion: "v1.8.0-rc.1",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
},
},
@ -346,12 +346,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.5": 1,
},
KubeadmVersion: "v1.7.5",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
After: ClusterState{
KubeVersion: "v1.8.0-rc.1",
KubeadmVersion: "v1.8.0-rc.1",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
},
},
@ -378,12 +378,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.5": 1,
},
KubeadmVersion: "v1.7.5",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
After: ClusterState{
KubeVersion: "v1.8.0-rc.1",
KubeadmVersion: "v1.8.0-rc.1",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
},
{
@ -394,12 +394,12 @@ func TestGetAvailableUpgrades(t *testing.T) {
"v1.7.5": 1,
},
KubeadmVersion: "v1.7.5",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
After: ClusterState{
KubeVersion: "v1.9.0-alpha.1",
KubeadmVersion: "v1.9.0-alpha.1",
DNSVersion: "1.14.4",
DNSVersion: "1.14.5",
},
},
},