Merge branch 'main' into unblu/feature/pvc-annotation

Signed-off-by: kannonski <[email protected]>

Author: kannonski

.github/CODEOWNERS

@@ -1 +1 @@
-* @idanl21 @ido-opster @dbason @swoehrl-mw @prudhvigodithi @jochenkressin @pchmielnik @salyh
+* @prudhvigodithi @synhershko

MAINTAINERS.md

@@ -2,15 +2,21 @@
 
 | Maintainer | GitHub ID | Affiliation  |
 | --------------- | --------- |--------------|
+| Prudhvi Godithi | [prudhvigodithi](https://github.com/prudhvigodithi) | Amazon       |
+| Itamar Syn-Hershko | [synhershko](https://github.com/synhershko) | BigData Boutique       |
+
+# Emeritus
+| Maintainer            | GitHub ID                                               | Affiliation      |
+| --------------------- | ------------------------------------------------------- | ---------------- |
 | Idan Levy | [idanl21](https://github.com/idanl21) | Opster       |
 | Ido | [ido-opster](https://github.com/ido-opster) | Opster       |
 | Dan Bason | [dbason](https://github.com/dbason) | SUSE         |
 | Sebastian Woehrl | [swoehrl-mw](https://github.com/swoehrl-mw) | MaibornWolff |
-| Prudhvi Godithi | [prudhvigodithi](https://github.com/prudhvigodithi) | Amazon       |
 | Jochen Kressin | [jochenkressin](https://github.com/jochenkressin) | Eliatra      |
 | Piotr Chmielnik | [pchmielnik](https://github.com/pchmielnik) | Eliatra       |
 | Hendrik Saly | [salyh](https://github.com/salyh) | Eliatra       |
 
+
 The following sections explain what maintainers do in this repo, and how they should be doing it. If you're interested in contributing, see [CONTRIBUTING](CONTRIBUTING.md).
 
 ## Release process

charts/opensearch-cluster/values.yaml

@@ -121,6 +121,9 @@ cluster:
     # -- bootstrap pod affinity rules
     affinity: {}
 
+    # -- bootstrap pod annotations
+    annotations: {}
+
     # -- bootstrap pod jvm options. If jvm is not provided then the java heap size will be set to half of resources.requests.memory which is the recommend value for data nodes.
     # If jvm is not provided and resources.requests.memory does not exist then value will be -Xmx512M -Xms512M
     jvm: ""
@@ -243,6 +246,8 @@ cluster:
   # -- Opensearch nodes configuration
   nodePools:
     - component: masters
+      # -- node pool pod annotations
+      annotations: {}
       diskSize: "30Gi"
       replicas: 3
       roles:

charts/opensearch-operator/files/opensearch.opster.io_opensearchclusters.yaml

@@ -987,6 +987,10 @@ spec:
                             x-kubernetes-list-type: atomic
                         type: object
                     type: object
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    type: object
                   jvm:
                     type: string
                   keystore:

docs/userguide/main.md

@@ -659,6 +659,8 @@ The Opensearch pods by default launch an init container to configure the volume.
 
 Note that the bootstrap pod started during initial cluster setup uses the same (pod)securityContext as the Opensearch pods (with the same limitations for the init containers).
 
+The bootstrap pod uses persistent storage (PVC) to maintain cluster state across restarts during initialization. This prevents cluster formation failures when the bootstrap pod restarts after the security configuration update job completes. The bootstrap PVC is automatically created and deleted along with the bootstrap pod.
+
 ### Labels or Annotations on OpenSearch nodes
 
 You can add additional labels or annotations on the nodepool configuration. This is useful for integration with other applications such as a service mesh, or configuring a prometheus scrape endpoint:

opensearch-operator/api/v1/opensearch_types.go

@@ -140,7 +140,7 @@ type PersistenceSource struct {
 }
 
 type PVCSource struct {
-	StorageClassName string                              `json:"storageClass,omitempty"`
+	StorageClassName *string                             `json:"storageClass,omitempty"`
 	AccessModes      []corev1.PersistentVolumeAccessMode `json:"accessModes,omitempty"`
 	Annotations      map[string]string                   `json:"annotations,omitempty"`
 	Labels           map[string]string                   `json:"labels,omitempty"`
@@ -175,6 +175,7 @@ type BootstrapConfig struct {
 	Jvm          string                      `json:"jvm,omitempty"`
 	// Extra items to add to the opensearch.yml, defaults to General.AdditionalConfig
 	AdditionalConfig map[string]string `json:"additionalConfig,omitempty"`
+	Annotations      map[string]string `json:"annotations,omitempty"`
 	PluginsList      []string          `json:"pluginsList,omitempty"`
 	Keystore         []KeystoreValue   `json:"keystore,omitempty"`
 }

opensearch-operator/api/v1/zz_generated.deepcopy.go

@@ -987,6 +987,10 @@ spec:
                             x-kubernetes-list-type: atomic
                         type: object
                     type: object
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    type: object
                   jvm:
                     type: string
                   keystore:

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

@@ -10,6 +10,7 @@ import (
 
 	opsterv1 "github.com/Opster/opensearch-k8s-operator/opensearch-operator/api/v1"
 	"github.com/Opster/opensearch-k8s-operator/opensearch-operator/pkg/helpers"
+	"github.com/Opster/opensearch-k8s-operator/opensearch-operator/pkg/reconcilers"
 	. "github.com/kralicky/kmatch"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -20,6 +21,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/intstr"
+	"k8s.io/client-go/tools/record"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	//+kubebuilder:scaffold:imports
 )
@@ -523,4 +525,27 @@ var _ = Describe("Cluster Reconciler", func() {
 			wg.Wait()
 		})
 	})
+
+	When("Deleting cluster resources", func() {
+		It("should delete bootstrap PVC when cluster is deleted", func() {
+			// Create a cluster reconciler
+			reconcilerContext := reconcilers.NewReconcilerContext(record.NewFakeRecorder(1), &OpensearchCluster, OpensearchCluster.Spec.NodePools)
+			clusterReconciler := reconcilers.NewClusterReconciler(
+				k8sClient,
+				context.Background(),
+				record.NewFakeRecorder(1),
+				&reconcilerContext,
+				&OpensearchCluster,
+			)
+
+			// Call DeleteResources
+			result, err := clusterReconciler.DeleteResources()
+			Expect(err).NotTo(HaveOccurred())
+			Expect(result.Requeue).To(BeFalse())
+
+			// Verify that the bootstrap PVC would be deleted (StateAbsent)
+			// The actual deletion would happen in a real cluster, but we can verify
+			// that the method doesn't error and returns the expected result
+		})
+	})
 })

opensearch-operator/controllers/cluster_test.go

@@ -157,6 +157,7 @@ func (r *OpenSearchClusterReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Owns(&corev1.Service{}).
 		Owns(&appsv1.Deployment{}).
 		Owns(&appsv1.StatefulSet{}).
+		Owns(&corev1.PersistentVolumeClaim{}).
 		Complete(r)
 }