Removed Priority field. Added test.

Author: lamai93

manifests/templates/test/rbac.yaml

@@ -12,8 +12,8 @@ rules:
 - apiGroups: [""]
   resources: ["pods", "services", "persistentvolumes", "persistentvolumeclaims", "secrets", "serviceaccounts", "pods/log"]
   verbs: ["*"]
-- apiGroups: ["apps"]
-  resources: ["daemonsets", "deployments"]
+- apiGroups: ["apps", "scheduling.k8s.io"]
+  resources: ["daemonsets", "deployments", "priorityclasses"]
   verbs: ["*"]
 
 ---

pkg/apis/deployment/v1alpha/deployment_status_members.go

@@ -243,3 +243,23 @@ func (ds DeploymentStatusMembers) AllMembersReady(mode DeploymentMode, syncEnabl
 		return false
 	}
 }
+
+// MembersOfGroup returns the member list of the given group
+func (ds DeploymentStatusMembers) MembersOfGroup(group ServerGroup) MemberStatusList {
+	switch group {
+	case ServerGroupSingle:
+		return ds.Single
+	case ServerGroupAgents:
+		return ds.Agents
+	case ServerGroupDBServers:
+		return ds.DBServers
+	case ServerGroupCoordinators:
+		return ds.Coordinators
+	case ServerGroupSyncMasters:
+		return ds.SyncMasters
+	case ServerGroupSyncWorkers:
+		return ds.SyncWorkers
+	default:
+		return MemberStatusList{}
+	}
+}

pkg/apis/deployment/v1alpha/server_group_spec.go

@@ -60,8 +60,6 @@ type ServerGroupSpec struct {
 	Probes *ServerGroupProbesSpec `json:"probes,omitempty"`
 	// PriorityClassName specifies a priority class name
 	PriorityClassName string `json:"priorityClassName,omitempty"`
-	// Priority specifies the pod priority
-	Priority *int32 `json:"priority,omitempty"`
 }
 
 // ServerGroupProbesSpec contains specification for probes for pods of the server group

pkg/deployment/images.go

@@ -198,7 +198,7 @@ func (ib *imagesBuilder) fetchArangoDBImageIDAndVersion(ctx context.Context, ima
 		}
 	}
 	if err := k8sutil.CreateArangodPod(ib.KubeCli, true, ib.APIObject, role, id, podName, "", image, "", "", ib.Spec.GetImagePullPolicy(), "", false, terminationGracePeriod, args, env, nil, nil, nil,
-		tolerations, serviceAccountName, "", "", "", nil); err != nil {
+		tolerations, serviceAccountName, "", "", "", nil, ""); err != nil {
 		log.Debug().Err(err).Msg("Failed to create image ID pod")
 		return true, maskAny(err)
 	}

pkg/deployment/reconcile/plan_builder.go

@@ -345,6 +345,11 @@ func podNeedsRotation(log zerolog.Logger, p v1.Pod, apiObject metav1.Object, spe
 		return true, "ServiceAccountName changed"
 	}
 
+	// Check priorities
+	if groupSpec.PriorityClassName != p.Spec.PriorityClassName {
+		return true, "Pod priority changed"
+	}
+
 	return false, ""
 }
 

pkg/deployment/resources/pod_creator.go

@@ -607,7 +607,7 @@ func (r *Resources) createPodForMember(spec api.DeploymentSpec, memberID string,
 		finalizers := r.createPodFinalizers(group)
 		if err := k8sutil.CreateArangodPod(kubecli, spec.IsDevelopment(), apiObject, role, m.ID, m.PodName, m.PersistentVolumeClaimName, imageInfo.ImageID, lifecycleImage, alpineImage, spec.GetImagePullPolicy(),
 			engine, requireUUID, terminationGracePeriod, args, env, finalizers, livenessProbe, readinessProbe, tolerations, serviceAccountName, tlsKeyfileSecretName, rocksdbEncryptionSecretName,
-			clusterJWTSecretName, groupSpec.GetNodeSelector(), groupSpec.PriorityClassName, groupSpec.Priority); err != nil {
+			clusterJWTSecretName, groupSpec.GetNodeSelector(), groupSpec.PriorityClassName); err != nil {
 			return maskAny(err)
 		}
 		log.Debug().Str("pod-name", m.PodName).Msg("Created pod")
@@ -690,7 +690,7 @@ func (r *Resources) createPodForMember(spec api.DeploymentSpec, memberID string,
 		}
 		if err := k8sutil.CreateArangoSyncPod(kubecli, spec.IsDevelopment(), apiObject, role, m.ID, m.PodName, imageID, lifecycleImage, spec.GetImagePullPolicy(), terminationGracePeriod, args, env,
 			livenessProbe, tolerations, serviceAccountName, tlsKeyfileSecretName, clientAuthCASecretName, masterJWTSecretName, clusterJWTSecretName, affinityWithRole, groupSpec.GetNodeSelector(),
-			groupSpec.PriorityClassName, groupSpec.Priority); err != nil {
+			groupSpec.PriorityClassName); err != nil {
 			return maskAny(err)
 		}
 		log.Debug().Str("pod-name", m.PodName).Msg("Created pod")

pkg/util/k8sutil/pods.go

@@ -435,7 +435,7 @@ func CreateArangodPod(kubecli kubernetes.Interface, developmentMode bool, deploy
 	args []string, env map[string]EnvValue, finalizers []string,
 	livenessProbe *HTTPProbeConfig, readinessProbe *HTTPProbeConfig, tolerations []v1.Toleration, serviceAccountName string,
 	tlsKeyfileSecretName, rocksdbEncryptionSecretName string, clusterJWTSecretName string, nodeSelector map[string]string,
-	podPriorityClassName string, podPriority *int32) error {
+	podPriorityClassName string) error {
 	// Prepare basic pod
 	p := newPod(deployment.GetName(), deployment.GetNamespace(), role, id, podName, finalizers, tolerations, serviceAccountName, nodeSelector)
 	terminationGracePeriodSeconds := int64(math.Ceil(terminationGracePeriod.Seconds()))
@@ -470,8 +470,7 @@ func CreateArangodPod(kubecli kubernetes.Interface, developmentMode bool, deploy
 	}
 	p.Spec.Containers = append(p.Spec.Containers, c)
 
-	// Add priority and priorityClassName
-	p.Spec.Priority = podPriority
+	// Add priorityClassName
 	p.Spec.PriorityClassName = podPriorityClassName
 
 	// Add UUID init container
@@ -559,7 +558,7 @@ func CreateArangodPod(kubecli kubernetes.Interface, developmentMode bool, deploy
 func CreateArangoSyncPod(kubecli kubernetes.Interface, developmentMode bool, deployment APIObject, role, id, podName, image, lifecycleImage string, imagePullPolicy v1.PullPolicy,
 	terminationGracePeriod time.Duration, args []string, env map[string]EnvValue, livenessProbe *HTTPProbeConfig, tolerations []v1.Toleration, serviceAccountName string,
 	tlsKeyfileSecretName, clientAuthCASecretName, masterJWTSecretName, clusterJWTSecretName, affinityWithRole string, nodeSelector map[string]string,
-	podPriorityClassName string, podPriority *int32) error {
+	podPriorityClassName string) error {
 	// Prepare basic pod
 	p := newPod(deployment.GetName(), deployment.GetNamespace(), role, id, podName, nil, tolerations, serviceAccountName, nodeSelector)
 	terminationGracePeriodSeconds := int64(math.Ceil(terminationGracePeriod.Seconds()))
@@ -600,8 +599,7 @@ func CreateArangoSyncPod(kubecli kubernetes.Interface, developmentMode bool, dep
 	}
 	p.Spec.Containers = append(p.Spec.Containers, c)
 
-	// Add priority and priorityClassName
-	p.Spec.Priority = podPriority
+	// Add priorityClassName
 	p.Spec.PriorityClassName = podPriorityClassName
 
 	// TLS keyfile secret mount (if any)