delete pod security policy, enable network explorer functional tests

omrozowicz-splunk · Oct 9, 2023 · 620cfc9 · 620cfc9
1 parent ed11bd9
commit 620cfc9
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 82 deletions.
diff --git a/.github/workflows/functional_test.yaml b/.github/workflows/functional_test.yaml
@@ -78,11 +78,6 @@ jobs:
         run: |
           make repo-update dep-build
           export CI_SPLUNK_HOST=$(kubectl get pod splunk --template={{.status.podIP}})
-          # TODO: Remove NETWORK_EXPLORER_ENABLED after https://github.com/signalfx/splunk-otel-collector-chart/issues/896
-          if [[ "$KUBERNETES_VERSION" == *1.24* ]]; then
-            echo "Detected Kubernetes version 1.24. Setting NETWORK_EXPLORER_ENABLED to true."
-            export NETWORK_EXPLORER_ENABLED=true
-          fi
           ci_scripts/deploy_collector.sh
 
       - name: Deploy log generator

diff --git a/ci_scripts/deploy_collector.sh b/ci_scripts/deploy_collector.sh
@@ -10,12 +10,10 @@ else
    helm delete $(helm ls --short)
 fi
 echo "Deploying Splunk OTel Collector for Kubernetes"
-# TODO: Remove networkExplorer.enabled after https://github.com/signalfx/splunk-otel-collector-chart/issues/896
 helm install ci-sck --set splunkPlatform.index=$CI_INDEX_EVENTS \
 --set splunkPlatform.metricsIndex=$CI_INDEX_METRICS \
 --set splunkPlatform.token=$CI_SPLUNK_HEC_TOKEN \
 --set splunkPlatform.endpoint=https://$CI_SPLUNK_HOST:8088/services/collector \
---set networkExplorer.enabled=${NETWORK_EXPLORER_ENABLED:-false} \
 -f ci_scripts/sck_otel_values.yaml helm-charts/splunk-otel-collector/
 #--set containerLogs.containerRuntime=$CONTAINER_RUNTIME \
 #wait for deployment to finish

diff --git a/ci_scripts/sck_otel_values.yaml b/ci_scripts/sck_otel_values.yaml
@@ -111,6 +111,5 @@ gateway:
       cpu: 300m
       memory: 300Mi
 
-# TODO: Enable this after https://github.com/signalfx/splunk-otel-collector-chart/issues/896
-#networkExplorer:
-#  enabled: false
+networkExplorer:
+  enabled: true
diff --git a/...work-explorer/rendered_manifests/network-explorer/kernel-collector-podsecuritypolicy.yaml b/...work-explorer/rendered_manifests/network-explorer/kernel-collector-podsecuritypolicy.yaml
diff --git a/.../splunk-otel-collector/templates/network-explorer/kernel-collector-podsecuritypolicy.yaml b/.../splunk-otel-collector/templates/network-explorer/kernel-collector-podsecuritypolicy.yaml