fix(installer): fix isntall ceph rbd provisioner (#1853)

tkestack · Apr 21, 2022 · 8f4c7c5 · 8f4c7c5
1 parent e17fbff
commit 8f4c7c5
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/cmd/tke-installer/app/installer/application.go b/cmd/tke-installer/app/installer/application.go
@@ -280,7 +280,7 @@ func (t *TKE) preprocessPlatformApps(ctx context.Context) error {
 					"plugin":    images.Get().CephCsi.FullName(),
 				},
 				"provisioner": map[string]interface{}{
-					"provisioner": images.Get().CsiNodeDriverRegistrar.FullName(),
+					"provisioner": images.Get().CsiProvisioner.FullName(),
 					"attacher":    images.Get().CsiAttacher.FullName(),
 					"resizer":     images.Get().CsiResizer.FullName(),
 					"snapshotter": images.Get().CsiSnapshotter.FullName(),
@@ -289,9 +289,11 @@ func (t *TKE) preprocessPlatformApps(ctx context.Context) error {
 			if values["storageClass"] == nil {
 				values["storageClass"] = map[string]interface{}{
 					"replicaCount": t.Config.Replicas,
+					"name":         constants.CephRBDStorageClassName,
 				}
 			} else {
 				values["storageClass"].(map[string]interface{})["replicaCount"] = t.Config.Replicas
+				values["storageClass"].(map[string]interface{})["name"] = constants.CephRBDStorageClassName
 			}
 			values["namespace"] = platformApp.HelmInstallOptions.Namespace
 		}
@@ -366,7 +368,7 @@ func (t *TKE) installPlatformApp(ctx context.Context, platformApp *types.Platfor
 	}
 	// TODO currently only support local chart install
 	if len(platformApp.LocalChartPath) != 0 {
-		t.log.Infof("Start instal platform app %s in %s namespace", platformApp.HelmInstallOptions.ReleaseName, platformApp.HelmInstallOptions.Namespace)
+		t.log.Infof("Start install platform app %s in %s namespace", platformApp.HelmInstallOptions.ReleaseName, platformApp.HelmInstallOptions.Namespace)
 		if _, err := t.helmClient.InstallWithLocal(platformApp.HelmInstallOptions, platformApp.LocalChartPath); err != nil {
 			uninstallOptions := helmaction.UninstallOptions{
 				Timeout:     10 * time.Minute,
@@ -379,7 +381,7 @@ func (t *TKE) installPlatformApp(ctx context.Context, platformApp *types.Platfor
 			}
 			return err
 		}
-		t.log.Infof("End instal platform app %s in %s namespace", platformApp.HelmInstallOptions.ReleaseName, platformApp.HelmInstallOptions.Namespace)
+		t.log.Infof("End install platform app %s in %s namespace", platformApp.HelmInstallOptions.ReleaseName, platformApp.HelmInstallOptions.Namespace)
 	}
 	if platformApp.ConditionFunc != nil {
 		err := wait.PollImmediate(5*time.Second, 10*time.Minute, platformApp.ConditionFunc)