Read config variable from management cluster and set it into cleanup …

…cluster
vmware-tanzu · Sep 22, 2022 · ac80da0 · ac80da0
1 parent 43a5968
commit ac80da0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/tkg/client/delete_region.go b/tkg/client/delete_region.go
@@ -152,6 +152,15 @@ func (c *TkgClient) DeleteRegion(options DeleteRegionOptions) error { //nolint:f
 
 		// If clusterclass feature flag is enabled then deploy management components
 		if config.IsFeatureActivated(config.FeatureFlagPackageBasedLCM) {
+			// Read config variable from management cluster and set it into cleanup cluster
+			configValues, err := c.getUserConfigVariableValueMapFromSecret(regionContext.SourceFilePath, regionContext.ContextName)
+			if err != nil {
+				return errors.Wrap(err, "unable to get config variables from management cluster")
+			}
+			for k, v := range configValues {
+				// Handle bool, int and string
+				c.TKGConfigReaderWriter().Set(k, fmt.Sprint(v))
+			}
 			if err = c.InstallOrUpgradeManagementComponents(cleanupClusterKubeconfigPath, "", false); err != nil {
 				return errors.Wrap(err, "unable to install management components to bootstrap cluster")
 			}

diff --git a/tkg/client/management_components.go b/tkg/client/management_components.go
@@ -106,7 +106,7 @@ func (c *TkgClient) getTKGPackageConfigValuesFile(managementPackageVersion, kube
 	var err error
 
 	if upgrade {
-		userProviderConfigValues, err = c.getUserConfigVariableValueMapForUpgrade(kubeconfig, kubecontext)
+		userProviderConfigValues, err = c.getUserConfigVariableValueMapFromSecret(kubeconfig, kubecontext)
 	} else {
 		userProviderConfigValues, err = c.getUserConfigVariableValueMap()
 	}
@@ -137,7 +137,7 @@ func (c *TkgClient) getUserConfigVariableValueMap() (map[string]interface{}, err
 	return c.GetUserConfigVariableValueMap(path, c.TKGConfigReaderWriter())
 }
 
-func (c *TkgClient) getUserConfigVariableValueMapForUpgrade(kubeconfig, kubecontext string) (map[string]interface{}, error) {
+func (c *TkgClient) getUserConfigVariableValueMapFromSecret(kubeconfig, kubecontext string) (map[string]interface{}, error) {
 	clusterClient, err := clusterclient.NewClient(kubeconfig, kubecontext, clusterclient.Options{})
 	if err != nil {
 		return nil, errors.Wrap(err, "unable to get cluster client")