address more feedback on PR

Author: labrenbe

deploy/helm/opensearch-operator/configs/properties.yaml

@@ -0,0 +1,5 @@
+---
+version: 0.1.0
+spec:
+  units: []
+properties: []

docs/modules/opensearch/pages/usage-guide/keystore.adoc

@@ -22,10 +22,7 @@ spec:
       secretKeyRef:
         name: s3-credentials
         key: secretKey
-  nodes:
-    roleGroups:
-      default:
-        replicas: 1
+...
 ---
 apiVersion: v1
 kind: Secret

rust/operator-binary/src/controller.rs

@@ -385,16 +385,13 @@ mod tests {
     use super::{Context, OpenSearchRoleGroupConfig, ValidatedCluster, ValidatedLogging};
     use crate::{
         controller::{OpenSearchNodeResources, ValidatedOpenSearchConfig},
-        crd::{
-            NodeRoles, OpenSearchKeystoreKey,
-            v1alpha1::{self, OpenSearchKeystore, SecretKeyRef},
-        },
+        crd::{NodeRoles, v1alpha1},
         framework::{
             builder::pod::container::EnvVarSet,
             product_logging::framework::ValidatedContainerLogConfigChoice,
             role_utils::GenericProductSpecificCommonConfig,
             types::{
-                kubernetes::{ListenerClassName, NamespaceName, SecretKey, SecretName},
+                kubernetes::{ListenerClassName, NamespaceName},
                 operator::{ClusterName, OperatorName, ProductVersion, RoleGroupName},
             },
         },
@@ -507,13 +504,7 @@ mod tests {
                 ),
             ]
             .into(),
-            vec![OpenSearchKeystore {
-                key: OpenSearchKeystoreKey::from_str_unsafe("Keystore1"),
-                secret_key_ref: SecretKeyRef {
-                    name: SecretName::from_str_unsafe("my-keystore-secret"),
-                    key: SecretKey::from_str_unsafe("my-keystore-file"),
-                },
-            }],
+            vec![],
         )
     }
 

rust/operator-binary/src/controller/build.rs

@@ -77,12 +77,12 @@ mod tests {
             ContextNames, OpenSearchNodeResources, OpenSearchRoleGroupConfig, ValidatedCluster,
             ValidatedContainerLogConfigChoice, ValidatedLogging, ValidatedOpenSearchConfig,
         },
-        crd::{NodeRoles, OpenSearchKeystoreKey, v1alpha1},
+        crd::{NodeRoles, v1alpha1},
         framework::{
             builder::pod::container::EnvVarSet,
             role_utils::GenericProductSpecificCommonConfig,
             types::{
-                kubernetes::{ListenerClassName, NamespaceName, SecretKey, SecretName},
+                kubernetes::{ListenerClassName, NamespaceName},
                 operator::{
                     ClusterName, ControllerName, OperatorName, ProductName, ProductVersion,
                     RoleGroupName,
@@ -197,13 +197,7 @@ mod tests {
                 ),
             ]
             .into(),
-            vec![v1alpha1::OpenSearchKeystore {
-                key: OpenSearchKeystoreKey::from_str_unsafe("Keystore1"),
-                secret_key_ref: v1alpha1::SecretKeyRef {
-                    name: SecretName::from_str_unsafe("my-keystore-secret"),
-                    key: SecretKey::from_str_unsafe("my-keystore-file"),
-                },
-            }],
+            vec![],
         )
     }
 

tests/templates/kuttl/backup-restore/11_minio-values.yaml

@@ -36,8 +36,8 @@ provisioning:
   extraCommands:
     - >-
       mc admin user svcacct add
-      --access-key "$(cat /tmp/s3-credentials/s3.client.default.access_key)"
-      --secret-key "$(cat /tmp/s3-credentials/s3.client.default.secret_key)"
+      --access-key "$(cat /tmp/s3-credentials/ACCESS_KEY)"
+      --secret-key "$(cat /tmp/s3-credentials/SECRET_KEY)"
       provisioning integrationtest
   extraVolumeMounts:
     - name: s3-credentials

tests/templates/kuttl/backup-restore/31-backup-security-indices.yaml.j2

@@ -53,12 +53,12 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: s3-credentials
-                  key: s3.client.default.access_key
+                  key: ACCESS_KEY
             - name: S3_SECRET_KEY
               valueFrom:
                 secretKeyRef:
                   name: s3-credentials
-                  key: s3.client.default.secret_key
+                  key: SECRET_KEY
           volumeMounts:
             - name: scripts
               mountPath: /root/scripts

tests/templates/kuttl/backup-restore/51-install-opensearch-2.yaml.j2

@@ -10,8 +10,17 @@ spec:
 {% endif %}
     productVersion: "{{ test_scenario['values']['opensearch'].split(',')[0] }}"
     pullPolicy: IfNotPresent
-{% if lookup('env', 'VECTOR_AGGREGATOR') %}
   clusterConfig:
+    keystore:
+    - key: s3.client.default.access_key
+      secretKeyRef:
+        name: s3-credentials
+        key: ACCESS_KEY
+    - key: s3.client.default.secret_key
+      secretKeyRef:
+        name: s3-credentials
+        key: SECRET_KEY
+{% if lookup('env', 'VECTOR_AGGREGATOR') %}
     vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
   nodes:
@@ -50,34 +59,6 @@ spec:
     podOverrides:
       spec:
         initContainers:
-          - name: init-keystore
-{% if test_scenario['values']['opensearch'].find(",") > 0 %}
-            image: "{{ test_scenario['values']['opensearch'].split(',')[1] }}"
-{% else %}
-            image: oci.stackable.tech/sdp/opensearch:{{ test_scenario['values']['opensearch'].split(',')[0] }}-stackable{{ test_scenario['values']['release'] }}
-{% endif %}
-            command:
-              - /bin/bash
-              - -euxo
-              - pipefail
-              - -c
-            args:
-              - |
-                bin/opensearch-keystore create
-
-                for i in keystore-secrets/*; do
-                  key=$(basename $i)
-                  bin/opensearch-keystore add-file "$key" "$i"
-                done
-
-                cp --archive config/opensearch.keystore initialized-keystore
-            volumeMounts:
-              - name: keystore
-                mountPath: /stackable/opensearch/initialized-keystore
-                readOnly: false
-              - name: keystore-secrets
-                mountPath: /stackable/opensearch/keystore-secrets
-                readOnly: true
           - name: init-system-keystore
 {% if test_scenario['values']['opensearch'].find(",") > 0 %}
             image: "{{ test_scenario['values']['opensearch'].split(',')[1] }}"

tests/templates/kuttl/backup-restore/60-restore-security-indices.yaml.j2

@@ -16,12 +16,12 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: s3-credentials
-                  key: s3.client.default.access_key
+                  key: ACCESS_KEY
             - name: S3_SECRET_KEY
               valueFrom:
                 secretKeyRef:
                   name: s3-credentials
-                  key: s3.client.default.secret_key
+                  key: SECRET_KEY
           volumeMounts:
             - name: scripts
               mountPath: /root/scripts