apply PR suggestions

vshn · Mar 15, 2024 · e262a16 · e262a16
1 parent c1ec674
commit e262a16
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 15 deletions.
diff --git a/component/component/vshn_postgres.jsonnet b/component/component/vshn_postgres.jsonnet
@@ -424,12 +424,6 @@ local sgCluster = {
                   },
                   postgres: {
                     version: '',
-                    extensions: [
-                      {
-                        name: 'pg_repack',
-                        version: '1.5.0',
-                      },
-                    ],
                     ssl: {
                       enabled: true,
                       certificateSecretKeySelector: {

diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml
@@ -386,9 +386,6 @@ spec:
                         resources:
                           enableClusterLimitsRequirements: true
                       postgres:
-                        extensions:
-                          - name: pg_repack
-                            version: 1.5.0
                         ssl:
                           certificateSecretKeySelector:
                             key: tls.crt

diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgresrestore.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgresrestore.yaml
@@ -467,9 +467,6 @@ spec:
                         resources:
                           enableClusterLimitsRequirements: true
                       postgres:
-                        extensions:
-                          - name: pg_repack
-                            version: 1.5.0
                         ssl:
                           certificateSecretKeySelector:
                             key: tls.crt

diff --git a/tests/e2e/keycloak/01-connect.yaml b/tests/e2e/keycloak/01-connect.yaml
@@ -12,10 +12,10 @@ spec:
       restartPolicy: Never
       containers:
         - name: connect
-          image: docker.io/appuio/oc:v4.14
+          image: curlimages/curl:8.6.0
           imagePullPolicy: IfNotPresent
           command:
-            - bash
+            - /bin/sh
           args:
             - -c
             - echo "Testing health...\n" && sleep 30 && curl -ivv http://$KEYCLOAK_HOST/health

diff --git a/tests/e2e/kuttl-test.yaml b/tests/e2e/kuttl-test.yaml
@@ -2,4 +2,4 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestSuite
 testDirs:
   - ./test/e2e/
-namespace: widera-testing
+namespace: schedar-e2e
diff --git a/tests/tests.mk b/tests/tests.mk
@@ -14,12 +14,14 @@ $(kuttl_bin): | $(go_bin)
 
 .PHONY: .e2e-test
 e2e-test: $(kuttl_bin) ## Run e2e tests
+	@kubectl create namespace schedar-e2e || true
 	GOBIN=$(go_bin) $(kuttl_bin) test ./tests/e2e --config ./tests/e2e/kuttl-test.yaml --suppress-log=Events
 	@rm -f kubeconfig
 # kuttl leaves kubeconfig garbage: https://github.com/kudobuilder/kuttl/issues/297
 
 .PHONY: .run-single-e2e
 run-single-e2e:
+	@kubectl create namespace schedar-e2e || true
 	GOBIN=$(go_bin) $(kuttl_bin) test ./tests/e2e --config ./tests/e2e/kuttl-test.yaml --suppress-log=Events --test $(test)
 	@rm -f kubeconfig