leaving default values for local execution, sed will match actual var…

…iables values
signalfx · Oct 10, 2024 · 0e7d565 · 0e7d565
1 parent dfc9c70
commit 0e7d565
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/functional_test.yaml b/.github/workflows/functional_test.yaml
@@ -75,9 +75,10 @@ jobs:
             sleep 1;
           done
           # set splunk version, hec_token, splunk password in k8s-splunk.yaml file
-          sed -i "s/ENV_SPLUNK_VERSION/${SPLUNK_VERSION}/g" ci_scripts/k8s-splunk.yml
-          sed -i "s/ENV_CI_SPLUNK_PASSWORD/${CI_SPLUNK_PASSWORD}/g" ci_scripts/k8s-splunk.yml
-          sed -i "s/ENV_CI_SPLUNK_HEC_TOKEN/${CI_SPLUNK_HEC_TOKEN}/g" ci_scripts/k8s-splunk.yml
+          sed -i "s/splunk:9.3.0/splunk:${SPLUNK_VERSION}/g" ci_scripts/k8s-splunk.yml
+          sed -i "s/value: helloworld/value: ${CI_SPLUNK_PASSWORD}/g" ci_scripts/k8s-splunk.yml
+          sed -i "s/value: 00000000-0000-0000-0000-0000000000000/value: ${CI_SPLUNK_HEC_TOKEN}/g" ci_scripts/k8s-splunk.yml
+          cat ci_scripts/k8s-splunk.yml
           # Install Splunk on minikube
           kubectl apply -f ci_scripts/k8s-splunk.yml
           # Wait until splunk is ready

diff --git a/ci_scripts/k8s-splunk.yml b/ci_scripts/k8s-splunk.yml
@@ -60,7 +60,7 @@ spec:
     runAsGroup: 0
   containers:
     - name: splunk
-      image: docker.io/splunk/splunk:ENV_SPLUNK_VERSION
+      image: docker.io/splunk/splunk:9.3.0
       ports:
         - name: web-interface
           containerPort: 8000
@@ -77,11 +77,11 @@ spec:
         - name: SPLUNK_USER
           value: root
         - name: SPLUNK_PASSWORD
-          value: ENV_CI_SPLUNK_PASSWORD
+          value: helloworld
         - name: SPLUNK_LAUNCH_CONF
           value: OPTIMISTIC_ABOUT_FILE_LOCKING=1
         - name: SPLUNK_HEC_TOKEN
-          value: ENV_CI_SPLUNK_HEC_TOKEN
+          value: 00000000-0000-0000-0000-0000000000000
       volumeMounts:
         - name: config-volume
           mountPath: /tmp/defaults/