mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-26 05:03:09 +00:00
prep for 1.12
This commit is contained in:
parent
965df07447
commit
989f6667d2
@ -66,7 +66,9 @@ data:
|
|||||||
prometheus :9153
|
prometheus :9153
|
||||||
proxy . /etc/resolv.conf
|
proxy . /etc/resolv.conf
|
||||||
cache 30
|
cache 30
|
||||||
|
loop
|
||||||
reload
|
reload
|
||||||
|
loadbalance
|
||||||
}
|
}
|
||||||
---
|
---
|
||||||
apiVersion: extensions/v1beta1
|
apiVersion: extensions/v1beta1
|
||||||
@ -106,7 +108,7 @@ spec:
|
|||||||
operator: "Exists"
|
operator: "Exists"
|
||||||
containers:
|
containers:
|
||||||
- name: coredns
|
- name: coredns
|
||||||
image: k8s.gcr.io/coredns:1.1.3
|
image: k8s.gcr.io/coredns:1.2.2
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
|
@ -66,7 +66,9 @@ data:
|
|||||||
prometheus :9153
|
prometheus :9153
|
||||||
proxy . /etc/resolv.conf
|
proxy . /etc/resolv.conf
|
||||||
cache 30
|
cache 30
|
||||||
|
loop
|
||||||
reload
|
reload
|
||||||
|
loadbalance
|
||||||
}
|
}
|
||||||
---
|
---
|
||||||
apiVersion: extensions/v1beta1
|
apiVersion: extensions/v1beta1
|
||||||
@ -106,7 +108,7 @@ spec:
|
|||||||
operator: "Exists"
|
operator: "Exists"
|
||||||
containers:
|
containers:
|
||||||
- name: coredns
|
- name: coredns
|
||||||
image: k8s.gcr.io/coredns:1.1.3
|
image: k8s.gcr.io/coredns:1.2.2
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
|
@ -66,7 +66,9 @@ data:
|
|||||||
prometheus :9153
|
prometheus :9153
|
||||||
proxy . /etc/resolv.conf
|
proxy . /etc/resolv.conf
|
||||||
cache 30
|
cache 30
|
||||||
|
loop
|
||||||
reload
|
reload
|
||||||
|
loadbalance
|
||||||
}
|
}
|
||||||
---
|
---
|
||||||
apiVersion: extensions/v1beta1
|
apiVersion: extensions/v1beta1
|
||||||
@ -106,7 +108,7 @@ spec:
|
|||||||
operator: "Exists"
|
operator: "Exists"
|
||||||
containers:
|
containers:
|
||||||
- name: coredns
|
- name: coredns
|
||||||
image: k8s.gcr.io/coredns:1.1.3
|
image: k8s.gcr.io/coredns:1.2.2
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
|
@ -289,7 +289,7 @@ const (
|
|||||||
KubeDNSVersion = "1.14.10"
|
KubeDNSVersion = "1.14.10"
|
||||||
|
|
||||||
// CoreDNSVersion is the version of CoreDNS to be deployed if it is used
|
// CoreDNSVersion is the version of CoreDNS to be deployed if it is used
|
||||||
CoreDNSVersion = "1.1.3"
|
CoreDNSVersion = "1.2.2"
|
||||||
|
|
||||||
// ClusterConfigurationKind is the string kind value for the ClusterConfiguration struct
|
// ClusterConfigurationKind is the string kind value for the ClusterConfiguration struct
|
||||||
ClusterConfigurationKind = "ClusterConfiguration"
|
ClusterConfigurationKind = "ClusterConfiguration"
|
||||||
|
@ -310,6 +310,7 @@ func translateStubDomainOfKubeDNSToProxyCoreDNS(dataField string, kubeDNSConfigM
|
|||||||
pStanza["body"] = [][]string{
|
pStanza["body"] = [][]string{
|
||||||
{"errors"},
|
{"errors"},
|
||||||
{"cache", "30"},
|
{"cache", "30"},
|
||||||
|
{"loop"},
|
||||||
append([]string{"proxy", "."}, proxyIP...),
|
append([]string{"proxy", "."}, proxyIP...),
|
||||||
}
|
}
|
||||||
proxyStanza = append(proxyStanza, pStanza)
|
proxyStanza = append(proxyStanza, pStanza)
|
||||||
|
@ -204,24 +204,28 @@ func TestTranslateStubDomainKubeDNSToCoreDNS(t *testing.T) {
|
|||||||
foo.com:53 {
|
foo.com:53 {
|
||||||
errors
|
errors
|
||||||
cache 30
|
cache 30
|
||||||
|
loop
|
||||||
proxy . 1.2.3.4:5300 3.3.3.3
|
proxy . 1.2.3.4:5300 3.3.3.3
|
||||||
}
|
}
|
||||||
|
|
||||||
my.cluster.local:53 {
|
my.cluster.local:53 {
|
||||||
errors
|
errors
|
||||||
cache 30
|
cache 30
|
||||||
|
loop
|
||||||
proxy . 2.3.4.5
|
proxy . 2.3.4.5
|
||||||
}`,
|
}`,
|
||||||
expectTwo: `
|
expectTwo: `
|
||||||
my.cluster.local:53 {
|
my.cluster.local:53 {
|
||||||
errors
|
errors
|
||||||
cache 30
|
cache 30
|
||||||
|
loop
|
||||||
proxy . 2.3.4.5
|
proxy . 2.3.4.5
|
||||||
}
|
}
|
||||||
|
|
||||||
foo.com:53 {
|
foo.com:53 {
|
||||||
errors
|
errors
|
||||||
cache 30
|
cache 30
|
||||||
|
loop
|
||||||
proxy . 1.2.3.4:5300 3.3.3.3
|
proxy . 1.2.3.4:5300 3.3.3.3
|
||||||
}`,
|
}`,
|
||||||
},
|
},
|
||||||
@ -251,24 +255,28 @@ func TestTranslateStubDomainKubeDNSToCoreDNS(t *testing.T) {
|
|||||||
foo.com:53 {
|
foo.com:53 {
|
||||||
errors
|
errors
|
||||||
cache 30
|
cache 30
|
||||||
|
loop
|
||||||
proxy . 1.2.3.4:5300
|
proxy . 1.2.3.4:5300
|
||||||
}
|
}
|
||||||
|
|
||||||
my.cluster.local:53 {
|
my.cluster.local:53 {
|
||||||
errors
|
errors
|
||||||
cache 30
|
cache 30
|
||||||
|
loop
|
||||||
proxy . 2.3.4.5
|
proxy . 2.3.4.5
|
||||||
}`,
|
}`,
|
||||||
expectTwo: `
|
expectTwo: `
|
||||||
my.cluster.local:53 {
|
my.cluster.local:53 {
|
||||||
errors
|
errors
|
||||||
cache 30
|
cache 30
|
||||||
|
loop
|
||||||
proxy . 2.3.4.5
|
proxy . 2.3.4.5
|
||||||
}
|
}
|
||||||
|
|
||||||
foo.com:53 {
|
foo.com:53 {
|
||||||
errors
|
errors
|
||||||
cache 30
|
cache 30
|
||||||
|
loop
|
||||||
proxy . 1.2.3.4:5300
|
proxy . 1.2.3.4:5300
|
||||||
}`,
|
}`,
|
||||||
},
|
},
|
||||||
|
@ -311,7 +311,9 @@ data:
|
|||||||
prometheus :9153
|
prometheus :9153
|
||||||
proxy . {{ .UpstreamNameserver }}
|
proxy . {{ .UpstreamNameserver }}
|
||||||
cache 30
|
cache 30
|
||||||
|
loop
|
||||||
reload
|
reload
|
||||||
|
loadbalance
|
||||||
}{{ .StubDomain }}
|
}{{ .StubDomain }}
|
||||||
`
|
`
|
||||||
// CoreDNSClusterRole is the CoreDNS ClusterRole manifest
|
// CoreDNSClusterRole is the CoreDNS ClusterRole manifest
|
||||||
|
@ -168,7 +168,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
|||||||
KubeVersion: "v1.10.3",
|
KubeVersion: "v1.10.3",
|
||||||
KubeadmVersion: "v1.10.3",
|
KubeadmVersion: "v1.10.3",
|
||||||
DNSType: "coredns",
|
DNSType: "coredns",
|
||||||
DNSVersion: "1.1.3",
|
DNSVersion: "1.2.2",
|
||||||
EtcdVersion: "3.1.12",
|
EtcdVersion: "3.1.12",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -207,7 +207,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
|||||||
KubeVersion: "v1.10.3",
|
KubeVersion: "v1.10.3",
|
||||||
KubeadmVersion: "v1.10.3",
|
KubeadmVersion: "v1.10.3",
|
||||||
DNSType: "coredns",
|
DNSType: "coredns",
|
||||||
DNSVersion: "1.1.3",
|
DNSVersion: "1.2.2",
|
||||||
EtcdVersion: "3.1.12",
|
EtcdVersion: "3.1.12",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -246,7 +246,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
|||||||
KubeVersion: "v1.11.0",
|
KubeVersion: "v1.11.0",
|
||||||
KubeadmVersion: "v1.11.0",
|
KubeadmVersion: "v1.11.0",
|
||||||
DNSType: "coredns",
|
DNSType: "coredns",
|
||||||
DNSVersion: "1.1.3",
|
DNSVersion: "1.2.2",
|
||||||
EtcdVersion: "3.2.18",
|
EtcdVersion: "3.2.18",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -285,7 +285,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
|||||||
KubeVersion: "v1.10.5",
|
KubeVersion: "v1.10.5",
|
||||||
KubeadmVersion: "v1.10.5", // Note: The kubeadm version mustn't be "downgraded" here
|
KubeadmVersion: "v1.10.5", // Note: The kubeadm version mustn't be "downgraded" here
|
||||||
DNSType: "coredns",
|
DNSType: "coredns",
|
||||||
DNSVersion: "1.1.3",
|
DNSVersion: "1.2.2",
|
||||||
EtcdVersion: "3.1.12",
|
EtcdVersion: "3.1.12",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -305,7 +305,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
|||||||
KubeVersion: "v1.11.1",
|
KubeVersion: "v1.11.1",
|
||||||
KubeadmVersion: "v1.11.1",
|
KubeadmVersion: "v1.11.1",
|
||||||
DNSType: "coredns",
|
DNSType: "coredns",
|
||||||
DNSVersion: "1.1.3",
|
DNSVersion: "1.2.2",
|
||||||
EtcdVersion: "3.2.18",
|
EtcdVersion: "3.2.18",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -364,7 +364,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
|||||||
KubeVersion: "v1.11.0-alpha.2",
|
KubeVersion: "v1.11.0-alpha.2",
|
||||||
KubeadmVersion: "v1.11.0-alpha.2",
|
KubeadmVersion: "v1.11.0-alpha.2",
|
||||||
DNSType: "coredns",
|
DNSType: "coredns",
|
||||||
DNSVersion: "1.1.3",
|
DNSVersion: "1.2.2",
|
||||||
EtcdVersion: "3.2.18",
|
EtcdVersion: "3.2.18",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -404,7 +404,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
|||||||
KubeVersion: "v1.11.0-alpha.2",
|
KubeVersion: "v1.11.0-alpha.2",
|
||||||
KubeadmVersion: "v1.11.0-alpha.2",
|
KubeadmVersion: "v1.11.0-alpha.2",
|
||||||
DNSType: "coredns",
|
DNSType: "coredns",
|
||||||
DNSVersion: "1.1.3",
|
DNSVersion: "1.2.2",
|
||||||
EtcdVersion: "3.2.18",
|
EtcdVersion: "3.2.18",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -445,7 +445,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
|||||||
KubeVersion: "v1.11.0-beta.1",
|
KubeVersion: "v1.11.0-beta.1",
|
||||||
KubeadmVersion: "v1.11.0-beta.1",
|
KubeadmVersion: "v1.11.0-beta.1",
|
||||||
DNSType: "coredns",
|
DNSType: "coredns",
|
||||||
DNSVersion: "1.1.3",
|
DNSVersion: "1.2.2",
|
||||||
EtcdVersion: "3.2.18",
|
EtcdVersion: "3.2.18",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -486,7 +486,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
|||||||
KubeVersion: "v1.11.0-rc.1",
|
KubeVersion: "v1.11.0-rc.1",
|
||||||
KubeadmVersion: "v1.11.0-rc.1",
|
KubeadmVersion: "v1.11.0-rc.1",
|
||||||
DNSType: "coredns",
|
DNSType: "coredns",
|
||||||
DNSVersion: "1.1.3",
|
DNSVersion: "1.2.2",
|
||||||
EtcdVersion: "3.2.18",
|
EtcdVersion: "3.2.18",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -527,7 +527,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
|||||||
KubeVersion: "v1.11.6-rc.1",
|
KubeVersion: "v1.11.6-rc.1",
|
||||||
KubeadmVersion: "v1.11.6-rc.1",
|
KubeadmVersion: "v1.11.6-rc.1",
|
||||||
DNSType: "coredns",
|
DNSType: "coredns",
|
||||||
DNSVersion: "1.1.3",
|
DNSVersion: "1.2.2",
|
||||||
EtcdVersion: "3.2.18",
|
EtcdVersion: "3.2.18",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -568,7 +568,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
|||||||
KubeVersion: "v1.11.0-rc.1",
|
KubeVersion: "v1.11.0-rc.1",
|
||||||
KubeadmVersion: "v1.11.0-rc.1",
|
KubeadmVersion: "v1.11.0-rc.1",
|
||||||
DNSType: "coredns",
|
DNSType: "coredns",
|
||||||
DNSVersion: "1.1.3",
|
DNSVersion: "1.2.2",
|
||||||
EtcdVersion: "3.2.18",
|
EtcdVersion: "3.2.18",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -588,7 +588,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
|||||||
KubeVersion: "v1.12.0-alpha.2",
|
KubeVersion: "v1.12.0-alpha.2",
|
||||||
KubeadmVersion: "v1.12.0-alpha.2",
|
KubeadmVersion: "v1.12.0-alpha.2",
|
||||||
DNSType: "coredns",
|
DNSType: "coredns",
|
||||||
DNSVersion: "1.1.3",
|
DNSVersion: "1.2.2",
|
||||||
EtcdVersion: "3.2.18",
|
EtcdVersion: "3.2.18",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -641,7 +641,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
|||||||
KubeVersion: "v1.12.1",
|
KubeVersion: "v1.12.1",
|
||||||
KubeadmVersion: "v1.12.1",
|
KubeadmVersion: "v1.12.1",
|
||||||
DNSType: "coredns",
|
DNSType: "coredns",
|
||||||
DNSVersion: "1.1.3",
|
DNSVersion: "1.2.2",
|
||||||
EtcdVersion: "3.2.18",
|
EtcdVersion: "3.2.18",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -678,7 +678,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
|
|||||||
KubeVersion: "v1.12.0",
|
KubeVersion: "v1.12.0",
|
||||||
KubeadmVersion: "v1.12.0",
|
KubeadmVersion: "v1.12.0",
|
||||||
DNSType: "coredns",
|
DNSType: "coredns",
|
||||||
DNSVersion: "1.1.3",
|
DNSVersion: "1.2.2",
|
||||||
EtcdVersion: "3.2.18",
|
EtcdVersion: "3.2.18",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user