Merge pull request noobaa#1764 from liranmauda/liran-backport-into-5.20

liranmauda · web-flow · commit f255d03eec49 · 2026-01-07T11:22:42.000+02:00
[Backport into 5.20] Backporting into 5.20
diff --git a/.githooks/pre-commit b/.githooks/pre-commit
diff --git a/.github/workflows/run_hac_test.yml b/.github/workflows/run_hac_test.yml
@@ -1,5 +1,5 @@
 name: HAC on KIND cluster Test
-on: [push, pull_request, workflow_dispatch]
+on: [workflow_dispatch]
 
 jobs:
   run-hac-test:
diff --git a/deploy/internal/statefulset-postgres-db.yaml b/deploy/internal/statefulset-postgres-db.yaml
@@ -75,7 +75,7 @@ spec:
           app: noobaa
       spec:
         accessModes:
-          - ReadWriteOnce
+          - ReadWriteOncePod
         resources:
           requests:
             storage: 50Gi
diff --git a/deploy/olm/noobaa-operator.clusterserviceversion.yaml b/deploy/olm/noobaa-operator.clusterserviceversion.yaml
@@ -17,7 +17,7 @@ metadata:
 spec:
   displayName: NooBaa Operator
   version: "999.999.999-placeholder"
-  minKubeVersion: 1.16.0
+  minKubeVersion: 1.22.0
   maturity: alpha
   provider:
     name: NooBaa
diff --git a/doc/noobaa-crd.md b/doc/noobaa-crd.md
@@ -236,7 +236,7 @@ metadata:
 spec:
   image: noobaa/noobaa-core:5.9.0
   dbImage: centos/postgresql-12-centos7
-  dbConf: |+
+  dbConf: |
     max_connections = 1000
 ```
 ## Pod Topology Spread Constraints for Noobaa endpoint
diff --git a/pkg/bundle/deploy.go b/pkg/bundle/deploy.go
@@ -5297,7 +5297,7 @@ spec:
                   resource: limits.memory
 `
 
-const Sha256_deploy_internal_statefulset_postgres_db_yaml = "cd739b491f35e77972c55078e6b1ea1362f3897194ed9c89fcf962a1ad6a4c3c"
+const Sha256_deploy_internal_statefulset_postgres_db_yaml = "53b628aaceffc1952efed5ed1131f16461fde6eb78c1a5f0f281f3efc30c30b4"
 
 const File_deploy_internal_statefulset_postgres_db_yaml = `apiVersion: apps/v1
 kind: StatefulSet
@@ -5376,7 +5376,7 @@ spec:
           app: noobaa
       spec:
         accessModes:
-          - ReadWriteOnce
+          - ReadWriteOncePod
         resources:
           requests:
             storage: 50Gi
@@ -6066,7 +6066,7 @@ s3 ls s3://first.bucket
 ` + "`" + `` + "`" + `` + "`" + `
 `
 
-const Sha256_deploy_olm_noobaa_operator_clusterserviceversion_yaml = "3b11ab7cce6a4dfc36ad13f75b37821c8e200aec4cf21007208948e74ce9cc44"
+const Sha256_deploy_olm_noobaa_operator_clusterserviceversion_yaml = "4316a5d3ea52ed0e82489ad380b596f41e3675737b5d5ad80e403759f39fc128"
 
 const File_deploy_olm_noobaa_operator_clusterserviceversion_yaml = `apiVersion: operators.coreos.com/v1alpha1
 kind: ClusterServiceVersion
@@ -6087,7 +6087,7 @@ metadata:
 spec:
   displayName: NooBaa Operator
   version: "999.999.999-placeholder"
-  minKubeVersion: 1.16.0
+  minKubeVersion: 1.22.0
   maturity: alpha
   provider:
     name: NooBaa
diff --git a/pkg/controller/add_hac.go b/pkg/controller/add_hac.go
@@ -1,10 +1,15 @@
 package controller
 
 import (
+	"os"
+
 	hac "github.com/noobaa/noobaa-operator/v5/pkg/controller/ha"
 )
 
 func init() {
-	// AddToManagerFuncs is a list of functions to create controllers and add them to a manager.
-	AddToManagerFuncs = append(AddToManagerFuncs, hac.Add)
+	hacEnabled := os.Getenv("HAC_ENABLED")
+	if hacEnabled == "true" {
+		// AddToManagerFuncs is a list of functions to create controllers and add them to a manager.
+		AddToManagerFuncs = append(AddToManagerFuncs, hac.Add)
+	}
 }
diff --git a/pkg/controller/ha/ha_controller.go b/pkg/controller/ha/ha_controller.go
@@ -71,6 +71,7 @@ func nodeNotReadyPredicate() predicate.Predicate {
 
 // Add creates a nodewatcher Controller and adds it to the Manager.
 func Add(mgr manager.Manager) error {
+	util.Logger().Info("Adding high availability controller (HAC)")
 
 	opts := controller.Options{
 		MaxConcurrentReconciles: 1,
diff --git a/pkg/hac/hac.go b/pkg/hac/hac.go
@@ -5,6 +5,7 @@ package hac
 
 import (
 	"context"
+	"os"
 
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
@@ -43,8 +44,12 @@ func (pd *PodDeleter) DeletePodsOnNode() error {
 		return errors.Errorf("failed to list noobaa pods on the node %v in namespace %v", pd.NodeName, options.Namespace)
 	}
 
-	// delete the found pods
-	var gracePeriod int64 = 0
+	// delete the found pods. by default using a 1 second grace period.
+	var gracePeriod int64 = 1
+	if os.Getenv("HAC_FORCE_DELETE") == "true" {
+		// if HAC_FORCE_DELETE is set to true, use a 0 second grace period.
+		gracePeriod = 0
+	}
 	deleteOpts := client.DeleteOptions{GracePeriodSeconds: &gracePeriod}
 	for _, pod := range podList.Items {
 		if err := pd.Client.Delete(context.Background(), &pod, &deleteOpts); err != nil {
diff --git a/pkg/olm/olm.go b/pkg/olm/olm.go
@@ -22,6 +22,7 @@ import (
 	"github.com/spf13/cobra"
 	admissionv1 "k8s.io/api/admissionregistration/v1"
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/intstr"
@@ -811,6 +812,15 @@ func addCnpgToCSV(csv *operv1.ClusterServiceVersion, csvParams *generateCSVParam
 		Value: "/apiserver.local.config/certificates",
 	})
 
+	resources.CnpgOperatorDeployment.Spec.Template.Spec.Containers[0].Resources.Limits = corev1.ResourceList{
+		corev1.ResourceCPU:    resource.MustParse("100m"),
+		corev1.ResourceMemory: resource.MustParse("300Mi"),
+	}
+	resources.CnpgOperatorDeployment.Spec.Template.Spec.Containers[0].Resources.Requests = corev1.ResourceList{
+		corev1.ResourceCPU:    resource.MustParse("100m"),
+		corev1.ResourceMemory: resource.MustParse("300Mi"),
+	}
+
 	if csvParams.IsForODF {
 		// add tolerations to the cnpg operator deployment
 		resources.CnpgOperatorDeployment.Spec.Template.Spec.Tolerations = []corev1.Toleration{
diff --git a/pkg/system/db_reconciler.go b/pkg/system/db_reconciler.go
@@ -402,9 +402,14 @@ func (r *Reconciler) setPostgresConfig() {
 	// a reasonable value for shared_buffers when mem>1GB is 25% of the total memory (https://www.postgresql.org/docs/9.1/runtime-config-resource.html)
 	// if resources are not specified, we will use the default value
 	if r.NooBaa.Spec.DBResources != nil {
-		requiredDBMemMB := r.NooBaa.Spec.DBSpec.DBResources.Requests.Memory().ScaledValue(resource.Mega)
-		sharedBuffersMB := requiredDBMemMB / 4
-		desiredParameters["shared_buffers"] = fmt.Sprintf("%dMB", sharedBuffersMB)
+		// if memory is not specified, set shared_buffers to 1GB
+		if r.NooBaa.Spec.DBSpec.DBResources.Requests == nil || r.NooBaa.Spec.DBSpec.DBResources.Requests.Memory() == nil {
+			desiredParameters["shared_buffers"] = "1GB"
+		} else {
+			requiredDBMemMB := r.NooBaa.Spec.DBSpec.DBResources.Requests.Memory().ScaledValue(resource.Mega)
+			sharedBuffersMB := requiredDBMemMB / 4
+			desiredParameters["shared_buffers"] = fmt.Sprintf("%dMB", sharedBuffersMB)
+		}
 	}
 
 	// set any parameters from DBSpec.DBConf in overrideParameters
@@ -453,6 +458,10 @@ func setDesiredStorageConf(storageConfiguration *cnpgv1.StorageConfiguration, db
 	if storageConfiguration == nil {
 		return fmt.Errorf("storage configuration is nil")
 	}
+	if storageConfiguration.PersistentVolumeClaimTemplate == nil {
+		storageConfiguration.PersistentVolumeClaimTemplate = &corev1.PersistentVolumeClaimSpec{}
+	}
+	storageConfiguration.PersistentVolumeClaimTemplate.AccessModes = []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOncePod}
 	if dbSpec.DBStorageClass != nil {
 		storageConfiguration.StorageClass = dbSpec.DBStorageClass
 	} else {
@@ -527,6 +536,7 @@ func (r *Reconciler) wasClusterSpecChanged(existingClusterSpec *cnpgv1.ClusterSp
 		!reflect.DeepEqual(existingClusterSpec.Resources, r.CNPGCluster.Spec.Resources) ||
 		!reflect.DeepEqual(existingClusterSpec.StorageConfiguration.StorageClass, r.CNPGCluster.Spec.StorageConfiguration.StorageClass) ||
 		!reflect.DeepEqual(existingClusterSpec.StorageConfiguration.Size, r.CNPGCluster.Spec.StorageConfiguration.Size) ||
+		!reflect.DeepEqual(existingClusterSpec.StorageConfiguration.PersistentVolumeClaimTemplate, r.CNPGCluster.Spec.StorageConfiguration.PersistentVolumeClaimTemplate) ||
 		!reflect.DeepEqual(existingClusterSpec.Monitoring, r.CNPGCluster.Spec.Monitoring) ||
 		!reflect.DeepEqual(existingClusterSpec.PostgresConfiguration.Parameters, r.CNPGCluster.Spec.PostgresConfiguration.Parameters)
 }
diff --git a/pkg/system/phase2_creating.go b/pkg/system/phase2_creating.go
@@ -407,6 +407,21 @@ func (r *Reconciler) SetDesiredNooBaaDB() error {
 }
 
 func (r *Reconciler) setDesiredCoreEnv(c *corev1.Container) {
+	// Filter out NOOBAA_ROOT_SECRET from env vars to avoid exposing it in pod spec
+	// it is set via mounting the secret as files
+	// this will remove the leftover env var in case of an upgrade from older operator version (older than 4.21)
+	// as we preserve env vars on updates by merging the arrays and not replacing them.
+
+    if len(c.Env) > 0 {
+        filtered := c.Env[:0]
+        for _, env := range c.Env {
+            if env.Name != "NOOBAA_ROOT_SECRET" {
+                filtered = append(filtered, env)
+            }
+        }
+        c.Env = filtered
+    }
+
 	for j := range c.Env {
 		switch c.Env[j].Name {
 		case "AGENT_PROFILE":
@@ -536,6 +551,10 @@ func (r *Reconciler) SetDesiredCoreApp() error {
 	r.CoreApp.Spec.ServiceName = r.ServiceMgmt.Name
 
 	podSpec := &r.CoreApp.Spec.Template.Spec
+	// set the termination grace period for noobaa-core pod.
+	// For now we set it to 1 second. A better approach should be to implement a graceful shutdown for the noobaa-core pod when SIGTERM is received.
+	terminationGracePeriodSeconds := int64(1)
+	podSpec.TerminationGracePeriodSeconds = &terminationGracePeriodSeconds
 	podSpec.ServiceAccountName = "noobaa-core"
 	coreImageChanged := false
 
diff --git a/pkg/util/util.go b/pkg/util/util.go
@@ -1235,7 +1235,7 @@ func GetAWSRegion() (string, error) {
 		"ap-southeast-3": "ap-southeast-3",
 		"ap-southeast-4": "ap-southeast-4",
 		"ap-southeast-5": "ap-southeast-5",
-		// Currently in AWS table there is no region ap-southeast-6
+		"ap-southeast-6": "ap-southeast-6",
 		"ap-southeast-7": "ap-southeast-7",
 		"ap-south-1":     "ap-south-1",
 		"ap-south-2":     "ap-south-2",
