diff --git a/class/defaults.yml b/class/defaults.yml index 5e690caa2..3308b422a 100644 --- a/class/defaults.yml +++ b/class/defaults.yml @@ -67,7 +67,7 @@ parameters: appcat: registry: ghcr.io repository: vshn/appcat - tag: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + tag: e2e-split functionAppcat: registry: ${appcat:images:appcat:registry} repository: ${appcat:images:appcat:repository} diff --git a/tests/golden/control-plane/appcat/appcat/10_function_appcat.yaml b/tests/golden/control-plane/appcat/appcat/10_function_appcat.yaml index 68128b5bd..e252da224 100644 --- a/tests/golden/control-plane/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/control-plane/appcat/appcat/10_function_appcat.yaml @@ -4,9 +4,9 @@ metadata: annotations: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true argocd.argoproj.io/sync-wave: '-40' - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split spec: - package: ghcr.io/vshn/appcat:c042c42b2fbede4e099ffcd6a4e3f945f7b214d2-func + package: ghcr.io/vshn/appcat:e2e-split-func packagePullPolicy: IfNotPresent runtimeConfigRef: name: function-appcat diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_objectstorage_minio.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_objectstorage_minio.yaml index f1ecb4e1b..91dc0dfc8 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_objectstorage_minio.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_objectstorage_minio.yaml @@ -21,7 +21,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split input: apiVersion: v1 data: diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_codey.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_codey.yaml index 3ad301761..fa7ec545f 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_codey.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_codey.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + metadata.appcat.vshn.io/revision: master-e2e-split metadata.appcat.vshn.io/serviceID: vshn-codey name: codey.io name: codey.io diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_forgejo.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_forgejo.yaml index 58eeefffe..c45790852 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_forgejo.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_forgejo.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + metadata.appcat.vshn.io/revision: master-e2e-split metadata.appcat.vshn.io/serviceID: vshn-forgejo name: vshnforgejo.vshn.appcat.vshn.io name: vshnforgejo.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split input: apiVersion: v1 data: @@ -43,7 +43,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: code.forgejo.org - imageTag: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + imageTag: e2e-split ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-production isOpenshift: 'false' diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_keycloak.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_keycloak.yaml index a68e505ab..9f6ae8a68 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_keycloak.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_keycloak.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + metadata.appcat.vshn.io/revision: master-e2e-split metadata.appcat.vshn.io/serviceID: vshn-keycloak name: vshnkeycloak.vshn.appcat.vshn.io name: vshnkeycloak.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split input: apiVersion: v1 data: @@ -43,7 +43,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed - imageTag: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + imageTag: e2e-split ingress_annotations: | nginx.ingress.kubernetes.io/backend-protocol: HTTPS cert-manager.io/cluster-issuer: letsencrypt-staging diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_mariadb.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_mariadb.yaml index 5d96ff128..c0361f24e 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_mariadb.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_mariadb.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + metadata.appcat.vshn.io/revision: master-e2e-split metadata.appcat.vshn.io/serviceID: vshn-mariadb name: vshnmariadb.vshn.appcat.vshn.io name: vshnmariadb.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split input: apiVersion: v1 data: @@ -43,7 +43,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io imageRepositoryPrefix: bitnamilegacy - imageTag: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + imageTag: e2e-split isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance maintenanceURL: https://hub.docker.com/v2/repositories/bitnamilegacy/mariadb-galera/tags/?page_size=100 diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_nextcloud.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_nextcloud.yaml index c78743a0b..dc3d352a2 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_nextcloud.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_nextcloud.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + metadata.appcat.vshn.io/revision: master-e2e-split metadata.appcat.vshn.io/serviceID: vshn-nextcloud name: vshnnextcloud.vshn.appcat.vshn.io name: vshnnextcloud.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io - imageTag: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + imageTag: e2e-split ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-staging nginx.ingress.kubernetes.io/enable-cors: "true" diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgres.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgres.yaml index 1c1902350..23c07a3ce 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgres.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgres.yaml @@ -15,7 +15,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + metadata.appcat.vshn.io/revision: master-e2e-split metadata.appcat.vshn.io/serviceID: vshn-postgresql name: vshnpostgres.vshn.appcat.vshn.io name: vshnpostgres.vshn.appcat.vshn.io @@ -26,7 +26,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split input: apiVersion: v1 data: @@ -43,7 +43,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + imageTag: e2e-split initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m", "memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile": {"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m", diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_redis.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_redis.yaml index 9e911cb17..b0e8d9a10 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_redis.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_redis.yaml @@ -17,7 +17,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + metadata.appcat.vshn.io/revision: master-e2e-split metadata.appcat.vshn.io/serviceID: vshn-redis name: vshnredis.vshn.appcat.vshn.io name: vshnredis.vshn.appcat.vshn.io @@ -28,7 +28,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split input: apiVersion: v1 data: @@ -47,7 +47,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io imageRepositoryPrefix: bitnamilegacy - imageTag: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + imageTag: e2e-split isOpenshift: 'false' kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15 maintenanceSA: helm-based-service-maintenance diff --git a/tests/golden/control-plane/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/control-plane/appcat/appcat/apiserver/30_deployment.yaml index f2a84ff85..e4ebd2207 100644 --- a/tests/golden/control-plane/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/control-plane/appcat/appcat/apiserver/30_deployment.yaml @@ -31,7 +31,7 @@ spec: - --secure-port=9443 - --tls-cert-file=/apiserver.local.config/certificates/tls.crt - --tls-private-key-file=/apiserver.local.config/certificates/tls.key - image: ghcr.io/vshn/appcat:c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + image: ghcr.io/vshn/appcat:e2e-split imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/golden/control-plane/appcat/appcat/controllers/appcat/10_cluster_role.yaml b/tests/golden/control-plane/appcat/appcat/controllers/appcat/10_cluster_role.yaml index 0a3a5eacc..289b8a0c9 100644 --- a/tests/golden/control-plane/appcat/appcat/controllers/appcat/10_cluster_role.yaml +++ b/tests/golden/control-plane/appcat/appcat/controllers/appcat/10_cluster_role.yaml @@ -93,3 +93,15 @@ rules: - patch - update - watch + - apiGroups: + - cloudscale.crossplane.io + - kubernetes.crossplane.io + - helm.crossplane.io + - minio.crossplane.io + - postgresql.sql.crossplane.io + resources: + - providerconfigs + verbs: + - get + - list + - watch diff --git a/tests/golden/control-plane/appcat/appcat/controllers/appcat/30_deployment.yaml b/tests/golden/control-plane/appcat/appcat/controllers/appcat/30_deployment.yaml index a7f4c694b..30b9afe84 100644 --- a/tests/golden/control-plane/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/control-plane/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -27,7 +27,7 @@ spec: env: - name: PLANS_NAMESPACE value: syn-appcat - image: ghcr.io/vshn/appcat:c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + image: ghcr.io/vshn/appcat:e2e-split imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/golden/control-plane/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml b/tests/golden/control-plane/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml index d4b18f2d7..c8dcc9832 100644 --- a/tests/golden/control-plane/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml +++ b/tests/golden/control-plane/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - function-revision: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + function-revision: e2e-split labels: app: crossplane app.kubernetes.io/component: cloud-infrastructure-controller diff --git a/tests/golden/control-plane/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml b/tests/golden/control-plane/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml index 2fc5832dc..3a13d6c45 100644 --- a/tests/golden/control-plane/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml +++ b/tests/golden/control-plane/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - function-revision: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + function-revision: e2e-split labels: app: crossplane-rbac-manager app.kubernetes.io/component: cloud-infrastructure-controller diff --git a/tests/golden/control-plane/appcat/appcat/sla_reporter/01_cronjob.yaml b/tests/golden/control-plane/appcat/appcat/sla_reporter/01_cronjob.yaml index 703195724..a19a51c11 100644 --- a/tests/golden/control-plane/appcat/appcat/sla_reporter/01_cronjob.yaml +++ b/tests/golden/control-plane/appcat/appcat/sla_reporter/01_cronjob.yaml @@ -30,7 +30,7 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds - image: ghcr.io/vshn/appcat:c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + image: ghcr.io/vshn/appcat:e2e-split name: sla-reporter resources: limits: diff --git a/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml b/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml index 68128b5bd..e252da224 100644 --- a/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml @@ -4,9 +4,9 @@ metadata: annotations: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true argocd.argoproj.io/sync-wave: '-40' - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split spec: - package: ghcr.io/vshn/appcat:c042c42b2fbede4e099ffcd6a4e3f945f7b214d2-func + package: ghcr.io/vshn/appcat:e2e-split-func packagePullPolicy: IfNotPresent runtimeConfigRef: name: function-appcat diff --git a/tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml index b7be9e149..a9b267fe9 100644 --- a/tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml @@ -31,7 +31,7 @@ spec: - --secure-port=9443 - --tls-cert-file=/apiserver.local.config/certificates/tls.crt - --tls-private-key-file=/apiserver.local.config/certificates/tls.key - image: ghcr.io/vshn/appcat:c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + image: ghcr.io/vshn/appcat:e2e-split imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/golden/defaults/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml b/tests/golden/defaults/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml index d4b18f2d7..c8dcc9832 100644 --- a/tests/golden/defaults/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml +++ b/tests/golden/defaults/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - function-revision: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + function-revision: e2e-split labels: app: crossplane app.kubernetes.io/component: cloud-infrastructure-controller diff --git a/tests/golden/defaults/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml b/tests/golden/defaults/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml index 2fc5832dc..3a13d6c45 100644 --- a/tests/golden/defaults/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml +++ b/tests/golden/defaults/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - function-revision: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + function-revision: e2e-split labels: app: crossplane-rbac-manager app.kubernetes.io/component: cloud-infrastructure-controller diff --git a/tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index d3447f06f..144f87a8a 100644 --- a/tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/defaults/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -25,7 +25,7 @@ spec: - --health-probe-bind-address=:8081 - --metrics-bind-address=127.0.0.1:8080 env: [] - image: ghcr.io/vshn/appcat:c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + image: ghcr.io/vshn/appcat:e2e-split imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/golden/dev/appcat/appcat/10_function_appcat.yaml b/tests/golden/dev/appcat/appcat/10_function_appcat.yaml index 9cde309be..5c0e03e6c 100644 --- a/tests/golden/dev/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/dev/appcat/appcat/10_function_appcat.yaml @@ -4,9 +4,9 @@ metadata: annotations: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true argocd.argoproj.io/sync-wave: '-40' - name: function-appcat-debug-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-debug-e2e-split spec: - package: ghcr.io/vshn/appcat:c042c42b2fbede4e099ffcd6a4e3f945f7b214d2-func + package: ghcr.io/vshn/appcat:e2e-split-func packagePullPolicy: Always runtimeConfigRef: name: enable-proxy diff --git a/tests/golden/dev/appcat/appcat/21_composition_objectstorage_minio.yaml b/tests/golden/dev/appcat/appcat/21_composition_objectstorage_minio.yaml index a810ef370..880862606 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_objectstorage_minio.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_objectstorage_minio.yaml @@ -21,7 +21,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-debug-e2e-split input: apiVersion: v1 data: diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_codey.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_codey.yaml index 2c25e2faa..479c5ea15 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_codey.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_codey.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: lpg labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: debug-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + metadata.appcat.vshn.io/revision: debug-e2e-split metadata.appcat.vshn.io/serviceID: vshn-codey name: codey.io name: codey.io diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_forgejo.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_forgejo.yaml index 470da9fac..a1544f5bb 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_forgejo.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_forgejo.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: lpg labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: debug-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + metadata.appcat.vshn.io/revision: debug-e2e-split metadata.appcat.vshn.io/serviceID: vshn-forgejo name: vshnforgejo.vshn.appcat.vshn.io name: vshnforgejo.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-debug-e2e-split input: apiVersion: v1 data: @@ -43,7 +43,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: code.forgejo.org - imageTag: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + imageTag: e2e-split ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-production isOpenshift: 'false' diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_keycloak.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_keycloak.yaml index ad7d0394d..d18dbd577 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_keycloak.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_keycloak.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: lpg labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: debug-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + metadata.appcat.vshn.io/revision: debug-e2e-split metadata.appcat.vshn.io/serviceID: vshn-keycloak name: vshnkeycloak.vshn.appcat.vshn.io name: vshnkeycloak.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-debug-e2e-split input: apiVersion: v1 data: @@ -43,7 +43,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed - imageTag: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + imageTag: e2e-split ingress_annotations: | nginx.ingress.kubernetes.io/backend-protocol: HTTPS cert-manager.io/cluster-issuer: letsencrypt-staging diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_mariadb.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_mariadb.yaml index 1054557dd..461864802 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_mariadb.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_mariadb.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: lpg labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: debug-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + metadata.appcat.vshn.io/revision: debug-e2e-split metadata.appcat.vshn.io/serviceID: vshn-mariadb name: vshnmariadb.vshn.appcat.vshn.io name: vshnmariadb.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-debug-e2e-split input: apiVersion: v1 data: @@ -43,7 +43,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io imageRepositoryPrefix: bitnamilegacy - imageTag: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + imageTag: e2e-split isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance maintenanceURL: https://hub.docker.com/v2/repositories/bitnamilegacy/mariadb-galera/tags/?page_size=100 diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_nextcloud.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_nextcloud.yaml index a2db84b22..d9a04d236 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_nextcloud.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_nextcloud.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: lpg labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: debug-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + metadata.appcat.vshn.io/revision: debug-e2e-split metadata.appcat.vshn.io/serviceID: vshn-nextcloud name: vshnnextcloud.vshn.appcat.vshn.io name: vshnnextcloud.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-debug-e2e-split input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net - imageTag: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + imageTag: e2e-split ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-staging isOpenshift: 'false' diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_postgres.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_postgres.yaml index 08cfd68c4..9ff85514b 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_postgres.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_postgres.yaml @@ -15,7 +15,7 @@ metadata: metadata.appcat.vshn.io/zone: lpg labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: debug-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + metadata.appcat.vshn.io/revision: debug-e2e-split metadata.appcat.vshn.io/serviceID: vshn-postgresql name: vshnpostgres.vshn.appcat.vshn.io name: vshnpostgres.vshn.appcat.vshn.io @@ -26,7 +26,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-debug-e2e-split input: apiVersion: v1 data: @@ -43,7 +43,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + imageTag: e2e-split initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m", "memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile": {"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m", diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_redis.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_redis.yaml index e70c7b12a..c16180716 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_redis.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_redis.yaml @@ -17,7 +17,7 @@ metadata: metadata.appcat.vshn.io/zone: lpg labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: debug-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + metadata.appcat.vshn.io/revision: debug-e2e-split metadata.appcat.vshn.io/serviceID: vshn-redis name: vshnredis.vshn.appcat.vshn.io name: vshnredis.vshn.appcat.vshn.io @@ -28,7 +28,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-debug-e2e-split input: apiVersion: v1 data: @@ -47,7 +47,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io imageRepositoryPrefix: bitnamilegacy - imageTag: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + imageTag: e2e-split isOpenshift: 'false' kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15 maintenanceSA: helm-based-service-maintenance diff --git a/tests/golden/dev/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/dev/appcat/appcat/apiserver/30_deployment.yaml index 3af67a22f..9557eccfc 100644 --- a/tests/golden/dev/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/dev/appcat/appcat/apiserver/30_deployment.yaml @@ -31,7 +31,7 @@ spec: - --secure-port=9443 - --tls-cert-file=/apiserver.local.config/certificates/tls.crt - --tls-private-key-file=/apiserver.local.config/certificates/tls.key - image: ghcr.io/vshn/appcat:c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + image: ghcr.io/vshn/appcat:e2e-split imagePullPolicy: Always livenessProbe: failureThreshold: 3 diff --git a/tests/golden/dev/appcat/appcat/controllers/appcat/10_cluster_role.yaml b/tests/golden/dev/appcat/appcat/controllers/appcat/10_cluster_role.yaml index 0a3a5eacc..289b8a0c9 100644 --- a/tests/golden/dev/appcat/appcat/controllers/appcat/10_cluster_role.yaml +++ b/tests/golden/dev/appcat/appcat/controllers/appcat/10_cluster_role.yaml @@ -93,3 +93,15 @@ rules: - patch - update - watch + - apiGroups: + - cloudscale.crossplane.io + - kubernetes.crossplane.io + - helm.crossplane.io + - minio.crossplane.io + - postgresql.sql.crossplane.io + resources: + - providerconfigs + verbs: + - get + - list + - watch diff --git a/tests/golden/dev/appcat/appcat/controllers/appcat/30_deployment.yaml b/tests/golden/dev/appcat/appcat/controllers/appcat/30_deployment.yaml index 7a061750b..4b68320a5 100644 --- a/tests/golden/dev/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/dev/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -27,7 +27,7 @@ spec: env: - name: PLANS_NAMESPACE value: syn-appcat - image: ghcr.io/vshn/appcat:c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + image: ghcr.io/vshn/appcat:e2e-split imagePullPolicy: Always livenessProbe: httpGet: diff --git a/tests/golden/dev/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml b/tests/golden/dev/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml index bd8daf73e..f76a6f7a6 100644 --- a/tests/golden/dev/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml +++ b/tests/golden/dev/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - function-revision: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + function-revision: e2e-split labels: app: crossplane app.kubernetes.io/component: cloud-infrastructure-controller diff --git a/tests/golden/dev/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml b/tests/golden/dev/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml index 2541c199f..bf5475b46 100644 --- a/tests/golden/dev/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml +++ b/tests/golden/dev/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - function-revision: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + function-revision: e2e-split labels: app: crossplane-rbac-manager app.kubernetes.io/component: cloud-infrastructure-controller diff --git a/tests/golden/dev/appcat/appcat/sla_reporter/01_cronjob.yaml b/tests/golden/dev/appcat/appcat/sla_reporter/01_cronjob.yaml index 703195724..a19a51c11 100644 --- a/tests/golden/dev/appcat/appcat/sla_reporter/01_cronjob.yaml +++ b/tests/golden/dev/appcat/appcat/sla_reporter/01_cronjob.yaml @@ -30,7 +30,7 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds - image: ghcr.io/vshn/appcat:c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + image: ghcr.io/vshn/appcat:e2e-split name: sla-reporter resources: limits: diff --git a/tests/golden/dev/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/dev/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index 93c425379..915f36269 100644 --- a/tests/golden/dev/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/dev/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -25,7 +25,7 @@ spec: - --health-probe-bind-address=:8081 - --metrics-bind-address=127.0.0.1:8080 env: [] - image: ghcr.io/vshn/appcat:c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + image: ghcr.io/vshn/appcat:e2e-split imagePullPolicy: Always livenessProbe: httpGet: diff --git a/tests/golden/exodev/appcat/appcat/10_function_appcat.yaml b/tests/golden/exodev/appcat/appcat/10_function_appcat.yaml index 68128b5bd..e252da224 100644 --- a/tests/golden/exodev/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/exodev/appcat/appcat/10_function_appcat.yaml @@ -4,9 +4,9 @@ metadata: annotations: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true argocd.argoproj.io/sync-wave: '-40' - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split spec: - package: ghcr.io/vshn/appcat:c042c42b2fbede4e099ffcd6a4e3f945f7b214d2-func + package: ghcr.io/vshn/appcat:e2e-split-func packagePullPolicy: IfNotPresent runtimeConfigRef: name: function-appcat diff --git a/tests/golden/exodev/appcat/appcat/21_composition_objectstorage_exoscale.yaml b/tests/golden/exodev/appcat/appcat/21_composition_objectstorage_exoscale.yaml index f9448c3ec..2064c9f4b 100644 --- a/tests/golden/exodev/appcat/appcat/21_composition_objectstorage_exoscale.yaml +++ b/tests/golden/exodev/appcat/appcat/21_composition_objectstorage_exoscale.yaml @@ -22,7 +22,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split input: apiVersion: v1 data: diff --git a/tests/golden/exodev/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/exodev/appcat/appcat/apiserver/30_deployment.yaml index c36e72541..eb72547ef 100644 --- a/tests/golden/exodev/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/exodev/appcat/appcat/apiserver/30_deployment.yaml @@ -31,7 +31,7 @@ spec: - --secure-port=9443 - --tls-cert-file=/apiserver.local.config/certificates/tls.crt - --tls-private-key-file=/apiserver.local.config/certificates/tls.key - image: ghcr.io/vshn/appcat:c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + image: ghcr.io/vshn/appcat:e2e-split imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/golden/exodev/appcat/appcat/controllers/appcat/10_cluster_role.yaml b/tests/golden/exodev/appcat/appcat/controllers/appcat/10_cluster_role.yaml index 0a3a5eacc..289b8a0c9 100644 --- a/tests/golden/exodev/appcat/appcat/controllers/appcat/10_cluster_role.yaml +++ b/tests/golden/exodev/appcat/appcat/controllers/appcat/10_cluster_role.yaml @@ -93,3 +93,15 @@ rules: - patch - update - watch + - apiGroups: + - cloudscale.crossplane.io + - kubernetes.crossplane.io + - helm.crossplane.io + - minio.crossplane.io + - postgresql.sql.crossplane.io + resources: + - providerconfigs + verbs: + - get + - list + - watch diff --git a/tests/golden/exodev/appcat/appcat/controllers/appcat/30_deployment.yaml b/tests/golden/exodev/appcat/appcat/controllers/appcat/30_deployment.yaml index 711c6cb7c..2049cfe5a 100644 --- a/tests/golden/exodev/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/exodev/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -27,7 +27,7 @@ spec: env: - name: PLANS_NAMESPACE value: syn-appcat - image: ghcr.io/vshn/appcat:c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + image: ghcr.io/vshn/appcat:e2e-split imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/golden/exodev/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml b/tests/golden/exodev/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml index d4b18f2d7..c8dcc9832 100644 --- a/tests/golden/exodev/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml +++ b/tests/golden/exodev/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - function-revision: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + function-revision: e2e-split labels: app: crossplane app.kubernetes.io/component: cloud-infrastructure-controller diff --git a/tests/golden/exodev/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml b/tests/golden/exodev/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml index 2fc5832dc..3a13d6c45 100644 --- a/tests/golden/exodev/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml +++ b/tests/golden/exodev/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - function-revision: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + function-revision: e2e-split labels: app: crossplane-rbac-manager app.kubernetes.io/component: cloud-infrastructure-controller diff --git a/tests/golden/exodev/appcat/appcat/sla_reporter/01_cronjob.yaml b/tests/golden/exodev/appcat/appcat/sla_reporter/01_cronjob.yaml index 703195724..a19a51c11 100644 --- a/tests/golden/exodev/appcat/appcat/sla_reporter/01_cronjob.yaml +++ b/tests/golden/exodev/appcat/appcat/sla_reporter/01_cronjob.yaml @@ -30,7 +30,7 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds - image: ghcr.io/vshn/appcat:c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + image: ghcr.io/vshn/appcat:e2e-split name: sla-reporter resources: limits: diff --git a/tests/golden/service-cluster/appcat/appcat/controllers/appcat/10_cluster_role.yaml b/tests/golden/service-cluster/appcat/appcat/controllers/appcat/10_cluster_role.yaml index 0a3a5eacc..289b8a0c9 100644 --- a/tests/golden/service-cluster/appcat/appcat/controllers/appcat/10_cluster_role.yaml +++ b/tests/golden/service-cluster/appcat/appcat/controllers/appcat/10_cluster_role.yaml @@ -93,3 +93,15 @@ rules: - patch - update - watch + - apiGroups: + - cloudscale.crossplane.io + - kubernetes.crossplane.io + - helm.crossplane.io + - minio.crossplane.io + - postgresql.sql.crossplane.io + resources: + - providerconfigs + verbs: + - get + - list + - watch diff --git a/tests/golden/service-cluster/appcat/appcat/controllers/appcat/30_deployment.yaml b/tests/golden/service-cluster/appcat/appcat/controllers/appcat/30_deployment.yaml index ef3d8d90f..146a4abd1 100644 --- a/tests/golden/service-cluster/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/service-cluster/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -32,7 +32,7 @@ spec: value: syn-appcat - name: CONTROL_PLANE_KUBECONFIG value: /config/config - image: ghcr.io/vshn/appcat:c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + image: ghcr.io/vshn/appcat:e2e-split imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/golden/service-cluster/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/service-cluster/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index 3cd7d839d..7dc6dd852 100644 --- a/tests/golden/service-cluster/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/service-cluster/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -27,7 +27,7 @@ spec: env: - name: KUBECONFIG value: /.kube/config - image: ghcr.io/vshn/appcat:c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + image: ghcr.io/vshn/appcat:e2e-split imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/golden/vshn-cloud/appcat/appcat/10_function_appcat.yaml b/tests/golden/vshn-cloud/appcat/appcat/10_function_appcat.yaml index 68128b5bd..e252da224 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/10_function_appcat.yaml @@ -4,9 +4,9 @@ metadata: annotations: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true argocd.argoproj.io/sync-wave: '-40' - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split spec: - package: ghcr.io/vshn/appcat:c042c42b2fbede4e099ffcd6a4e3f945f7b214d2-func + package: ghcr.io/vshn/appcat:e2e-split-func packagePullPolicy: IfNotPresent runtimeConfigRef: name: function-appcat diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_objectstorage_cloudscale.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_objectstorage_cloudscale.yaml index 4aa354f49..fd7aec649 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_objectstorage_cloudscale.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_objectstorage_cloudscale.yaml @@ -21,7 +21,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split input: apiVersion: v1 data: diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_objectstorage_exoscale.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_objectstorage_exoscale.yaml index f9448c3ec..2064c9f4b 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_objectstorage_exoscale.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_objectstorage_exoscale.yaml @@ -22,7 +22,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split input: apiVersion: v1 data: diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_objectstorage_minio.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_objectstorage_minio.yaml index f1ecb4e1b..91dc0dfc8 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_objectstorage_minio.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_objectstorage_minio.yaml @@ -21,7 +21,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split input: apiVersion: v1 data: diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_codey.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_codey.yaml index 3ad301761..fa7ec545f 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_codey.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_codey.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + metadata.appcat.vshn.io/revision: master-e2e-split metadata.appcat.vshn.io/serviceID: vshn-codey name: codey.io name: codey.io diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_forgejo.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_forgejo.yaml index 03c229db4..80581a85b 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_forgejo.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_forgejo.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + metadata.appcat.vshn.io/revision: master-e2e-split metadata.appcat.vshn.io/serviceID: vshn-forgejo name: vshnforgejo.vshn.appcat.vshn.io name: vshnforgejo.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split input: apiVersion: v1 data: @@ -43,7 +43,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: code.forgejo.org - imageTag: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + imageTag: e2e-split ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-production isOpenshift: 'true' diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_keycloak.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_keycloak.yaml index 91abf0a0c..849bb885e 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_keycloak.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_keycloak.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + metadata.appcat.vshn.io/revision: master-e2e-split metadata.appcat.vshn.io/serviceID: vshn-keycloak name: vshnkeycloak.vshn.appcat.vshn.io name: vshnkeycloak.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split input: apiVersion: v1 data: @@ -43,7 +43,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed - imageTag: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + imageTag: e2e-split ingress_annotations: | nginx.ingress.kubernetes.io/backend-protocol: HTTPS cert-manager.io/cluster-issuer: letsencrypt-staging diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_mariadb.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_mariadb.yaml index 52e9e66f1..bd825dc0f 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_mariadb.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_mariadb.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + metadata.appcat.vshn.io/revision: master-e2e-split metadata.appcat.vshn.io/serviceID: vshn-mariadb name: vshnmariadb.vshn.appcat.vshn.io name: vshnmariadb.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split input: apiVersion: v1 data: @@ -43,7 +43,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net imageRepositoryPrefix: bitnamilegacy - imageTag: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + imageTag: e2e-split isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance maintenanceURL: https://hub.docker.com/v2/repositories/bitnamilegacy/mariadb-galera/tags/?page_size=100 diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_minio.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_minio.yaml index 731dabf8a..238a86349 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_minio.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_minio.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'false' - metadata.appcat.vshn.io/revision: master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + metadata.appcat.vshn.io/revision: master-e2e-split metadata.appcat.vshn.io/serviceID: vshn-minio name: vshnminio.vshn.appcat.vshn.io name: vshnminio.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split input: apiVersion: v1 data: @@ -42,7 +42,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net/ - imageTag: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + imageTag: e2e-split isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance maintenanceURL: https://hub.docker.com/v2/repositories/minio/minio/tags/?page_size=100 diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_nextcloud.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_nextcloud.yaml index aa432d2b6..5ff1bff89 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_nextcloud.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_nextcloud.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + metadata.appcat.vshn.io/revision: master-e2e-split metadata.appcat.vshn.io/serviceID: vshn-nextcloud name: vshnnextcloud.vshn.appcat.vshn.io name: vshnnextcloud.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net/library/nextcloud - imageTag: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + imageTag: e2e-split ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-staging isOpenshift: 'true' diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_postgres.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_postgres.yaml index 4c83097cf..1e6ca2f07 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_postgres.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_postgres.yaml @@ -15,7 +15,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + metadata.appcat.vshn.io/revision: master-e2e-split metadata.appcat.vshn.io/serviceID: vshn-postgresql name: vshnpostgres.vshn.appcat.vshn.io name: vshnpostgres.vshn.appcat.vshn.io @@ -26,7 +26,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split input: apiVersion: v1 data: @@ -43,7 +43,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + imageTag: e2e-split initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m", "memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile": {"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m", diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_redis.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_redis.yaml index ab4bd378a..e5d6408b4 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_redis.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_redis.yaml @@ -17,7 +17,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + metadata.appcat.vshn.io/revision: master-e2e-split metadata.appcat.vshn.io/serviceID: vshn-redis name: vshnredis.vshn.appcat.vshn.io name: vshnredis.vshn.appcat.vshn.io @@ -28,7 +28,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split input: apiVersion: v1 data: @@ -47,7 +47,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net imageRepositoryPrefix: bitnamilegacy - imageTag: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + imageTag: e2e-split isOpenshift: 'true' kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15 maintenanceSA: helm-based-service-maintenance diff --git a/tests/golden/vshn-cloud/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/vshn-cloud/appcat/appcat/apiserver/30_deployment.yaml index 00c3d14be..f9b1bbd6d 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/apiserver/30_deployment.yaml @@ -31,7 +31,7 @@ spec: - --secure-port=9443 - --tls-cert-file=/apiserver.local.config/certificates/tls.crt - --tls-private-key-file=/apiserver.local.config/certificates/tls.key - image: ghcr.io/vshn/appcat:c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + image: ghcr.io/vshn/appcat:e2e-split imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/golden/vshn-cloud/appcat/appcat/controllers/appcat/10_cluster_role.yaml b/tests/golden/vshn-cloud/appcat/appcat/controllers/appcat/10_cluster_role.yaml index 0a3a5eacc..289b8a0c9 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/controllers/appcat/10_cluster_role.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/controllers/appcat/10_cluster_role.yaml @@ -93,3 +93,15 @@ rules: - patch - update - watch + - apiGroups: + - cloudscale.crossplane.io + - kubernetes.crossplane.io + - helm.crossplane.io + - minio.crossplane.io + - postgresql.sql.crossplane.io + resources: + - providerconfigs + verbs: + - get + - list + - watch diff --git a/tests/golden/vshn-cloud/appcat/appcat/controllers/appcat/30_deployment.yaml b/tests/golden/vshn-cloud/appcat/appcat/controllers/appcat/30_deployment.yaml index 430de93f8..e39761937 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -27,7 +27,7 @@ spec: env: - name: PLANS_NAMESPACE value: syn-appcat - image: ghcr.io/vshn/appcat:c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + image: ghcr.io/vshn/appcat:e2e-split imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/golden/vshn-cloud/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml b/tests/golden/vshn-cloud/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml index cb7aa0767..0aaff7308 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - function-revision: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + function-revision: e2e-split labels: app: crossplane app.kubernetes.io/component: cloud-infrastructure-controller diff --git a/tests/golden/vshn-cloud/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml b/tests/golden/vshn-cloud/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml index 6417b5b80..406f37774 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - function-revision: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + function-revision: e2e-split labels: app: crossplane-rbac-manager app.kubernetes.io/component: cloud-infrastructure-controller diff --git a/tests/golden/vshn-cloud/appcat/appcat/sla_reporter/01_cronjob.yaml b/tests/golden/vshn-cloud/appcat/appcat/sla_reporter/01_cronjob.yaml index 703195724..a19a51c11 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/sla_reporter/01_cronjob.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/sla_reporter/01_cronjob.yaml @@ -30,7 +30,7 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds - image: ghcr.io/vshn/appcat:c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + image: ghcr.io/vshn/appcat:e2e-split name: sla-reporter resources: limits: diff --git a/tests/golden/vshn-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/vshn-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index d3447f06f..144f87a8a 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -25,7 +25,7 @@ spec: - --health-probe-bind-address=:8081 - --metrics-bind-address=127.0.0.1:8080 env: [] - image: ghcr.io/vshn/appcat:c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + image: ghcr.io/vshn/appcat:e2e-split imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/golden/vshn-managed/appcat/appcat/10_function_appcat.yaml b/tests/golden/vshn-managed/appcat/appcat/10_function_appcat.yaml index 68128b5bd..e252da224 100644 --- a/tests/golden/vshn-managed/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/10_function_appcat.yaml @@ -4,9 +4,9 @@ metadata: annotations: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true argocd.argoproj.io/sync-wave: '-40' - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split spec: - package: ghcr.io/vshn/appcat:c042c42b2fbede4e099ffcd6a4e3f945f7b214d2-func + package: ghcr.io/vshn/appcat:e2e-split-func packagePullPolicy: IfNotPresent runtimeConfigRef: name: function-appcat diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_objectstorage_cloudscale.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_objectstorage_cloudscale.yaml index 4aa354f49..fd7aec649 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_objectstorage_cloudscale.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_objectstorage_cloudscale.yaml @@ -21,7 +21,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split input: apiVersion: v1 data: diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_objectstorage_exoscale.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_objectstorage_exoscale.yaml index f9448c3ec..2064c9f4b 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_objectstorage_exoscale.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_objectstorage_exoscale.yaml @@ -22,7 +22,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split input: apiVersion: v1 data: diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_objectstorage_minio.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_objectstorage_minio.yaml index f1ecb4e1b..91dc0dfc8 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_objectstorage_minio.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_objectstorage_minio.yaml @@ -21,7 +21,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split input: apiVersion: v1 data: diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_codey.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_codey.yaml index 3ad301761..fa7ec545f 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_codey.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_codey.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + metadata.appcat.vshn.io/revision: master-e2e-split metadata.appcat.vshn.io/serviceID: vshn-codey name: codey.io name: codey.io diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_forgejo.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_forgejo.yaml index 3e7fa53c6..9891354ee 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_forgejo.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_forgejo.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + metadata.appcat.vshn.io/revision: master-e2e-split metadata.appcat.vshn.io/serviceID: vshn-forgejo name: vshnforgejo.vshn.appcat.vshn.io name: vshnforgejo.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split input: apiVersion: v1 data: @@ -43,7 +43,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: code.forgejo.org - imageTag: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + imageTag: e2e-split ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-production isOpenshift: 'true' diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_keycloak.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_keycloak.yaml index c7b13ec75..25d85fe16 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_keycloak.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_keycloak.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + metadata.appcat.vshn.io/revision: master-e2e-split metadata.appcat.vshn.io/serviceID: vshn-keycloak name: vshnkeycloak.vshn.appcat.vshn.io name: vshnkeycloak.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split input: apiVersion: v1 data: @@ -43,7 +43,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed - imageTag: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + imageTag: e2e-split ingress_annotations: | nginx.ingress.kubernetes.io/backend-protocol: HTTPS cert-manager.io/cluster-issuer: letsencrypt-staging diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_mariadb.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_mariadb.yaml index f69d22f65..27f4eeb52 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_mariadb.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_mariadb.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + metadata.appcat.vshn.io/revision: master-e2e-split metadata.appcat.vshn.io/serviceID: vshn-mariadb name: vshnmariadb.vshn.appcat.vshn.io name: vshnmariadb.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split input: apiVersion: v1 data: @@ -43,7 +43,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io imageRepositoryPrefix: bitnamilegacy - imageTag: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + imageTag: e2e-split isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance maintenanceURL: https://hub.docker.com/v2/repositories/bitnamilegacy/mariadb-galera/tags/?page_size=100 diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_minio.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_minio.yaml index 173bad5dd..111da2802 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_minio.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_minio.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'false' - metadata.appcat.vshn.io/revision: master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + metadata.appcat.vshn.io/revision: master-e2e-split metadata.appcat.vshn.io/serviceID: vshn-minio name: vshnminio.vshn.appcat.vshn.io name: vshnminio.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split input: apiVersion: v1 data: @@ -42,7 +42,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: '' - imageTag: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + imageTag: e2e-split isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance maintenanceURL: https://hub.docker.com/v2/repositories/minio/minio/tags/?page_size=100 diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_nextcloud.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_nextcloud.yaml index b722443d5..1186184ee 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_nextcloud.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_nextcloud.yaml @@ -13,7 +13,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + metadata.appcat.vshn.io/revision: master-e2e-split metadata.appcat.vshn.io/serviceID: vshn-nextcloud name: vshnnextcloud.vshn.appcat.vshn.io name: vshnnextcloud.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io - imageTag: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + imageTag: e2e-split ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-staging isOpenshift: 'true' diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_postgres.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_postgres.yaml index ea1ff05eb..008ff7342 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_postgres.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_postgres.yaml @@ -15,7 +15,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + metadata.appcat.vshn.io/revision: master-e2e-split metadata.appcat.vshn.io/serviceID: vshn-postgresql name: vshnpostgres.vshn.appcat.vshn.io name: vshnpostgres.vshn.appcat.vshn.io @@ -26,7 +26,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split input: apiVersion: v1 data: @@ -43,7 +43,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + imageTag: e2e-split initContainers: '{"clusterReconciliationCycle": {"limits": {"cpu": "300m", "memory": "200Mi"}, "requests": {"cpu": "100m", "memory": "100Mi"}}, "pgbouncerAuthFile": {"limits": {"cpu": "300m", "memory": "500Mi"}, "requests": {"cpu": "100m", diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_redis.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_redis.yaml index f2a342d01..4179c555a 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_redis.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_redis.yaml @@ -17,7 +17,7 @@ metadata: metadata.appcat.vshn.io/zone: rma1 labels: metadata.appcat.vshn.io/offered: 'true' - metadata.appcat.vshn.io/revision: master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + metadata.appcat.vshn.io/revision: master-e2e-split metadata.appcat.vshn.io/serviceID: vshn-redis name: vshnredis.vshn.appcat.vshn.io name: vshnredis.vshn.appcat.vshn.io @@ -28,7 +28,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + name: function-appcat-master-e2e-split input: apiVersion: v1 data: @@ -47,7 +47,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io imageRepositoryPrefix: bitnamilegacy - imageTag: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + imageTag: e2e-split isOpenshift: 'true' kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15 maintenanceSA: helm-based-service-maintenance diff --git a/tests/golden/vshn-managed/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/vshn-managed/appcat/appcat/apiserver/30_deployment.yaml index 00c3d14be..f9b1bbd6d 100644 --- a/tests/golden/vshn-managed/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/apiserver/30_deployment.yaml @@ -31,7 +31,7 @@ spec: - --secure-port=9443 - --tls-cert-file=/apiserver.local.config/certificates/tls.crt - --tls-private-key-file=/apiserver.local.config/certificates/tls.key - image: ghcr.io/vshn/appcat:c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + image: ghcr.io/vshn/appcat:e2e-split imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/golden/vshn-managed/appcat/appcat/controllers/appcat/10_cluster_role.yaml b/tests/golden/vshn-managed/appcat/appcat/controllers/appcat/10_cluster_role.yaml index 0a3a5eacc..289b8a0c9 100644 --- a/tests/golden/vshn-managed/appcat/appcat/controllers/appcat/10_cluster_role.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/controllers/appcat/10_cluster_role.yaml @@ -93,3 +93,15 @@ rules: - patch - update - watch + - apiGroups: + - cloudscale.crossplane.io + - kubernetes.crossplane.io + - helm.crossplane.io + - minio.crossplane.io + - postgresql.sql.crossplane.io + resources: + - providerconfigs + verbs: + - get + - list + - watch diff --git a/tests/golden/vshn-managed/appcat/appcat/controllers/appcat/30_deployment.yaml b/tests/golden/vshn-managed/appcat/appcat/controllers/appcat/30_deployment.yaml index 430de93f8..e39761937 100644 --- a/tests/golden/vshn-managed/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -27,7 +27,7 @@ spec: env: - name: PLANS_NAMESPACE value: syn-appcat - image: ghcr.io/vshn/appcat:c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + image: ghcr.io/vshn/appcat:e2e-split imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/golden/vshn-managed/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml b/tests/golden/vshn-managed/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml index cb7aa0767..0aaff7308 100644 --- a/tests/golden/vshn-managed/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - function-revision: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + function-revision: e2e-split labels: app: crossplane app.kubernetes.io/component: cloud-infrastructure-controller diff --git a/tests/golden/vshn-managed/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml b/tests/golden/vshn-managed/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml index 6417b5b80..406f37774 100644 --- a/tests/golden/vshn-managed/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - function-revision: c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + function-revision: e2e-split labels: app: crossplane-rbac-manager app.kubernetes.io/component: cloud-infrastructure-controller diff --git a/tests/golden/vshn-managed/appcat/appcat/sla_reporter/01_cronjob.yaml b/tests/golden/vshn-managed/appcat/appcat/sla_reporter/01_cronjob.yaml index 703195724..a19a51c11 100644 --- a/tests/golden/vshn-managed/appcat/appcat/sla_reporter/01_cronjob.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/sla_reporter/01_cronjob.yaml @@ -30,7 +30,7 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds - image: ghcr.io/vshn/appcat:c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + image: ghcr.io/vshn/appcat:e2e-split name: sla-reporter resources: limits: diff --git a/tests/golden/vshn-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/vshn-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index d3447f06f..144f87a8a 100644 --- a/tests/golden/vshn-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml @@ -25,7 +25,7 @@ spec: - --health-probe-bind-address=:8081 - --metrics-bind-address=127.0.0.1:8080 env: [] - image: ghcr.io/vshn/appcat:c042c42b2fbede4e099ffcd6a4e3f945f7b214d2 + image: ghcr.io/vshn/appcat:e2e-split imagePullPolicy: IfNotPresent livenessProbe: httpGet: