Adjust e2e component

vshn · Mar 27, 2024 · c7264ca · c7264ca
1 parent 389f4ca
commit c7264ca
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 17 deletions.
diff --git a/component/component/app.jsonnet b/component/component/app.jsonnet
@@ -3,7 +3,23 @@ local inv = kap.inventory();
 local params = inv.parameters.appcat;
 local argocd = import 'lib/argocd.libjsonnet';
 
-local app = argocd.App('appcat', '');
+local app = argocd.App('appcat', '') + (
+  if params.services.vshn.e2eTests then {
+    spec+: {
+      ignoreDifferences+: [
+        {
+          group: '',
+          jsonPointers: [
+            '/data',
+          ],
+          kind: 'Secret',
+          name: 'github-ci-secret',
+          namespace: 'appcat-e2e',
+        },
+      ],
+    },
+  } else {}
+);
 
 {
   appcat: app,

diff --git a/component/component/rbac_e2e.jsonnet b/component/component/rbac_e2e.jsonnet
@@ -7,12 +7,12 @@ local params = inv.parameters.appcat;
 local e2eNs = kube.Namespace('appcat-e2e') + {
   metadata+: {
     labels+: {
-      'appuio.io/organization': 'vshn-e2e-tests',
+      'appuio.io/organization': 'vshn',
     },
   },
 };
 
-local e2eSA = kube.ServiceAccount('appcat-e2e') + {
+local e2eSA = kube.ServiceAccount('github-ci') + {
   metadata+: {
     namespace: 'appcat-e2e',
   },
@@ -41,17 +41,17 @@ local e2eClusterRoleBinding = kube.ClusterRoleBinding('appcat:e2e') {
   subjects_: [ e2eSA ],
 };
 
-local e2eSAToken = kube.Secret('appcat-e2e-github') + {
+local e2eSAToken = kube.Secret('github-ci-secret') + {
   metadata+: {
     namespace: 'appcat-e2e',
     annotations+: {
-      'kubernetes.io/service-account.name': 'appcat-e2e',
+      'kubernetes.io/service-account.name': 'github-ci',
       'argocd.argoproj.io/compare-options': 'IgnoreExtraneous',
     },
   },
   type: 'kubernetes.io/service-account-token',
 };
 
 if params.services.vshn.e2eTests then {
-  '20_rbac_vshn_e2e_tests': [ e2eNs, e2eSA, e2eRoleBinding, e2eSAToken, e2eClusterRoleBinding, e2eClusterRole ],
+  '20_rbac_vshn_e2e_tests': [ e2eNs, e2eSA, e2eRoleBinding, e2eClusterRoleBinding, e2eClusterRole, e2eSAToken ],
 } else {}
diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_objectstorage_minio.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_objectstorage_minio.yaml
@@ -26,7 +26,6 @@ spec:
         apiVersion: v1
         data:
           providerConfig: minio
-          proxyEndpoint: host.docker.internal:9443
           serviceName: miniobucket
         kind: ConfigMap
         metadata:
@@ -64,7 +63,6 @@ spec:
         apiVersion: v1
         data:
           providerConfig: minio-cluster
-          proxyEndpoint: host.docker.internal:9443
           serviceName: miniobucket
         kind: ConfigMap
         metadata:

diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml
@@ -38,7 +38,6 @@ spec:
             true, "memory": "2Gi"}}, "standard-4": {"size": {"cpu": "1", "disk": "16Gi",
             "enabled": true, "memory": "4Gi"}}, "standard-8": {"size": {"cpu": "2",
             "disk": "16Gi", "enabled": true, "memory": "8Gi"}}}'
-          proxyEndpoint: host.docker.internal:9443
           quotasEnabled: 'false'
           registry_password: ''
           registry_username: ''

diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml
@@ -41,7 +41,6 @@ spec:
             {"size": {"cpu": "125m", "disk": "16Gi", "enabled": true, "memory": "512Mi"}},
             "standard-8": {"size": {"cpu": "2", "disk": "16Gi", "enabled": true, "memory":
             "8Gi"}}}'
-          proxyEndpoint: host.docker.internal:9443
           quotasEnabled: 'false'
           restoreSA: mariadbrestoreserviceaccount
           serviceName: mariadb

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
@@ -709,7 +709,6 @@ spec:
           emailAlertingSmtpUsername: [email protected]
           externalDatabaseConnectionsEnabled: 'true'
           imageTag: v4.61.0
-          proxyEndpoint: host.docker.internal:9443
           quotasEnabled: 'false'
           serviceName: postgresql
           sgNamespace: stackgres

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
@@ -811,7 +811,6 @@ spec:
           emailAlertingSmtpUsername: [email protected]
           externalDatabaseConnectionsEnabled: 'true'
           imageTag: v4.61.0
-          proxyEndpoint: host.docker.internal:9443
           quotasEnabled: 'false'
           serviceName: postgresql
           sgNamespace: stackgres

diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml
@@ -610,7 +610,6 @@ spec:
           emailAlertingSmtpUsername: [email protected]
           imageTag: v4.61.0
           maintenanceSA: helm-based-service-maintenance
-          proxyEndpoint: host.docker.internal:9443
           quotasEnabled: 'false'
           restoreSA: redisrestoreserviceaccount
           serviceName: redis

diff --git a/component/tests/vshn.yml b/component/tests/vshn.yml
@@ -21,7 +21,7 @@ parameters:
   appcat:
 
     grpcEndpoint: host.docker.internal:9443
-    proxyFunction: true
+    proxyFunction: false
 
     quotasEnabled: false
     appuioManaged: false

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: schedar-e2e
+namespace: appcat-e2e
diff --git a/tests/tests.mk b/tests/tests.mk
@@ -14,14 +14,14 @@ $(kuttl_bin): | $(go_bin)
 
 .PHONY: .e2e-test
 e2e-test: $(kuttl_bin) ## Run e2e tests
-	@kubectl create namespace schedar-e2e || true
+	@kubectl create namespace appcat-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
+	@kubectl create namespace appcat-e2e || true
 	GOBIN=$(go_bin) $(kuttl_bin) test ./tests/e2e --config ./tests/e2e/kuttl-test.yaml --suppress-log=Events --test $(test)
 	@rm -f kubeconfig