Changes bootstrap

.github/workflows/docker-build.yaml

@@ -1,8 +1,9 @@
 name: "Docker Build"
 on:
+  workflow_dispatch:
+  push:
   pull_request:
-    branches:
-      - "main"
+
 jobs:
   docker-build:
     runs-on: ubuntu-latest

.github/workflows/functional-tests.yaml

@@ -1,5 +1,8 @@
 name: Functional tests
-on: [pull_request]
+on:
+  workflow_dispatch:
+  push:
+  pull_request:
 
 jobs:
   operator:

.github/workflows/go-linting.yaml

@@ -1,5 +1,8 @@
 name: Golang Lint
-on: [pull_request]
+on:
+  workflow_dispatch:
+  push:
+  pull_request:
 
 jobs:
   golangci-lint:

.github/workflows/helm-linting.yaml

@@ -1,8 +1,8 @@
 name: Helm Lint
 on:
+  workflow_dispatch:
+  push:
   pull_request:
-    paths: 
-        - 'charts/**'
 
 jobs: 
   helm-lint:

.github/workflows/helm-release.yaml

@@ -2,9 +2,9 @@ name: Release Helm Charts
 
 on:
   workflow_dispatch:
-  push:
-    branches:
-      - main
+  #push:
+  #  branches:
+  #    - main
 
 jobs:
   release:

.github/workflows/make-install.yaml

@@ -1,5 +1,8 @@
 name: Make install
-on: [pull_request]
+on:
+  workflow_dispatch:
+  push:
+  pull_request:
 
 jobs:
   make-install:

.github/workflows/testing.yaml

@@ -1,5 +1,8 @@
 name: Testing
-on: [pull_request]
+on:
+  workflow_dispatch:
+  push:
+  pull_request:
 
 jobs:
   unit-tests:

charts/opensearch-cluster/values.yaml

@@ -125,6 +125,10 @@ cluster:
     # If jvm is not provided and resources.requests.memory does not exist then value will be -Xmx512M -Xms512M
     jvm: ""
 
+    priorityClassName: ""
+
+    labels: {}
+
     # -- bootstrap pod node selectors
     nodeSelector: {}
 

opensearch-operator/api/v1/opensearch_types.go

@@ -170,9 +170,11 @@ type BootstrapConfig struct {
 	Affinity     *corev1.Affinity            `json:"affinity,omitempty"`
 	Jvm          string                      `json:"jvm,omitempty"`
 	// Extra items to add to the opensearch.yml, defaults to General.AdditionalConfig
-	AdditionalConfig map[string]string `json:"additionalConfig,omitempty"`
-	PluginsList      []string          `json:"pluginsList,omitempty"`
-	Keystore         []KeystoreValue   `json:"keystore,omitempty"`
+	AdditionalConfig  map[string]string `json:"additionalConfig,omitempty"`
+	PluginsList       []string          `json:"pluginsList,omitempty"`
+	Keystore          []KeystoreValue   `json:"keystore,omitempty"`
+	PriorityClassName string            `json:"priorityClassName,omitempty"`
+	Labels            map[string]string `json:"labels,omitempty"`
 }
 
 type DashboardsServiceSpec struct {
@@ -274,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 {

opensearch-operator/config/crd/bases/opensearch.opster.io_opensearchclusters.yaml

@@ -860,6 +860,10 @@ spec:
                           x-kubernetes-map-type: atomic
                       type: object
                     type: array
+                  labels:
+                    additionalProperties:
+                      type: string
+                    type: object
                   nodeSelector:
                     additionalProperties:
                       type: string
@@ -868,6 +872,8 @@ spec:
                     items:
                       type: string
                     type: array
+                  priorityClassName:
+                    type: string
                   resources:
                     description: ResourceRequirements describes the compute resource
                       requirements.
@@ -5268,6 +5274,8 @@ spec:
                         description: Specific configs for the SecurityConfig update
                           job
                         properties:
+                          priorityClassName:
+                            type: string
                           resources:
                             description: ResourceRequirements describes the compute
                               resource requirements.

opensearch-operator/pkg/builders/cluster.go

@@ -759,9 +759,10 @@ func NewBootstrapPod(
 	volumes []corev1.Volume,
 	volumeMounts []corev1.VolumeMount,
 ) *corev1.Pod {
-	labels := map[string]string{
-		helpers.ClusterLabel: cr.Name,
-	}
+	labels := make(map[string]string)
+	labels[helpers.ClusterLabel] = cr.Name
+	labels["opster.io/bootstrap-node"] = "true"
+
 	resources := cr.Spec.Bootstrap.Resources
 
 	var jvm string
@@ -771,6 +772,11 @@ func NewBootstrapPod(
 		jvm = cr.Spec.Bootstrap.Jvm
 	}
 
+	// cr.Spec.Bootstrap.labels
+	for key, value := range cr.Spec.Bootstrap.Labels {
+		labels[key] = value
+	}
+
 	image := helpers.ResolveImage(cr, nil)
 	initHelperImage := helpers.ResolveInitHelperImage(cr)
 	masterRole := helpers.ResolveClusterManagerRole(cr.Spec.General.Version)
@@ -1001,6 +1007,7 @@ func NewBootstrapPod(
 			Affinity:           cr.Spec.Bootstrap.Affinity,
 			ImagePullSecrets:   image.ImagePullSecrets,
 			SecurityContext:    podSecurityContext,
+			PriorityClassName:  cr.Spec.Bootstrap.PriorityClassName,
 		},
 	}
 
@@ -1109,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{
@@ -1132,6 +1140,7 @@ func NewSecurityconfigUpdateJob(
 					RestartPolicy:      corev1.RestartPolicyNever,
 					ImagePullSecrets:   image.ImagePullSecrets,
 					SecurityContext:    podSecurityContext,
+					PriorityClassName:  priorityClassName,
 				},
 			},
 		},

opensearch-operator/pkg/builders/cluster_test.go

@@ -72,6 +72,27 @@ func ClusterDescWithAdditionalConfigs(addtitionalConfig map[string]string, boots
 	}
 }
 
+func ClusterDescWithBootstrapPriorityClassNameAndLabel(prioClassName string, labels map[string]string) opsterv1.OpenSearchCluster {
+	return opsterv1.OpenSearchCluster{
+		Spec: opsterv1.ClusterSpec{
+			Bootstrap: opsterv1.BootstrapConfig{
+				PriorityClassName: prioClassName,
+				Labels:            labels,
+			},
+		},
+	}
+}
+
+func ClusterDescWithBootstrapResources(resources corev1.ResourceRequirements) opsterv1.OpenSearchCluster {
+	return opsterv1.OpenSearchCluster{
+		Spec: opsterv1.ClusterSpec{
+			Bootstrap: opsterv1.BootstrapConfig{
+				Resources: resources,
+			},
+		},
+	}
+}
+
 var _ = Describe("Builders", func() {
 	When("Constructing a STS for a NodePool", func() {
 		It("should include the init containers as SKIP_INIT_CONTAINER is not set", func() {
@@ -934,4 +955,47 @@ var _ = Describe("Builders", func() {
 			Expect(job.Spec.Template.Spec.Containers[0].Resources).To(Equal(clusterObject.Spec.Security.Config.UpdateJob.Resources))
 		})
 	})
+
+	When("Constructing a bootstrap pod with priorityClass and label Values", func() {
+		It("should create a proper bootstrap spec with priorityClass and labels", func() {
+			prioClassName := "testprioclass"
+
+			labels := map[string]string{
+				"testlabel1": "testvalue1",
+				"testlabel2": "testvalue2",
+			}
+
+			clusterObject := ClusterDescWithBootstrapPriorityClassNameAndLabel(prioClassName, labels)
+
+			result := NewBootstrapPod(&clusterObject, nil, nil)
+			Expect(result.Spec.PriorityClassName).To(Equal(prioClassName))
+			Expect(result.Labels).To(Equal(map[string]string{
+				"opster.io/opensearch-cluster": "",
+				"opster.io/bootstrap-node":     "true",
+				"testlabel1":                   "testvalue1",
+				"testlabel2":                   "testvalue2",
+			}))
+		})
+	})
+
+	When("Constructing a bootstrap pod with resources", func() {
+		It("should create a proper spec with resources", func() {
+
+			resources := corev1.ResourceRequirements{
+				Limits: corev1.ResourceList{
+					corev1.ResourceCPU:    resource.MustParse("1000m"),
+					corev1.ResourceMemory: resource.MustParse("1Gi"),
+				},
+				Requests: corev1.ResourceList{
+					corev1.ResourceCPU:    resource.MustParse("500m"),
+					corev1.ResourceMemory: resource.MustParse("2Gi"),
+				},
+			}
+
+			clusterObject := ClusterDescWithBootstrapResources(resources)
+
+			result := NewBootstrapPod(&clusterObject, nil, nil)
+			Expect(result.Spec.Containers[0].Resources).To(Equal(resources))
+		})
+	})
 })