From 188193e1c0b529fa60039b72137e4a5d6bece6cd Mon Sep 17 00:00:00 2001
From: pacoxu <paco.xu@daocloud.io>
Date: Tue, 15 Jun 2021 11:54:33 +0800
Subject: [PATCH] kubeadm: upgrade coredns 1.8.4 and corefile-migration to
 v1.0.12

Signed-off-by: pacoxu <paco.xu@daocloud.io>
---
 build/dependencies.yaml                | 2 +-
 cmd/kubeadm/app/constants/constants.go | 2 +-
 cmd/kubeadm/app/images/images_test.go  | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/dependencies.yaml b/build/dependencies.yaml
index d11afbb7a7c..b422923f2b7 100644
--- a/build/dependencies.yaml
+++ b/build/dependencies.yaml
@@ -55,7 +55,7 @@ dependencies:
       match: k8s.gcr.io/coredns
 
   - name: "coredns-kubeadm"
-    version: 1.8.0
+    version: 1.8.4
     refPaths:
     - path: cmd/kubeadm/app/constants/constants.go
       match: CoreDNSVersion =
diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go
index 61922b4a9b0..e3a834ab37f 100644
--- a/cmd/kubeadm/app/constants/constants.go
+++ b/cmd/kubeadm/app/constants/constants.go
@@ -325,7 +325,7 @@ const (
 	CoreDNSImageName = "coredns"
 
 	// CoreDNSVersion is the version of CoreDNS to be deployed if it is used
-	CoreDNSVersion = "v1.8.0"
+	CoreDNSVersion = "v1.8.4"
 
 	// ClusterConfigurationKind is the string kind value for the ClusterConfiguration struct
 	ClusterConfigurationKind = "ClusterConfiguration"
diff --git a/cmd/kubeadm/app/images/images_test.go b/cmd/kubeadm/app/images/images_test.go
index e879c8f5603..2fd9d3f53a2 100644
--- a/cmd/kubeadm/app/images/images_test.go
+++ b/cmd/kubeadm/app/images/images_test.go
@@ -233,7 +233,7 @@ func TestGetDNSImage(t *testing.T) {
 		cfg      *kubeadmapi.ClusterConfiguration
 	}{
 		{
-			expected: "foo.io/coredns:v1.8.0",
+			expected: "foo.io/coredns:v1.8.4",
 			cfg: &kubeadmapi.ClusterConfiguration{
 				ImageRepository: "foo.io",
 				DNS: kubeadmapi.DNS{
@@ -242,7 +242,7 @@ func TestGetDNSImage(t *testing.T) {
 			},
 		},
 		{
-			expected: kubeadmapiv1beta2.DefaultImageRepository + "/coredns/coredns:v1.8.0",
+			expected: kubeadmapiv1beta2.DefaultImageRepository + "/coredns/coredns:v1.8.4",
 			cfg: &kubeadmapi.ClusterConfiguration{
 				ImageRepository: kubeadmapiv1beta2.DefaultImageRepository,
 				DNS: kubeadmapi.DNS{
@@ -251,7 +251,7 @@ func TestGetDNSImage(t *testing.T) {
 			},
 		},
 		{
-			expected: "foo.io/coredns/coredns:v1.8.0",
+			expected: "foo.io/coredns/coredns:v1.8.4",
 			cfg: &kubeadmapi.ClusterConfiguration{
 				ImageRepository: "foo.io",
 				DNS: kubeadmapi.DNS{