Merge pull request #113 from kndpio/112-configuration-apply-error-aft…

…er-crossplane-116-release added fixed version usage on crossplane helm chart upgrade
web-seven · May 16, 2024 · 4441248 · 4441248
2 parents 8b40d8d + 441f602
commit 4441248
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/internal/configuration/apply.go b/internal/configuration/apply.go
@@ -36,11 +36,10 @@ func ApplyConfiguration(Link string, config *rest.Config, logger *log.Logger) {
 		release.Config["configuration"] = configs
 	}
 
-	err = installer.Upgrade("", release.Config)
+	err = installer.Upgrade(engine.Version, release.Config)
 	if err != nil {
 		logger.Errorf(" %v\n", err)
+	} else {
+		logger.Info("Configuration applied successfully.")
 	}
-
-	logger.Info("Configuration applied successfully.")
-
 }
diff --git a/internal/configuration/delete.go b/internal/configuration/delete.go
@@ -41,7 +41,7 @@ func DeleteConfiguration(url string, config *rest.Config, logger *log.Logger) er
 		}
 	}
 
-	err = installer.Upgrade("", release.Config)
+	err = installer.Upgrade(engine.Version, release.Config)
 	if err != nil {
 		return err
 	}

diff --git a/internal/engine/engine.go b/internal/engine/engine.go
@@ -43,6 +43,7 @@ const (
 	RepoUrl            = "https://charts.crossplane.io/stable"
 	ChartName          = "crossplane"
 	ReleaseName        = "kndp-crossplane"
+	Version            = "1.15.2"
 	kindClusterRole    = "ClusterRole"
 	providerConfigName = "kndp-kubernetes-provider-config"
 	aggregateToAdmin   = "rbac.crossplane.io/aggregate-to-admin"
@@ -104,7 +105,7 @@ func InstallEngine(ctx context.Context, configClient *rest.Config, params map[st
 		params = initParameters
 	}
 
-	err = engine.Upgrade("", params)
+	err = engine.Upgrade(Version, params)
 	if err != nil {
 		return err
 	}

diff --git a/internal/provider/install.go b/internal/provider/install.go
@@ -35,7 +35,7 @@ func InstallProvider(provider string, config *rest.Config, logger *log.Logger) e
 		release.Config["provider"] = configs
 	}
 
-	err = installer.Upgrade("", release.Config)
+	err = installer.Upgrade(engine.Version, release.Config)
 	if err != nil {
 		return err
 	}

diff --git a/internal/registry/registry.go b/internal/registry/registry.go
@@ -159,7 +159,7 @@ func (r *Registry) Create(ctx context.Context, config *rest.Config, logger *log.
 
 	logger.Debug("Upgrade Corssplane chart", "Values", release.Config)
 
-	return installer.Upgrade("", release.Config)
+	return installer.Upgrade(engine.Version, release.Config)
 }
 
 func (r *Registry) FromSecret(sec corev1.Secret) *Registry {
@@ -203,7 +203,7 @@ func (r *Registry) Delete(ctx context.Context, config *rest.Config, logger *log.
 			return nil
 		}
 
-		err = installer.Upgrade("", release.Config)
+		err = installer.Upgrade(engine.Version, release.Config)
 		if err != nil {
 			return err
 		}