Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
aa11f6c2
Commit
aa11f6c2
authored
Jan 31, 2019
by
Sandeep Rajan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bump CoreDNS version to 1.3.1
parent
85f1205e
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
18 deletions
+18
-18
coredns.yaml.base
cluster/addons/dns/coredns/coredns.yaml.base
+1
-1
coredns.yaml.in
cluster/addons/dns/coredns/coredns.yaml.in
+1
-1
coredns.yaml.sed
cluster/addons/dns/coredns/coredns.yaml.sed
+1
-1
constants.go
cmd/kubeadm/app/constants/constants.go
+1
-1
compute_test.go
cmd/kubeadm/app/phases/upgrade/compute_test.go
+14
-14
No files found.
cluster/addons/dns/coredns/coredns.yaml.base
View file @
aa11f6c2
...
@@ -114,7 +114,7 @@ spec:
...
@@ -114,7 +114,7 @@ spec:
beta.kubernetes.io/os: linux
beta.kubernetes.io/os: linux
containers:
containers:
- name: coredns
- name: coredns
image: k8s.gcr.io/coredns:1.
2.6
image: k8s.gcr.io/coredns:1.
3.1
imagePullPolicy: IfNotPresent
imagePullPolicy: IfNotPresent
resources:
resources:
limits:
limits:
...
...
cluster/addons/dns/coredns/coredns.yaml.in
View file @
aa11f6c2
...
@@ -114,7 +114,7 @@ spec:
...
@@ -114,7 +114,7 @@ spec:
beta.kubernetes.io/os: linux
beta.kubernetes.io/os: linux
containers:
containers:
- name: coredns
- name: coredns
image: k8s.gcr.io/coredns:1.
2.6
image: k8s.gcr.io/coredns:1.
3.1
imagePullPolicy: IfNotPresent
imagePullPolicy: IfNotPresent
resources:
resources:
limits:
limits:
...
...
cluster/addons/dns/coredns/coredns.yaml.sed
View file @
aa11f6c2
...
@@ -114,7 +114,7 @@ spec:
...
@@ -114,7 +114,7 @@ spec:
bet
a
.kubernetes.io/os: linux
bet
a
.kubernetes.io/os: linux
c
ontainers:
c
ontainers:
-
na
me: coredns
-
na
me: coredns
i
mage: k8s.gcr.io/coredns:1.
2.6
i
mage: k8s.gcr.io/coredns:1.
3.1
i
magePullPolicy: IfNotPresent
i
magePullPolicy: IfNotPresent
re
s
o
urces:
re
s
o
urces:
limits:
limits:
...
...
cmd/kubeadm/app/constants/constants.go
View file @
aa11f6c2
...
@@ -332,7 +332,7 @@ const (
...
@@ -332,7 +332,7 @@ const (
KubeDNSVersion
=
"1.14.13"
KubeDNSVersion
=
"1.14.13"
// 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.
2.6
"
CoreDNSVersion
=
"1.
3.1
"
// ClusterConfigurationKind is the string kind value for the ClusterConfiguration struct
// ClusterConfigurationKind is the string kind value for the ClusterConfiguration struct
ClusterConfigurationKind
=
"ClusterConfiguration"
ClusterConfigurationKind
=
"ClusterConfiguration"
...
...
cmd/kubeadm/app/phases/upgrade/compute_test.go
View file @
aa11f6c2
...
@@ -174,7 +174,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
...
@@ -174,7 +174,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion
:
"v1.10.3"
,
KubeVersion
:
"v1.10.3"
,
KubeadmVersion
:
"v1.10.3"
,
KubeadmVersion
:
"v1.10.3"
,
DNSType
:
kubeadmapi
.
CoreDNS
,
DNSType
:
kubeadmapi
.
CoreDNS
,
DNSVersion
:
"1.
2.6
"
,
DNSVersion
:
"1.
3.1
"
,
EtcdVersion
:
"3.1.12"
,
EtcdVersion
:
"3.1.12"
,
},
},
},
},
...
@@ -213,7 +213,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
...
@@ -213,7 +213,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion
:
"v1.10.3"
,
KubeVersion
:
"v1.10.3"
,
KubeadmVersion
:
"v1.10.3"
,
KubeadmVersion
:
"v1.10.3"
,
DNSType
:
kubeadmapi
.
CoreDNS
,
DNSType
:
kubeadmapi
.
CoreDNS
,
DNSVersion
:
"1.
2.6
"
,
DNSVersion
:
"1.
3.1
"
,
EtcdVersion
:
"3.1.12"
,
EtcdVersion
:
"3.1.12"
,
},
},
},
},
...
@@ -252,7 +252,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
...
@@ -252,7 +252,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion
:
"v1.11.0"
,
KubeVersion
:
"v1.11.0"
,
KubeadmVersion
:
"v1.11.0"
,
KubeadmVersion
:
"v1.11.0"
,
DNSType
:
kubeadmapi
.
CoreDNS
,
DNSType
:
kubeadmapi
.
CoreDNS
,
DNSVersion
:
"1.
2.6
"
,
DNSVersion
:
"1.
3.1
"
,
EtcdVersion
:
"3.2.18"
,
EtcdVersion
:
"3.2.18"
,
},
},
},
},
...
@@ -291,7 +291,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
...
@@ -291,7 +291,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
:
kubeadmapi
.
CoreDNS
,
DNSType
:
kubeadmapi
.
CoreDNS
,
DNSVersion
:
"1.
2.6
"
,
DNSVersion
:
"1.
3.1
"
,
EtcdVersion
:
"3.1.12"
,
EtcdVersion
:
"3.1.12"
,
},
},
},
},
...
@@ -311,7 +311,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
...
@@ -311,7 +311,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion
:
"v1.11.1"
,
KubeVersion
:
"v1.11.1"
,
KubeadmVersion
:
"v1.11.1"
,
KubeadmVersion
:
"v1.11.1"
,
DNSType
:
kubeadmapi
.
CoreDNS
,
DNSType
:
kubeadmapi
.
CoreDNS
,
DNSVersion
:
"1.
2.6
"
,
DNSVersion
:
"1.
3.1
"
,
EtcdVersion
:
"3.2.18"
,
EtcdVersion
:
"3.2.18"
,
},
},
},
},
...
@@ -370,7 +370,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
...
@@ -370,7 +370,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
:
kubeadmapi
.
CoreDNS
,
DNSType
:
kubeadmapi
.
CoreDNS
,
DNSVersion
:
"1.
2.6
"
,
DNSVersion
:
"1.
3.1
"
,
EtcdVersion
:
"3.2.18"
,
EtcdVersion
:
"3.2.18"
,
},
},
},
},
...
@@ -410,7 +410,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
...
@@ -410,7 +410,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
:
kubeadmapi
.
CoreDNS
,
DNSType
:
kubeadmapi
.
CoreDNS
,
DNSVersion
:
"1.
2.6
"
,
DNSVersion
:
"1.
3.1
"
,
EtcdVersion
:
"3.2.18"
,
EtcdVersion
:
"3.2.18"
,
},
},
},
},
...
@@ -451,7 +451,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
...
@@ -451,7 +451,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
:
kubeadmapi
.
CoreDNS
,
DNSType
:
kubeadmapi
.
CoreDNS
,
DNSVersion
:
"1.
2.6
"
,
DNSVersion
:
"1.
3.1
"
,
EtcdVersion
:
"3.2.18"
,
EtcdVersion
:
"3.2.18"
,
},
},
},
},
...
@@ -492,7 +492,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
...
@@ -492,7 +492,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
:
kubeadmapi
.
CoreDNS
,
DNSType
:
kubeadmapi
.
CoreDNS
,
DNSVersion
:
"1.
2.6
"
,
DNSVersion
:
"1.
3.1
"
,
EtcdVersion
:
"3.2.18"
,
EtcdVersion
:
"3.2.18"
,
},
},
},
},
...
@@ -533,7 +533,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
...
@@ -533,7 +533,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
:
kubeadmapi
.
CoreDNS
,
DNSType
:
kubeadmapi
.
CoreDNS
,
DNSVersion
:
"1.
2.6
"
,
DNSVersion
:
"1.
3.1
"
,
EtcdVersion
:
"3.2.18"
,
EtcdVersion
:
"3.2.18"
,
},
},
},
},
...
@@ -574,7 +574,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
...
@@ -574,7 +574,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
:
kubeadmapi
.
CoreDNS
,
DNSType
:
kubeadmapi
.
CoreDNS
,
DNSVersion
:
"1.
2.6
"
,
DNSVersion
:
"1.
3.1
"
,
EtcdVersion
:
"3.2.18"
,
EtcdVersion
:
"3.2.18"
,
},
},
},
},
...
@@ -594,7 +594,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
...
@@ -594,7 +594,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion
:
constants
.
MinimumControlPlaneVersion
.
WithPreRelease
(
"alpha.2"
)
.
String
(),
KubeVersion
:
constants
.
MinimumControlPlaneVersion
.
WithPreRelease
(
"alpha.2"
)
.
String
(),
KubeadmVersion
:
constants
.
MinimumControlPlaneVersion
.
WithPreRelease
(
"alpha.2"
)
.
String
(),
KubeadmVersion
:
constants
.
MinimumControlPlaneVersion
.
WithPreRelease
(
"alpha.2"
)
.
String
(),
DNSType
:
kubeadmapi
.
CoreDNS
,
DNSType
:
kubeadmapi
.
CoreDNS
,
DNSVersion
:
"1.
2.6
"
,
DNSVersion
:
"1.
3.1
"
,
EtcdVersion
:
"3.2.24"
,
EtcdVersion
:
"3.2.24"
,
},
},
},
},
...
@@ -647,7 +647,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
...
@@ -647,7 +647,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion
:
constants
.
MinimumControlPlaneVersion
.
WithPatch
(
1
)
.
String
(),
KubeVersion
:
constants
.
MinimumControlPlaneVersion
.
WithPatch
(
1
)
.
String
(),
KubeadmVersion
:
constants
.
MinimumControlPlaneVersion
.
WithPatch
(
1
)
.
String
(),
KubeadmVersion
:
constants
.
MinimumControlPlaneVersion
.
WithPatch
(
1
)
.
String
(),
DNSType
:
kubeadmapi
.
CoreDNS
,
DNSType
:
kubeadmapi
.
CoreDNS
,
DNSVersion
:
"1.
2.6
"
,
DNSVersion
:
"1.
3.1
"
,
EtcdVersion
:
"3.2.24"
,
EtcdVersion
:
"3.2.24"
,
},
},
},
},
...
@@ -684,7 +684,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
...
@@ -684,7 +684,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion
:
constants
.
MinimumControlPlaneVersion
.
String
(),
KubeVersion
:
constants
.
MinimumControlPlaneVersion
.
String
(),
KubeadmVersion
:
constants
.
MinimumControlPlaneVersion
.
String
(),
KubeadmVersion
:
constants
.
MinimumControlPlaneVersion
.
String
(),
DNSType
:
kubeadmapi
.
CoreDNS
,
DNSType
:
kubeadmapi
.
CoreDNS
,
DNSVersion
:
"1.
2.6
"
,
DNSVersion
:
"1.
3.1
"
,
EtcdVersion
:
"3.2.24"
,
EtcdVersion
:
"3.2.24"
,
},
},
},
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment