GT-495 Make scale_down_candidate annotation obsolete

CHANGELOG.md

@@ -5,6 +5,7 @@
 - (Improvement) Allow tcp:// and ssl:// protocols in endpoints for members
 - (Maintenance) Reorganize package imports / move common code to separate repos
 - (Maintenance) Remove support for RELATED_IMAGE_UBI, RELATED_IMAGE_DATABASE and RELATED_IMAGE_METRICSEXPORTER env vars
+- (Maintenance) Make scale_down_candidate annotation obsolete
 
 ## [1.2.33](https://github.com/arangodb/kube-arangodb/tree/1.2.33) (2023-09-27)
 - (Maintenance) Bump golang.org/x/net to v0.13.0

pkg/apis/deployment/annotations.go

@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,12 +21,14 @@
 package deployment
 
 const (
-	ArangoDeploymentAnnotationPrefix                = "deployment.arangodb.com"
-	ArangoDeploymentPodMaintenanceAnnotation        = ArangoDeploymentAnnotationPrefix + "/maintenance"
-	ArangoDeploymentPodChangeArchAnnotation         = ArangoDeploymentAnnotationPrefix + "/arch"
-	ArangoDeploymentPodRotateAnnotation             = ArangoDeploymentAnnotationPrefix + "/rotate"
-	ArangoDeploymentPodReplaceAnnotation            = ArangoDeploymentAnnotationPrefix + "/replace"
-	ArangoDeploymentPodDeleteNow                    = ArangoDeploymentAnnotationPrefix + "/delete_now"
+	ArangoDeploymentAnnotationPrefix         = "deployment.arangodb.com"
+	ArangoDeploymentPodMaintenanceAnnotation = ArangoDeploymentAnnotationPrefix + "/maintenance"
+	ArangoDeploymentPodChangeArchAnnotation  = ArangoDeploymentAnnotationPrefix + "/arch"
+	ArangoDeploymentPodRotateAnnotation      = ArangoDeploymentAnnotationPrefix + "/rotate"
+	ArangoDeploymentPodReplaceAnnotation     = ArangoDeploymentAnnotationPrefix + "/replace"
+	ArangoDeploymentPodDeleteNow             = ArangoDeploymentAnnotationPrefix + "/delete_now"
+	ArangoDeploymentPlanCleanAnnotation      = "plan." + ArangoDeploymentAnnotationPrefix + "/clean"
+
+	// Deprecated: use ArangoMemberSpec.DeletionPriority instead
 	ArangoDeploymentPodScaleDownCandidateAnnotation = ArangoDeploymentAnnotationPrefix + "/scale_down_candidate"
-	ArangoDeploymentPlanCleanAnnotation             = "plan." + ArangoDeploymentAnnotationPrefix + "/clean"
 )

pkg/apis/deployment/v1/arango_member_spec.go

@@ -41,6 +41,9 @@ type ArangoMemberSpec struct {
 	// Template keeps template which is gonna be applied on the Pod.
 	Template *ArangoMemberPodTemplate `json:"template,omitempty"`
 
+	// DeletionPriority define Deletion Priority.
+	// Higher value means higher priority. Default is 0.
+	// Example: set 1 for Coordinator which should be deleted first and scale down coordinators by one.
 	DeletionPriority *int `json:"deletion_priority,omitempty"`
 }
 

pkg/apis/deployment/v2alpha1/arango_member_spec.go

@@ -41,6 +41,9 @@ type ArangoMemberSpec struct {
 	// Template keeps template which is gonna be applied on the Pod.
 	Template *ArangoMemberPodTemplate `json:"template,omitempty"`
 
+	// DeletionPriority define Deletion Priority.
+	// Higher value means higher priority. Default is 0.
+	// Example: set 1 for Coordinator which should be deleted first and scale down coordinators by one.
 	DeletionPriority *int `json:"deletion_priority,omitempty"`
 }
 

pkg/deployment/reconcile/plan_builder_scale.go

@@ -185,11 +185,13 @@ func (r *Reconciler) scaleDownCandidate(ctx context.Context, apiObject k8sutil.A
 			continue
 		}
 
+		//nolint:staticcheck
 		if _, ok := am.Annotations[deployment.ArangoDeploymentPodScaleDownCandidateAnnotation]; ok {
 			annotationExists = true
 		}
 
 		if pod, ok := cache.Pod().V1().GetSimple(m.Member.Pod.GetName()); ok {
+			//nolint:staticcheck
 			if _, ok := pod.Annotations[deployment.ArangoDeploymentPodScaleDownCandidateAnnotation]; ok {
 				annotationExists = true
 			}