Remove secret name from global constants

suse-edge · Jul 26, 2024 · 58074e9 · 58074e9
1 parent c236ccf
commit 58074e9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/internal/controller/reconcile_os.go b/internal/controller/reconcile_os.go
@@ -30,7 +30,7 @@ func (r *UpgradePlanReconciler) reconcileOS(ctx context.Context, upgradePlan *li
 		return ctrl.Result{}, r.createSecret(ctx, upgradePlan, secret)
 	}
 
-	controlPlanePlan := upgrade.OSControlPlanePlan(release.ReleaseVersion, &release.Components.OperatingSystem)
+	controlPlanePlan := upgrade.OSControlPlanePlan(release.ReleaseVersion, secret.Name, &release.Components.OperatingSystem)
 	if err = r.Get(ctx, client.ObjectKeyFromObject(controlPlanePlan), controlPlanePlan); err != nil {
 		if !errors.IsNotFound(err) {
 			return ctrl.Result{}, err

diff --git a/internal/upgrade/os.go b/internal/upgrade/os.go
@@ -16,13 +16,16 @@ import (
 
 const (
 	scriptName = "os-upgrade.sh"
-	secretName = "os-upgrade-secret"
 )
 
 //go:embed templates/os-upgrade.sh.tpl
 var osUpgradeScript string
 
 func OSUpgradeSecret(releaseOS *release.OperatingSystem) (*corev1.Secret, error) {
+	const (
+		secretName = "os-upgrade-secret"
+	)
+
 	tmpl, err := template.New(scriptName).Parse(osUpgradeScript)
 	if err != nil {
 		return nil, fmt.Errorf("parsing contents: %w", err)
@@ -61,7 +64,7 @@ func OSUpgradeSecret(releaseOS *release.OperatingSystem) (*corev1.Secret, error)
 	return secret, nil
 }
 
-func OSControlPlanePlan(releaseVersion string, releaseOS *release.OperatingSystem) *upgradecattlev1.Plan {
+func OSControlPlanePlan(releaseVersion, secretName string, releaseOS *release.OperatingSystem) *upgradecattlev1.Plan {
 	const (
 		planImage = "registry.suse.com/bci/bci-base:15.5"
 	)