From 07e2e2e2eae6318e9e4afe7782d32cd446d475d0 Mon Sep 17 00:00:00 2001 From: Gabor Burges Date: Thu, 12 Dec 2024 18:44:01 +0100 Subject: [PATCH] Fix kuttl test --- config/clowder-config.json | 24 ++++++++++++++++++++++++ config/manager/kustomization.yaml | 4 ++-- tests/kuttl/test-sidecars/01-pods.yaml | 8 -------- tests/kuttl/test-sidecars/02-assert.yaml | 8 ++++++++ 4 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 config/clowder-config.json diff --git a/config/clowder-config.json b/config/clowder-config.json new file mode 100644 index 000000000..4f5c5bf7e --- /dev/null +++ b/config/clowder-config.json @@ -0,0 +1,24 @@ +{ + "debugOptions": { + "trigger": { + "diff": false + }, + "cache": { + "create": false, + "update": false, + "apply": false + }, + "pprof": { + "enable": true, + "cpuFile": "testcpu" + } + }, + "features": { + "createServiceMonitor": true, + "watchStrimziResources": true, + "enableKedaResources": true, + "reconciliationMetrics": true, + "enableExternalStrimzi": true, + "disableWebhooks": true + } +} \ No newline at end of file diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 3e9ed46ac..b8f0689c6 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -1,5 +1,5 @@ -resources: # - clowder_config.yaml +resources: - manager.yaml - metrics_service.yaml @@ -18,4 +18,4 @@ kind: Kustomization images: - name: controller newName: 127.0.0.1:5000/clowder - newTag: b7db066 + newTag: 839e9d729770dafd929c7959c5db634645ec55c2 diff --git a/tests/kuttl/test-sidecars/01-pods.yaml b/tests/kuttl/test-sidecars/01-pods.yaml index bd616df3c..432c5f7e1 100644 --- a/tests/kuttl/test-sidecars/01-pods.yaml +++ b/tests/kuttl/test-sidecars/01-pods.yaml @@ -46,14 +46,6 @@ spec: deployments: - name: processor podSpec: - volumeMounts: - - name: puptoo-otel-config - mountPath: "/etc/otelcol/config.yaml" - readOnly: true - volumes: - - name: puptoo-otel-config - configMap: - name: puptoo-otel-config image: quay.io/psav/clowder-hello sidecars: - name: token-refresher diff --git a/tests/kuttl/test-sidecars/02-assert.yaml b/tests/kuttl/test-sidecars/02-assert.yaml index d6db50451..78a017f98 100644 --- a/tests/kuttl/test-sidecars/02-assert.yaml +++ b/tests/kuttl/test-sidecars/02-assert.yaml @@ -23,3 +23,11 @@ spec: serviceAccountName: puptoo-processor containers: - name: puptoo-processor + volumeMounts: + - name: puptoo-otel-config + mountPath: "/etc/otelcol/config.yaml" + readOnly: true + volumes: + - name: puptoo-otel-config + configMap: + name: puptoo-otel-config