Add Crossplane namespace input

This input is needed for the comp function to determine the right Crossplane namespace. This is important for various things, like proper netpols for the providers, to be able to connect to the instance.
vshn · Nov 7, 2024 · c1f56cd · c1f56cd
1 parent 82fb28d
commit c1f56cd
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 1 deletion.
diff --git a/class/defaults.yml b/class/defaults.yml
@@ -524,7 +524,6 @@ parameters:
           additionalInputs:
             # Depending on the cluster, this needs to be set
             loadbalancerAnnotations: ""
-            crossplaneNamespace: ${appcat:crossplane:namespace}
           grpcEndpoint: ${appcat:grpcEndpoint}
           proxyFunction: ${appcat:proxyFunction}
           enableNetworkPolicy: true

diff --git a/component/vshn_appcat_services.jsonnet b/component/vshn_appcat_services.jsonnet
@@ -112,6 +112,7 @@ local vshn_appcat_service(name, serviceParams) =
                         ownerGroup: xrd.spec.group,
                         ownerVersion: xrd.spec.versions[0].name,
                         salesOrder: if appuioManaged then std.toString(params.billing.salesOrder) else '',
+                        crossplaneNamespace: params.crossplane.namespace,
                       } + common.EmailAlerting(params.services.emailAlerting)
                       + restoreSA
                       + additonalInputs

diff --git a/component/vshn_postgres.jsonnet b/component/vshn_postgres.jsonnet
@@ -222,6 +222,7 @@ local composition =
                       isOpenshift: std.toString(isOpenshift),
                       sliNamespace: params.slos.namespace,
                       salesOrder: if appuioManaged then std.toString(params.billing.salesOrder) else '',
+                      crossplaneNamespace: params.crossplane.namespace,
                     } + std.get(pgParams, 'additionalInputs', default={}, inc_hidden=true)
                     + common.EmailAlerting(params.services.emailAlerting)
                     + if pgParams.proxyFunction then {

diff --git a/component/vshn_redis.jsonnet b/component/vshn_redis.jsonnet
@@ -489,6 +489,7 @@ local composition =
                       isOpenshift: std.toString(isOpenshift),
                       sliNamespace: params.slos.namespace,
                       salesOrder: if appuioManaged then std.toString(params.billing.salesOrder) else '',
+                      crossplaneNamespace: params.crossplane.namespace,
                     } + common.EmailAlerting(params.services.emailAlerting)
                     + if redisParams.proxyFunction then {
                       proxyEndpoint: redisParams.grpcEndpoint,

diff --git a/tests/golden/minio/appcat/appcat/21_composition_vshn_minio.yaml b/tests/golden/minio/appcat/appcat/21_composition_vshn_minio.yaml
@@ -31,6 +31,7 @@ spec:
           chartRepository: https://charts.min.io
           chartVersion: 5.0.13
           controlNamespace: syn-appcat-control
+          crossplaneNamespace: syn-crossplane
           defaultPlan: standard-1
           emailAlertingEnabled: 'true'
           emailAlertingSecretName: mailgun-smtp-credentials

diff --git a/tests/golden/openshift/appcat/appcat/21_composition_vshn_redis.yaml b/tests/golden/openshift/appcat/appcat/21_composition_vshn_redis.yaml
@@ -563,6 +563,7 @@ spec:
         data:
           bucketRegion: lpg
           controlNamespace: syn-appcat-control
+          crossplaneNamespace: syn-crossplane
           emailAlertingEnabled: 'false'
           emailAlertingSecretName: mailgun-smtp-credentials
           emailAlertingSecretNamespace: syn-appcat

diff --git a/tests/golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml b/tests/golden/vshn/appcat/appcat/21_composition_vshn_keycloak.yaml
@@ -31,6 +31,7 @@ spec:
           chartRepository: https://codecentric.github.io/helm-charts
           chartVersion: 2.4.3
           controlNamespace: syn-appcat-control
+          crossplaneNamespace: syn-crossplane
           defaultPlan: standard-2
           emailAlertingEnabled: 'true'
           emailAlertingSecretName: mailgun-smtp-credentials

diff --git a/tests/golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml b/tests/golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml
@@ -31,6 +31,7 @@ spec:
           chartRepository: https://charts.bitnami.com/bitnami
           chartVersion: 14.0.10
           controlNamespace: syn-appcat-control
+          crossplaneNamespace: syn-crossplane
           defaultPlan: standard-1
           emailAlertingEnabled: 'true'
           emailAlertingSecretName: mailgun-smtp-credentials

diff --git a/tests/golden/vshn/appcat/appcat/21_composition_vshn_nextcloud.yaml b/tests/golden/vshn/appcat/appcat/21_composition_vshn_nextcloud.yaml
@@ -31,6 +31,7 @@ spec:
           chartRepository: https://nextcloud.github.io/helm/
           chartVersion: 5.0.0
           controlNamespace: syn-appcat-control
+          crossplaneNamespace: syn-crossplane
           defaultPlan: standard-2
           emailAlertingEnabled: 'true'
           emailAlertingSecretName: mailgun-smtp-credentials

diff --git a/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml b/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml
@@ -589,6 +589,7 @@ spec:
         data:
           bucketRegion: lpg
           controlNamespace: syn-appcat-control
+          crossplaneNamespace: syn-crossplane
           emailAlertingEnabled: 'true'
           emailAlertingSecretName: mailgun-smtp-credentials
           emailAlertingSecretNamespace: syn-appcat