From 72c1787b1e003aef7214fc6b2edb3c9c9569d16c Mon Sep 17 00:00:00 2001 From: Hendrik Saly Date: Thu, 5 Dec 2024 20:17:42 +0100 Subject: [PATCH] Add PriorityClassName to securityconfigupdate job Signed-off-by: Jens --- opensearch-operator/api/v1/opensearch_types.go | 3 ++- .../crd/bases/opensearch.opster.io_opensearchclusters.yaml | 2 ++ opensearch-operator/pkg/builders/cluster.go | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/opensearch-operator/api/v1/opensearch_types.go b/opensearch-operator/api/v1/opensearch_types.go index 83d692ff..58a0af1a 100644 --- a/opensearch-operator/api/v1/opensearch_types.go +++ b/opensearch-operator/api/v1/opensearch_types.go @@ -276,7 +276,8 @@ type SecurityConfig struct { // Specific configs for the SecurityConfig update job type SecurityUpdateJobConfig struct { - Resources corev1.ResourceRequirements `json:"resources,omitempty"` + Resources corev1.ResourceRequirements `json:"resources,omitempty"` + PriorityClassName string `json:"priorityClassName,omitempty"` } type ImageSpec struct { diff --git a/opensearch-operator/config/crd/bases/opensearch.opster.io_opensearchclusters.yaml b/opensearch-operator/config/crd/bases/opensearch.opster.io_opensearchclusters.yaml index a258551f..d4933aef 100644 --- a/opensearch-operator/config/crd/bases/opensearch.opster.io_opensearchclusters.yaml +++ b/opensearch-operator/config/crd/bases/opensearch.opster.io_opensearchclusters.yaml @@ -5274,6 +5274,8 @@ spec: description: Specific configs for the SecurityConfig update job properties: + priorityClassName: + type: string resources: description: ResourceRequirements describes the compute resource requirements. diff --git a/opensearch-operator/pkg/builders/cluster.go b/opensearch-operator/pkg/builders/cluster.go index d923dca0..e9119173 100644 --- a/opensearch-operator/pkg/builders/cluster.go +++ b/opensearch-operator/pkg/builders/cluster.go @@ -1116,6 +1116,7 @@ func NewSecurityconfigUpdateJob( securityContext := instance.Spec.General.SecurityContext podSecurityContext := instance.Spec.General.PodSecurityContext resources := instance.Spec.Security.GetConfig().GetUpdateJob().Resources + priorityClassName := instance.Spec.Security.GetConfig().GetUpdateJob().PriorityClassName return batchv1.Job{ ObjectMeta: metav1.ObjectMeta{Name: jobName, Namespace: namespace, Annotations: annotations}, Spec: batchv1.JobSpec{ @@ -1139,6 +1140,7 @@ func NewSecurityconfigUpdateJob( RestartPolicy: corev1.RestartPolicyNever, ImagePullSecrets: image.ImagePullSecrets, SecurityContext: podSecurityContext, + PriorityClassName: priorityClassName, }, }, },