name env key more clearly

Author: carlydf

cmd/main.go

@@ -123,11 +123,11 @@ func main() {
 	}
 	var ns corev1.Namespace
 	if err := mgr.GetAPIReader().Get(context.Background(), types.NamespacedName{Name: podNamespace}, &ns); err != nil {
-		setupLog.Error(err, "unable to fetch namespace UID for controller identity")
+		setupLog.Error(err, "unable to fetch namespace UID for controller identity suffix")
 		os.Exit(1)
 	}
-	if err := os.Setenv(controller.NamespaceUIDEnvKey, string(ns.UID)); err != nil {
-		setupLog.Error(err, fmt.Sprintf("unable to set %s", controller.NamespaceUIDEnvKey))
+	if err := os.Setenv(controller.IdentitySuffixEnvKey, string(ns.UID)); err != nil {
+		setupLog.Error(err, fmt.Sprintf("unable to set %s", controller.IdentitySuffixEnvKey))
 		os.Exit(1)
 	}
 

internal/controller/util.go

@@ -36,7 +36,7 @@ const (
 
 	VersionEnvKey                                    = "CONTROLLER_VERSION"
 	IdentityEnvKey                                   = "CONTROLLER_IDENTITY"
-	NamespaceUIDEnvKey                               = "NAMESPACE_UID"
+	IdentitySuffixEnvKey                             = "CONTROLLER_IDENTITY_SUFFIX"
 	MaxDeploymentVersionsIneligibleForDeletionEnvKey = "CONTROLLER_MAX_DEPLOYMENT_VERSIONS_INELIGIBLE_FOR_DELETION"
 
 	serverDeleteVersionIdentity = "try-delete-for-add-version"
@@ -72,7 +72,7 @@ func getControllerIdentity() string {
 // getControllerIdentityWithNamespaceUID returns the identity which will be used in the
 // next release. Used in this release for smooth rollback identity reclamation.
 func getControllerIdentityWithNamespaceUID() string {
-	return getControllerIdentity() + "/" + os.Getenv(NamespaceUIDEnvKey)
+	return getControllerIdentity() + "/" + os.Getenv(IdentitySuffixEnvKey)
 }
 
 func GetControllerMaxDeploymentVersionsIneligibleForDeletion() int32 {