test: adapt smoke test to logging changes

Author: maltesander

tests/templates/kuttl/smoke/30-assert.yaml.j2

@@ -408,12 +408,14 @@ spec:
           name: data
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
       - args:
-        - |
+        - |-
           mkdir --parents /stackable/log/_vector-state
           # Vector will ignore SIGTERM (as PID != 1) and must be shut down by writing a shutdown trigger file
-          vector --config /stackable/config/vector.yaml & vector_pid=$!
+          vector & vector_pid=$!
           if [ ! -f "/stackable/log/_vector/shutdown" ]; then
-            mkdir -p /stackable/log/_vector && inotifywait -qq --event create /stackable/log/_vector; fi
+          mkdir -p /stackable/log/_vector
+          inotifywait -qq --event create /stackable/log/_vector;
+          fi
           sleep 1
           kill $vector_pid
         command:
@@ -423,13 +425,31 @@ spec:
         - pipefail
         - -c
         env:
-        - name: VECTOR_LOG
-          value: info
+        - name: CLUSTER_NAME
+          value: hdfs
+        - name: DATA_DIR
+          value: /stackable/log/_vector-state
+        - name: LOG_DIR
+          value: /stackable/log
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: ROLE_GROUP_NAME
+          value: default
+        - name: ROLE_NAME
+          value: namenode
         - name: VECTOR_AGGREGATOR_ADDRESS
           valueFrom:
             configMapKeyRef:
               key: ADDRESS
               name: vector-aggregator-discovery
+        - name: VECTOR_CONFIG_YAML
+          value: /stackable/config/vector.yaml
+        - name: VECTOR_FILE_LOG_LEVEL
+          value: info
+        - name: VECTOR_LOG
+          value: info
         imagePullPolicy: IfNotPresent
         name: vector
         resources:
@@ -440,8 +460,10 @@ spec:
             cpu: 250m
             memory: 128Mi
         volumeMounts:
-        - mountPath: /stackable/config
+        - mountPath: /stackable/config/vector.yaml
           name: hdfs-config
+          readOnly: true
+          subPath: vector.yaml
         - mountPath: /stackable/log
           name: log
 {% endif %}

tests/templates/kuttl/smoke/31-assert.yaml.j2

@@ -6,6 +6,11 @@
 # envsubst expands only the listed shell variables ($NAMESPACE etc.),
 # leaving Hadoop ${env.FOO} references untouched.
 #
+# The static vector.yaml is parameterised with Vector env-var refs like ${NAMESPACE}
+# that must stay literal in the ConfigMap. Since envsubst '$NAMESPACE' would expand
+# both `$NAMESPACE` (the core-site DNS, which we DO want substituted) and the literal
+# `${NAMESPACE}` in vector.yaml, we temporarily mask the braces form around envsubst.
+#
 # kuttl runs script commands with sh, not bash, so process substitution
 # is unavailable. Temp files namespaced under $NAMESPACE are used for
 # diff output to avoid collisions when tests run concurrently.
@@ -17,7 +22,7 @@ commands:
   # ConfigMap data snapshot: hdfs-namenode-default
   #
   - script: |
-      envsubst '$NAMESPACE' < 31_configmap_hdfs-namenode-default.yaml > /tmp/$NAMESPACE-expected.yaml
+      sed 's/${NAMESPACE}/__VECTOR_NS__/g' 31_configmap_hdfs-namenode-default.yaml | envsubst '$NAMESPACE' | sed 's/__VECTOR_NS__/${NAMESPACE}/g' > /tmp/$NAMESPACE-expected.yaml
       kubectl -n $NAMESPACE get cm hdfs-namenode-default -o yaml | yq '.data' > /tmp/$NAMESPACE-actual.yaml
       if ! diff /tmp/$NAMESPACE-expected.yaml /tmp/$NAMESPACE-actual.yaml; then
         echo "ERROR: ConfigMap hdfs-namenode-default data drifted from snapshot."
@@ -32,7 +37,7 @@ commands:
 {% else %}
       export DATANODE_DATA_DIR='[DISK]/stackable/data/data/datanode'
 {% endif %}
-      envsubst '$NAMESPACE $DATANODE_DATA_DIR' < 31_configmap_hdfs-datanode-default.yaml > /tmp/$NAMESPACE-expected.yaml
+      sed 's/${NAMESPACE}/__VECTOR_NS__/g' 31_configmap_hdfs-datanode-default.yaml | envsubst '$NAMESPACE $DATANODE_DATA_DIR' | sed 's/__VECTOR_NS__/${NAMESPACE}/g' > /tmp/$NAMESPACE-expected.yaml
       kubectl -n $NAMESPACE get cm hdfs-datanode-default -o yaml | yq '.data' > /tmp/$NAMESPACE-actual.yaml
       if ! diff /tmp/$NAMESPACE-expected.yaml /tmp/$NAMESPACE-actual.yaml; then
         echo "ERROR: ConfigMap hdfs-datanode-default data drifted from snapshot."
@@ -42,7 +47,7 @@ commands:
   # ConfigMap data snapshot: hdfs-journalnode-default
   #
   - script: |
-      envsubst '$NAMESPACE' < 31_configmap_hdfs-journalnode-default.yaml > /tmp/$NAMESPACE-expected.yaml
+      sed 's/${NAMESPACE}/__VECTOR_NS__/g' 31_configmap_hdfs-journalnode-default.yaml | envsubst '$NAMESPACE' | sed 's/__VECTOR_NS__/${NAMESPACE}/g' > /tmp/$NAMESPACE-expected.yaml
       kubectl -n $NAMESPACE get cm hdfs-journalnode-default -o yaml | yq '.data' > /tmp/$NAMESPACE-actual.yaml
       if ! diff /tmp/$NAMESPACE-expected.yaml /tmp/$NAMESPACE-actual.yaml; then
         echo "ERROR: ConfigMap hdfs-journalnode-default data drifted from snapshot."