Fix: (#2084)

1. get container runtime should consider ClusterFile;
2. sealer clusterfile configmap name wrong.

Signed-off-by: huaiyou <[email protected]>

Author: VinceCui

cmd/sealer/cmd/cluster/delete.go

@@ -191,7 +191,7 @@ func deleteCluster(workClusterfile string, forceDelete bool) error {
 	}
 
 	installer, err := clusterruntime.NewInstaller(infraDriver, *runtimeConfig,
-		clusterruntime.GetClusterInstallInfo(imageSpec.ImageExtension.Labels))
+		clusterruntime.GetClusterInstallInfo(imageSpec.ImageExtension.Labels, cluster.Spec.ContainerRuntime))
 	if err != nil {
 		return err
 	}
@@ -327,7 +327,7 @@ func scaleDownCluster(masters, workers string, forceDelete bool) error {
 	}
 
 	installer, err := clusterruntime.NewInstaller(infraDriver, *runtimeConfig,
-		clusterruntime.GetClusterInstallInfo(imageSpec.ImageExtension.Labels))
+		clusterruntime.GetClusterInstallInfo(imageSpec.ImageExtension.Labels, cluster.Spec.ContainerRuntime))
 	if err != nil {
 		return err
 	}

cmd/sealer/cmd/cluster/run.go

@@ -296,7 +296,7 @@ func runClusterImage(imageEngine imageengine.Interface, cf clusterfile.Interface
 		runtimeConfig.KubeadmConfig = *cf.GetKubeadmConfig()
 	}
 
-	installer, err := clusterruntime.NewInstaller(infraDriver, *runtimeConfig, clusterruntime.GetClusterInstallInfo(imageSpec.ImageExtension.Labels))
+	installer, err := clusterruntime.NewInstaller(infraDriver, *runtimeConfig, clusterruntime.GetClusterInstallInfo(imageSpec.ImageExtension.Labels, cluster.Spec.ContainerRuntime))
 	if err != nil {
 		return err
 	}

cmd/sealer/cmd/cluster/scale-up.go

@@ -173,7 +173,7 @@ func scaleUpCluster(clusterImageName string, scaleUpMasterIPList, scaleUpNodeIPL
 	}
 
 	installer, err := clusterruntime.NewInstaller(infraDriver, *runtimeConfig,
-		clusterruntime.GetClusterInstallInfo(imageSpec.ImageExtension.Labels))
+		clusterruntime.GetClusterInstallInfo(imageSpec.ImageExtension.Labels, runtimeConfig.ContainerRuntimeConfig))
 	if err != nil {
 		return err
 	}

cmd/sealer/cmd/cluster/upgrade.go

@@ -168,7 +168,7 @@ func upgradeCluster(imageEngine imageengine.Interface, imageSpec *imagev1.ImageS
 		ContainerRuntimeConfig: cluster.Spec.ContainerRuntime,
 	}
 
-	upgrader, err := clusterruntime.NewInstaller(infraDriver, *runtimeConfig, clusterruntime.GetClusterInstallInfo(imageSpec.ImageExtension.Labels))
+	upgrader, err := clusterruntime.NewInstaller(infraDriver, *runtimeConfig, clusterruntime.GetClusterInstallInfo(imageSpec.ImageExtension.Labels, runtimeConfig.ContainerRuntimeConfig))
 	if err != nil {
 		return err
 	}

pkg/cluster-runtime/installer.go

@@ -386,12 +386,15 @@ func (i *Installer) setNodeTaints(hosts []net.IP, driver runtime.Driver) error {
 	return nil
 }
 
-func GetClusterInstallInfo(labels map[string]string) InstallInfo {
-	cri := labels[CRILabel]
+func GetClusterInstallInfo(imageLabels map[string]string, criConfig v2.ContainerRuntimeConfig) InstallInfo {
+	cri := imageLabels[CRILabel]
 	if cri == "" {
 		cri = common.Docker
 	}
-	clusterRuntimeType := labels[CRTLabel]
+	if criConfig.Type != "" {
+		cri = criConfig.Type
+	}
+	clusterRuntimeType := imageLabels[CRTLabel]
 	if clusterRuntimeType == "" {
 		clusterRuntimeType = common.K8s
 	}

pkg/clusterfile/clusterfile.go

@@ -228,7 +228,7 @@ func GetActualClusterFile() (Interface, bool, error) {
 	// assume that we already have an existed cluster
 	fromCluster, err := getClusterfileFromCluster()
 	if err != nil {
-		logrus.Warn("try to get clusterfile from cluster", err)
+		logrus.Warn("try to get clusterfile from cluster: ", err)
 	}
 
 	if fromCluster != nil {
@@ -255,12 +255,12 @@ func getClusterfileFromCluster() (*ClusterFile, error) {
 		return nil, err
 	}
 
-	cm, err := cli.ConfigMap(ClusterfileConfigMapNamespace).Get(context.TODO(), ClusterfileConfigMapDataName, metav1.GetOptions{})
+	cm, err := cli.ConfigMap(ClusterfileConfigMapNamespace).Get(context.TODO(), ClusterfileConfigMapName, metav1.GetOptions{})
 	if err != nil {
 		return nil, err
 	}
 
-	data := cm.Data[ClusterfileConfigMapName]
+	data := cm.Data[ClusterfileConfigMapDataName]
 	if len(data) > 0 {
 		err = decodeClusterFile(bytes.NewReader([]byte(data)), clusterFile)
 		if err != nil {