Merge branch 'opensearch-project:main' into development

trifork · Aug 21, 2024 · 7c562c0 · 7c562c0
2 parents 4501ff2 + 610222a
commit 7c562c0
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/charts/opensearch-cluster/templates/opensearch-cluster-cr.yaml b/charts/opensearch-cluster/templates/opensearch-cluster-cr.yaml
@@ -27,6 +27,10 @@ spec:
     imagePullSecrets:
       {{ toYaml .Values.opensearchCluster.initHelper.imagePullSecrets | nindent 6 }}
     {{- end }}
+    {{- if .Values.opensearchCluster.initHelper.resources }}
+    resources:
+      {{- toYaml .Values.opensearchCluster.initHelper.resources | nindent 6 }}
+    {{- end }}
   {{- end }}
   general:
     {{- if .Values.opensearchCluster.general.version }}

diff --git a/charts/opensearch-cluster/values.yaml b/charts/opensearch-cluster/values.yaml
@@ -27,6 +27,17 @@ opensearchCluster:
       limits:
         memory: "1Gi"
         cpu: "500m"
+  initHelper:
+    imagePullSecrets: []
+    # - registryKeySecretName
+    imagePullPolicy: IfNotPresent
+    resources: {}
+    # requests:
+    #   memory: "1Gi"
+    #   cpu: "500m"
+    # limits:
+    #   memory: "1Gi"
+    #   cpu: "500m"
   nodePools:
     - component: masters
       diskSize: "30Gi"

diff --git a/charts/opensearch-operator/values.yaml b/charts/opensearch-operator/values.yaml
@@ -74,7 +74,11 @@ serviceAccount:
 kubeRbacProxy:
   enable: true
   securityContext:
-    # allowPrivilegeEscalation: false
+    allowPrivilegeEscalation: false
+    readOnlyRootFilesystem: true
+    capabilities:
+      drop:
+        - ALL
   resources:
     limits:
       cpu: 50m

diff --git a/opensearch-operator/pkg/helpers/helpers.go b/opensearch-operator/pkg/helpers/helpers.go
@@ -247,7 +247,7 @@ func CountRunningPodsForNodePool(k8sClient k8s.K8sClient, cr *opsterv1.OpenSearc
 	selector := labels.NewSelector()
 	selector = selector.Add(*clusterReq, *componentReq)
 	// List pods matching selector
-	list, err := k8sClient.ListPods(&client.ListOptions{LabelSelector: selector})
+	list, err := k8sClient.ListPods(&client.ListOptions{Namespace: cr.Namespace, LabelSelector: selector})
 	if err != nil {
 		return 0, err
 	}
@@ -281,7 +281,7 @@ func CountPVCsForNodePool(k8sClient k8s.K8sClient, cr *opsterv1.OpenSearchCluste
 	}
 	selector := labels.NewSelector()
 	selector = selector.Add(*clusterReq, *componentReq)
-	list, err := k8sClient.ListPVCs(&client.ListOptions{LabelSelector: selector})
+	list, err := k8sClient.ListPVCs(&client.ListOptions{Namespace: cr.Namespace, LabelSelector: selector})
 	if err != nil {
 		return 0, err
 	}