mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-21 01:26:28 +00:00
kubeadm: bump coredns to 1.11.3
This commit is contained in:
parent
9f9d774862
commit
322c524e71
@ -41,7 +41,7 @@ dependencies:
|
|||||||
match: registry.k8s.io/coredns
|
match: registry.k8s.io/coredns
|
||||||
|
|
||||||
- name: "coredns-kubeadm"
|
- name: "coredns-kubeadm"
|
||||||
version: 1.11.1
|
version: 1.11.3
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: cmd/kubeadm/app/constants/constants.go
|
- path: cmd/kubeadm/app/constants/constants.go
|
||||||
match: CoreDNSVersion =
|
match: CoreDNSVersion =
|
||||||
|
@ -358,7 +358,7 @@ const (
|
|||||||
CoreDNSImageName = "coredns"
|
CoreDNSImageName = "coredns"
|
||||||
|
|
||||||
// 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 = "v1.11.1"
|
CoreDNSVersion = "v1.11.3"
|
||||||
|
|
||||||
// ClusterConfigurationKind is the string kind value for the ClusterConfiguration struct
|
// ClusterConfigurationKind is the string kind value for the ClusterConfiguration struct
|
||||||
ClusterConfigurationKind = "ClusterConfiguration"
|
ClusterConfigurationKind = "ClusterConfiguration"
|
||||||
|
@ -315,21 +315,21 @@ func TestGetDNSImage(t *testing.T) {
|
|||||||
cfg *kubeadmapi.ClusterConfiguration
|
cfg *kubeadmapi.ClusterConfiguration
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
expected: "foo.io/coredns:v1.11.1",
|
expected: "foo.io/coredns:v1.11.3",
|
||||||
cfg: &kubeadmapi.ClusterConfiguration{
|
cfg: &kubeadmapi.ClusterConfiguration{
|
||||||
ImageRepository: "foo.io",
|
ImageRepository: "foo.io",
|
||||||
DNS: kubeadmapi.DNS{},
|
DNS: kubeadmapi.DNS{},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
expected: kubeadmapiv1beta3.DefaultImageRepository + "/coredns/coredns:v1.11.1",
|
expected: kubeadmapiv1beta3.DefaultImageRepository + "/coredns/coredns:v1.11.3",
|
||||||
cfg: &kubeadmapi.ClusterConfiguration{
|
cfg: &kubeadmapi.ClusterConfiguration{
|
||||||
ImageRepository: kubeadmapiv1beta3.DefaultImageRepository,
|
ImageRepository: kubeadmapiv1beta3.DefaultImageRepository,
|
||||||
DNS: kubeadmapi.DNS{},
|
DNS: kubeadmapi.DNS{},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
expected: "foo.io/coredns/coredns:v1.11.1",
|
expected: "foo.io/coredns/coredns:v1.11.3",
|
||||||
cfg: &kubeadmapi.ClusterConfiguration{
|
cfg: &kubeadmapi.ClusterConfiguration{
|
||||||
ImageRepository: "foo.io",
|
ImageRepository: "foo.io",
|
||||||
DNS: kubeadmapi.DNS{
|
DNS: kubeadmapi.DNS{
|
||||||
@ -340,12 +340,12 @@ func TestGetDNSImage(t *testing.T) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
expected: "foo.io/coredns/coredns:v1.11.1",
|
expected: "foo.io/coredns/coredns:v1.11.3",
|
||||||
cfg: &kubeadmapi.ClusterConfiguration{
|
cfg: &kubeadmapi.ClusterConfiguration{
|
||||||
ImageRepository: "foo.io/coredns",
|
ImageRepository: "foo.io/coredns",
|
||||||
DNS: kubeadmapi.DNS{
|
DNS: kubeadmapi.DNS{
|
||||||
ImageMeta: kubeadmapi.ImageMeta{
|
ImageMeta: kubeadmapi.ImageMeta{
|
||||||
ImageTag: "v1.11.1",
|
ImageTag: "v1.11.3",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -626,7 +626,7 @@ func TestCoreDNSAddon(t *testing.T) {
|
|||||||
cfg: &kubeadmapi.ClusterConfiguration{
|
cfg: &kubeadmapi.ClusterConfiguration{
|
||||||
DNS: kubeadmapi.DNS{
|
DNS: kubeadmapi.DNS{
|
||||||
ImageMeta: kubeadmapi.ImageMeta{
|
ImageMeta: kubeadmapi.ImageMeta{
|
||||||
ImageRepository: "daocloud.io",
|
ImageRepository: "foo.bar.io",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
Networking: kubeadmapi.Networking{
|
Networking: kubeadmapi.Networking{
|
||||||
@ -645,7 +645,7 @@ func TestCoreDNSAddon(t *testing.T) {
|
|||||||
cfg: &kubeadmapi.ClusterConfiguration{
|
cfg: &kubeadmapi.ClusterConfiguration{
|
||||||
DNS: kubeadmapi.DNS{
|
DNS: kubeadmapi.DNS{
|
||||||
ImageMeta: kubeadmapi.ImageMeta{
|
ImageMeta: kubeadmapi.ImageMeta{
|
||||||
ImageRepository: "daocloud.io",
|
ImageRepository: "foo.bar.io",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
Networking: kubeadmapi.Networking{
|
Networking: kubeadmapi.Networking{
|
||||||
@ -699,7 +699,7 @@ spec:
|
|||||||
kubernetes.io/os: linux
|
kubernetes.io/os: linux
|
||||||
containers:
|
containers:
|
||||||
- name: coredns
|
- name: coredns
|
||||||
image: daocloud.io/coredns:v1.11.1
|
image: foo.bar.io/coredns:v1.11.3
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
@ -892,7 +892,7 @@ func TestEnsureDNSAddon(t *testing.T) {
|
|||||||
cfg: &kubeadmapi.ClusterConfiguration{
|
cfg: &kubeadmapi.ClusterConfiguration{
|
||||||
DNS: kubeadmapi.DNS{
|
DNS: kubeadmapi.DNS{
|
||||||
ImageMeta: kubeadmapi.ImageMeta{
|
ImageMeta: kubeadmapi.ImageMeta{
|
||||||
ImageRepository: "daocloud.io",
|
ImageRepository: "foo.bar.io",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
Networking: kubeadmapi.Networking{
|
Networking: kubeadmapi.Networking{
|
||||||
@ -910,7 +910,7 @@ func TestEnsureDNSAddon(t *testing.T) {
|
|||||||
cfg: &kubeadmapi.ClusterConfiguration{
|
cfg: &kubeadmapi.ClusterConfiguration{
|
||||||
DNS: kubeadmapi.DNS{
|
DNS: kubeadmapi.DNS{
|
||||||
ImageMeta: kubeadmapi.ImageMeta{
|
ImageMeta: kubeadmapi.ImageMeta{
|
||||||
ImageRepository: "daocloud.io",
|
ImageRepository: "foo.bar.io",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
Networking: kubeadmapi.Networking{
|
Networking: kubeadmapi.Networking{
|
||||||
@ -964,7 +964,7 @@ spec:
|
|||||||
kubernetes.io/os: linux
|
kubernetes.io/os: linux
|
||||||
containers:
|
containers:
|
||||||
- name: coredns
|
- name: coredns
|
||||||
image: daocloud.io/coredns:v1.11.1
|
image: foo.bar.io/coredns:v1.11.3
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
@ -1392,13 +1392,13 @@ func TestDeployedDNSAddon(t *testing.T) {
|
|||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
name: "default",
|
name: "default",
|
||||||
image: "registry.k8s.io/coredns/coredns:v1.11.1",
|
image: "registry.k8s.io/coredns/coredns:v1.11.3",
|
||||||
wantVersion: "v1.11.1",
|
wantVersion: "v1.11.3",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "with digest",
|
name: "with digest",
|
||||||
image: "registry.k8s.io/coredns/coredns:v1.11.1@sha256:a0ead06651cf580044aeb0a0feba63591858fb2e43ade8c9dea45a6a89ae7e5e",
|
image: "registry.k8s.io/coredns/coredns:v1.11.3@sha256:a0ead06651cf580044aeb0a0feba63591858fb2e43ade8c9dea45a6a89ae7e5e",
|
||||||
wantVersion: "v1.11.1",
|
wantVersion: "v1.11.3",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "without registry",
|
name: "without registry",
|
||||||
@ -1441,7 +1441,7 @@ func TestDeployedDNSAddon(t *testing.T) {
|
|||||||
// deploymentSize is the number of deployments with `k8s-app=kube-dns` label.
|
// deploymentSize is the number of deployments with `k8s-app=kube-dns` label.
|
||||||
func newMockClientForTest(t *testing.T, replicas int32, deploymentSize int, image string) *clientsetfake.Clientset {
|
func newMockClientForTest(t *testing.T, replicas int32, deploymentSize int, image string) *clientsetfake.Clientset {
|
||||||
if image == "" {
|
if image == "" {
|
||||||
image = "registry.k8s.io/coredns/coredns:v1.11.1"
|
image = "registry.k8s.io/coredns/coredns:v1.11.3"
|
||||||
}
|
}
|
||||||
client := clientsetfake.NewSimpleClientset()
|
client := clientsetfake.NewSimpleClientset()
|
||||||
for i := 0; i < deploymentSize; i++ {
|
for i := 0; i < deploymentSize; i++ {
|
||||||
|
Loading…
Reference in New Issue
Block a user