From 44c7c4f9ff2858b7a05f58fc727efe44ca1f91b9 Mon Sep 17 00:00:00 2001 From: pszkamruk-splunk <75434853+pszkamruk-splunk@users.noreply.github.com> Date: Thu, 10 Oct 2024 16:03:24 +0200 Subject: [PATCH] Testing: Adding splunk matrix (#1493) * updated k8s and splunk matrix * removing k8s update * adding splunk 8.2.9, setting hardoced values: hec, splunk_pass * adding splunk version to job name * minor update * leaving default values for local execution, sed will match actual variables values --- .github/workflows/functional_test.yaml | 11 ++++++++++- ci_scripts/k8s-splunk.yml | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/functional_test.yaml b/.github/workflows/functional_test.yaml index da585c739b..729c64c288 100644 --- a/.github/workflows/functional_test.yaml +++ b/.github/workflows/functional_test.yaml @@ -5,7 +5,7 @@ on: jobs: functional-test: - name: Kubernetes ${{ matrix.kubernetes_version }} ${{ matrix.container_runtime }} + name: K8s ${{ matrix.kubernetes_version }} ${{ matrix.container_runtime }}, Splunk ${{ matrix.splunk_version }} runs-on: ubuntu-20.04 strategy: fail-fast: false @@ -24,6 +24,9 @@ jobs: - "docker" - "containerd" - "cri-o" + splunk_version: + - 9.3.0 + - 8.2.9 env: CI_SPLUNK_PORT: 8089 CI_SPLUNK_USERNAME: admin @@ -33,6 +36,7 @@ jobs: CI_INDEX_METRICS: ci_metrics CONTAINER_RUNTIME: ${{ matrix.container_runtime }} KUBERNETES_VERSION: ${{ matrix.kubernetes_version }} + SPLUNK_VERSION: ${{ matrix.splunk_version }} MINIKUBE_VERSION: latest steps: @@ -70,6 +74,11 @@ jobs: until kubectl -n default get serviceaccount default -o name; do sleep 1; done + # set splunk version, hec_token, splunk password in k8s-splunk.yaml file + 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 index 3cd697ea5f..0287fcf1f0 100644 --- 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:8.2.0 + image: docker.io/splunk/splunk:9.3.0 ports: - name: web-interface containerPort: 8000