address feedback on PR

Author: labrenbe

stacks/_templates/opensearch-dashboards.yaml

@@ -4,12 +4,12 @@ name: opensearch-dashboards
 repo:
   name: opensearch-dashboards
   url: https://opensearch-project.github.io/helm-charts
-version: 3.1.0
+version: {{ opensearchVersion }}
 options:
   opensearchHosts: https://opensearch:9200
   image:
     repository: oci.stackable.tech/sdp/opensearch-dashboards
-    tag: 3.1.0-stackable0.0.0-dev
+    tag: "{{ opensearchVersion }}-stackable{{ stackableReleaseVersion }}"
   labels:
     stackable.tech/vendor: Stackable
   service:
@@ -23,9 +23,8 @@ options:
       stackable.tech/vendor: Stackable
   opensearchAccount:
     secret: opensearch-dashboard-user
-  extraEnvs:
-    - name: OPEN_SEARCH_ADMIN_PASSWORD
-      valueFrom:
-        secretKeyRef:
-          name: opensearch-user
-          key: password
+  serviceAccount:
+    create: false
+    # Use the ServiceAccount of OpenSearch because its permissions are already configured to work on
+    # OpenShift.
+    name: opensearch-serviceaccount

stacks/logging/opensearch.yaml

@@ -4,7 +4,7 @@ metadata:
   name: opensearch
 spec:
   image:
-    productVersion: 3.1.0
+    productVersion: {{ opensearchVersion }}
     pullPolicy: IfNotPresent
   clusterConfig:
     vectorAggregatorConfigMapName: vector-aggregator-discovery
@@ -25,8 +25,7 @@ spec:
                   volumeClaimTemplate:
                     metadata:
                       annotations:
-                        secrets.stackable.tech/scope: node,pod,service=opensearch,service=opensearch-nodes-cluster-manager-headless
-    envOverrides:
+                        secrets.stackable.tech/scope: node,pod,service=opensearch,service=opensearch-nodes-default-headless
     configOverrides:
       opensearch.yml:
         # Disable memory mapping in this stack; If memory mapping were activated, the kernel setting
@@ -123,8 +122,6 @@ stringData:
         authz: {}
   internal_users.yml: |
     ---
-    # The hash value is a bcrypt hash and can be generated with plugin/tools/hash.sh
-
     _meta:
       type: internalusers
       config_version: 2

stacks/logging/setup-opensearch-dashboards.yaml

@@ -17,7 +17,6 @@ spec:
                   key: password
           command:
             - bash
-            - -x
             - -euo
             - pipefail
             - -c

stacks/stacks-v2.yaml

@@ -99,9 +99,12 @@ stacks:
       - name: openSearchDashboardPassword
         description: Password of OpenSearch Dashboard user
         default: kibanaserverkibanaserver
-      - name: setSysctlMaxMapCount
-        description: Wether an init-container should be used to increase 'sysctl -w vm.max_map_count'. This requires to spawn an init-container with runsAsUser 0 privileges, which some clusters prohibit. You can increase 'vm.max_map_count' on all of the kubernetes nodes manually and set this to 'false'.
-        default: "true"
+      - name: opensearchVersion
+        description: Version of OpenSearch and OpenSearch Dashboards to deploy
+        default: 3.1.0
+      - name: stackableReleaseVersion
+        description: The Stackable release to be used for the OpenSearch Dashboards image tag
+        default: 0.0.0-dev
   observability:
     description: >-
       An observability stack with auto-injection of the opentelemetry-collector sidecar to receive traces/logs/metrics via OTLP, and send them to Jaeger/Tempo/Loki.