fix(platform): add need set coredns check (#1606)

Author: leoryu

Diff for: pkg/platform/provider/baremetal/cluster/kubeadm.go

@@ -189,7 +189,7 @@ func (p *Provider) getClusterConfiguration(c *v1.Cluster) *kubeadmv1beta2.Cluste
 			"IPv6DualStack": c.Cluster.Spec.Features.IPv6DualStack},
 	}
 
-	if !p.coreDNSNeedUpgrade(c.Spec.Version) {
+	if p.needSetCoreDNS(c.Spec.Version) {
 		config.DNS.ImageTag = images.Get().CoreDNS.Tag
 	}
 
@@ -201,9 +201,9 @@ func (p *Provider) getClusterConfiguration(c *v1.Cluster) *kubeadmv1beta2.Cluste
 	return config
 }
 
-func (Provider) coreDNSNeedUpgrade(k8sVersion string) bool {
-	return version.Compare(k8sVersion, constants.NeedUpgradeCoreDNSLowerK8sVersion) >= 0 &&
-		version.Compare(k8sVersion, constants.NeedUpgradeCoreDNSUpperK8sVersion) < 0
+func (Provider) needSetCoreDNS(k8sVersion string) bool {
+	return version.Compare(k8sVersion, constants.NeedUpgradeCoreDNSLowerK8sVersion) < 0 ||
+		version.Compare(k8sVersion, constants.NeedUpgradeCoreDNSUpperK8sVersion) >= 0
 }
 
 func (p *Provider) getKubeProxyConfiguration(c *v1.Cluster) *kubeproxyv1alpha1.KubeProxyConfiguration {

Diff for: pkg/platform/provider/baremetal/cluster/kubeadm_test.go

@@ -36,35 +36,35 @@ func TestProvider_coreDNSNeedUpgrade(t *testing.T) {
 			args{
 				k8sVersion: "1.18.4",
 			},
-			false,
+			true,
 		},
 		{
 			"Test k8s 1.19",
 			args{
 				k8sVersion: "1.19.7",
 			},
-			true,
+			false,
 		},
 		{
 			"Test k8s 1.20",
 			args{
 				k8sVersion: "1.20.4-tke.1",
 			},
-			true,
+			false,
 		},
 		{
 			"Test k8s 1.21",
 			args{
 				k8sVersion: "1.21.4-tke.1",
 			},
-			false,
+			true,
 		},
 		// TODO: Add test cases.
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			p := Provider{}
-			if got := p.coreDNSNeedUpgrade(tt.args.k8sVersion); got != tt.want {
+			if got := p.needSetCoreDNS(tt.args.k8sVersion); got != tt.want {
 				t.Errorf("Provider.coreDNSNeedUpgrade() = %v, want %v", got, tt.want)
 			}
 		})

Diff for: pkg/platform/provider/baremetal/cluster/update.go

@@ -147,11 +147,7 @@ func (p *Provider) EnsurePreClusterUpgradeHook(ctx context.Context, c *v1.Cluste
 
 func (p *Provider) EnsureUpgradeCoreDNS(ctx context.Context, c *v1.Cluster) error {
 	logger := log.FromContext(ctx).WithName("Upgrade coreDNS")
-	if p.coreDNSNeedUpgrade(c.Status.Version) {
-		logger.Infof("Current k8s version is %s, skip upgrade coreDNS", c.Spec.Version)
-		return nil
-	}
-	if p.coreDNSNeedUpgrade(c.Spec.Version) {
+	if p.needSetCoreDNS(c.Spec.Version) {
 		client, err := c.Clientset()
 		if err != nil {
 			return errors.Wrap(err, "unable to update coreDNS version")