move annotation

Author: rushmash91

apis/v1alpha1/annotation.go

@@ -41,6 +41,10 @@ var (
 	// of the `spec` object. If the value is "false", the controller will not force an update of the
 	// nodegroup version.
 	ForceNodeGroupUpdateVersionAnnotation = fmt.Sprintf("%s/force-update-version", GroupVersion.Group)
+	// ForceClusterUpgradeAnnotation is an annotation whose value indicates whether
+	// the cluster version upgrade should be forced even if there are cluster insight findings.
+	// The value of this annotation must be a boolean value.
+	ForceClusterUpgradeAnnotation = fmt.Sprintf("%s/force-upgrade", GroupVersion.Group)
 )
 
 const (
@@ -52,4 +56,7 @@ const (
 	// annotation that indicates that the desired size of a nodegroup is managed by the ACK
 	// controller.
 	DesiredSizeManagedByACKController = "ack-eks-controller"
+	// DefaultForceClusterUpgrade is the default value for ForceClusterUpgradeAnnotation if the annotation
+	// is not set or has an invalid value.
+	DefaultForceClusterUpgrade = false
 )

pkg/resource/cluster/hook.go

@@ -32,6 +32,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
+	"github.com/aws-controllers-k8s/eks-controller/apis/v1alpha1"
 	"github.com/aws-controllers-k8s/eks-controller/pkg/tags"
 	"github.com/aws-controllers-k8s/eks-controller/pkg/util"
 )
@@ -51,31 +52,20 @@ const (
 	StatusPending  = "PENDING"
 )
 
-const (
-	// AnnotationPrefix is the prefix for all annotations specifically for
-	// the EKS service.
-	AnnotationPrefix = "eks.services.k8s.aws/"
-	// AnnotationForceUpgrade is an annotation whose value indicates whether
-	// the cluster version upgrade should be forced even if there are cluster insight findings.
-	AnnotationForceUpgrade = AnnotationPrefix + "force-upgrade"
-
-	DefaultForceUpgrade = false
-)
-
 // GetForceUpgrade returns whether the cluster version upgrade should be forced
 // as determined by the annotation on the object, or the default value otherwise.
 func GetForceUpgrade(
 	m *metav1.ObjectMeta,
 ) bool {
 	resAnnotations := m.GetAnnotations()
-	forceUpgrade, ok := resAnnotations[AnnotationForceUpgrade]
+	forceUpgrade, ok := resAnnotations[v1alpha1.ForceClusterUpgradeAnnotation]
 	if !ok {
-		return DefaultForceUpgrade
+		return v1alpha1.DefaultForceClusterUpgrade
 	}
 
 	forceUpgradeBool, err := strconv.ParseBool(forceUpgrade)
 	if err != nil {
-		return DefaultForceUpgrade
+		return v1alpha1.DefaultForceClusterUpgrade
 	}
 
 	return forceUpgradeBool