From c37217dedcb8a7a3bc0b024c7ea46daa2cbbf4dc Mon Sep 17 00:00:00 2001 From: TheBigLee <9610820+TheBigLee@users.noreply.github.com> Date: Wed, 22 Apr 2026 10:05:43 +0000 Subject: [PATCH 1/3] [create-pull-request] automated change --- class/defaults.yml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 4 ++-- .../21_composition_objectstorage_minio.yaml | 2 +- .../appcat/appcat/21_composition_vshn_codey.yaml | 2 +- .../appcat/21_composition_vshn_forgejo.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_garage.yaml | 6 +++--- .../appcat/21_composition_vshn_keycloak.yaml | 6 +++--- .../appcat/21_composition_vshn_mariadb.yaml | 6 +++--- .../appcat/21_composition_vshn_nextcloud.yaml | 6 +++--- .../appcat/21_composition_vshn_postgres.yaml | 6 +++--- .../appcat/21_composition_vshn_postgrescnpg.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_redis.yaml | 6 +++--- .../appcat/appcat/apiserver/30_deployment.yaml | 2 +- .../appcat/controllers/appcat/30_deployment.yaml | 2 +- .../crossplane/templates/deployment.yaml | 2 +- .../templates/rbac-manager-deployment.yaml | 2 +- .../appcat/appcat/sla_reporter/01_cronjob.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 4 ++-- .../appcat/appcat/apiserver/30_deployment.yaml | 2 +- .../crossplane/templates/deployment.yaml | 2 +- .../templates/rbac-manager-deployment.yaml | 2 +- ...ent_appcat-sliexporter-controller-manager.yaml | 2 +- ...le_appcat-sliexporter-appcat-sli-exporter.yaml | 15 +++++++++++++++ .../appcat/appcat/10_function_appcat.yaml | 4 ++-- .../21_composition_objectstorage_minio.yaml | 2 +- .../appcat/appcat/21_composition_vshn_codey.yaml | 2 +- .../appcat/21_composition_vshn_forgejo.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_garage.yaml | 6 +++--- .../appcat/21_composition_vshn_keycloak.yaml | 6 +++--- .../appcat/21_composition_vshn_mariadb.yaml | 6 +++--- .../appcat/21_composition_vshn_nextcloud.yaml | 6 +++--- .../appcat/21_composition_vshn_postgres.yaml | 6 +++--- .../appcat/21_composition_vshn_postgrescnpg.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_redis.yaml | 6 +++--- .../appcat/appcat/apiserver/30_deployment.yaml | 2 +- .../appcat/controllers/appcat/30_deployment.yaml | 2 +- .../crossplane/templates/deployment.yaml | 2 +- .../templates/rbac-manager-deployment.yaml | 2 +- .../appcat/appcat/sla_reporter/01_cronjob.yaml | 2 +- ...ent_appcat-sliexporter-controller-manager.yaml | 2 +- ...le_appcat-sliexporter-appcat-sli-exporter.yaml | 15 +++++++++++++++ .../dev/appcat/appcat/10_function_appcat.yaml | 4 ++-- .../21_composition_objectstorage_garage.yaml | 2 +- .../appcat/appcat/21_composition_vshn_codey.yaml | 2 +- .../appcat/21_composition_vshn_forgejo.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_garage.yaml | 6 +++--- .../appcat/21_composition_vshn_keycloak.yaml | 6 +++--- .../appcat/21_composition_vshn_mariadb.yaml | 6 +++--- .../appcat/21_composition_vshn_nextcloud.yaml | 6 +++--- .../appcat/21_composition_vshn_postgres.yaml | 6 +++--- .../appcat/21_composition_vshn_postgrescnpg.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_redis.yaml | 6 +++--- .../appcat/appcat/apiserver/30_deployment.yaml | 2 +- .../appcat/controllers/appcat/30_deployment.yaml | 2 +- .../crossplane/templates/deployment.yaml | 2 +- .../templates/rbac-manager-deployment.yaml | 2 +- .../appcat/appcat/sla_reporter/01_cronjob.yaml | 2 +- ...ent_appcat-sliexporter-controller-manager.yaml | 2 +- ...le_appcat-sliexporter-appcat-sli-exporter.yaml | 15 +++++++++++++++ .../exodev/appcat/appcat/10_function_appcat.yaml | 4 ++-- .../21_composition_objectstorage_exoscale.yaml | 2 +- .../appcat/appcat/apiserver/30_deployment.yaml | 2 +- .../appcat/controllers/appcat/30_deployment.yaml | 2 +- .../crossplane/templates/deployment.yaml | 2 +- .../templates/rbac-manager-deployment.yaml | 2 +- .../appcat/appcat/sla_reporter/01_cronjob.yaml | 2 +- .../appcat/controllers/appcat/30_deployment.yaml | 2 +- ...ent_appcat-sliexporter-controller-manager.yaml | 2 +- ...le_appcat-sliexporter-appcat-sli-exporter.yaml | 15 +++++++++++++++ .../appcat/appcat/10_function_appcat.yaml | 4 ++-- .../21_composition_objectstorage_cloudscale.yaml | 2 +- .../21_composition_objectstorage_exoscale.yaml | 2 +- .../21_composition_objectstorage_minio.yaml | 2 +- .../appcat/appcat/21_composition_vshn_codey.yaml | 2 +- .../appcat/21_composition_vshn_forgejo.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_garage.yaml | 6 +++--- .../appcat/21_composition_vshn_keycloak.yaml | 6 +++--- .../appcat/21_composition_vshn_mariadb.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_minio.yaml | 6 +++--- .../appcat/21_composition_vshn_nextcloud.yaml | 6 +++--- .../appcat/21_composition_vshn_postgres.yaml | 6 +++--- .../appcat/21_composition_vshn_postgrescnpg.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_redis.yaml | 6 +++--- .../appcat/appcat/apiserver/30_deployment.yaml | 2 +- .../appcat/controllers/appcat/30_deployment.yaml | 2 +- .../crossplane/templates/deployment.yaml | 2 +- .../templates/rbac-manager-deployment.yaml | 2 +- .../appcat/appcat/sla_reporter/01_cronjob.yaml | 2 +- ...ent_appcat-sliexporter-controller-manager.yaml | 2 +- ...le_appcat-sliexporter-appcat-sli-exporter.yaml | 15 +++++++++++++++ .../appcat/appcat/10_function_appcat.yaml | 4 ++-- .../21_composition_objectstorage_cloudscale.yaml | 2 +- .../21_composition_objectstorage_exoscale.yaml | 2 +- .../21_composition_objectstorage_minio.yaml | 2 +- .../appcat/appcat/21_composition_vshn_codey.yaml | 2 +- .../appcat/21_composition_vshn_forgejo.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_garage.yaml | 6 +++--- .../appcat/21_composition_vshn_keycloak.yaml | 6 +++--- .../appcat/21_composition_vshn_mariadb.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_minio.yaml | 6 +++--- .../appcat/21_composition_vshn_nextcloud.yaml | 6 +++--- .../appcat/21_composition_vshn_postgres.yaml | 6 +++--- .../appcat/21_composition_vshn_postgrescnpg.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_redis.yaml | 6 +++--- .../appcat/appcat/apiserver/30_deployment.yaml | 2 +- .../appcat/controllers/appcat/30_deployment.yaml | 2 +- .../crossplane/templates/deployment.yaml | 2 +- .../templates/rbac-manager-deployment.yaml | 2 +- .../appcat/appcat/sla_reporter/01_cronjob.yaml | 2 +- ...ent_appcat-sliexporter-controller-manager.yaml | 2 +- ...le_appcat-sliexporter-appcat-sli-exporter.yaml | 15 +++++++++++++++ 111 files changed, 286 insertions(+), 196 deletions(-) diff --git a/class/defaults.yml b/class/defaults.yml index 63691e69d8..ba7d221b2d 100644 --- a/class/defaults.yml +++ b/class/defaults.yml @@ -87,7 +87,7 @@ parameters: appcat: registry: ghcr.io repository: vshn/appcat - tag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + tag: garage/sli_prober 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 22c430ae59..b81a51afec 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober spec: - package: ghcr.io/vshn/appcat:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b-func + package: ghcr.io/vshn/appcat:garage_sli_prober-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 2115ed52a2..8643765056 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober 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 092f24c23a..79009166f3 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: master-garage_sli_prober 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 a06e1807cb..3d01a89176 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: master-garage_sli_prober 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober input: apiVersion: v1 data: @@ -47,7 +47,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: code.forgejo.org - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-production isOpenshift: 'false' diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_garage.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_garage.yaml index e431f953e3..b4d5337a91 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_garage.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_garage.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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: master-garage_sli_prober metadata.appcat.vshn.io/serviceID: vshn-garage name: vshngarage.vshn.appcat.vshn.io name: vshngarage.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober input: apiVersion: v1 data: @@ -46,7 +46,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: '' - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance maintenanceURL: '' 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 ac3c097b93..5c63828ede 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: master-garage_sli_prober 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober 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 eb31c866f6..c496819936 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: master-garage_sli_prober 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober input: apiVersion: v1 data: @@ -47,7 +47,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io imageRepositoryPrefix: bitnamilegacy - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober 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 6806443cbd..63c95ff5a9 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: master-garage_sli_prober 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober input: apiVersion: v1 data: @@ -55,7 +55,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober 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 d302bfef97..d576dfbc2c 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: master-garage_sli_prober 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober input: apiVersion: v1 data: @@ -50,7 +50,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober 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_postgrescnpg.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgrescnpg.yaml index 54b40c5fa6..1359781097 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgrescnpg.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgrescnpg.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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: master-garage_sli_prober metadata.appcat.vshn.io/serviceID: vshn-postgresqlcnpg name: vshnpostgrescnpg.vshn.appcat.vshn.io name: vshnpostgrescnpg.vshn.appcat.vshn.io @@ -26,7 +26,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober input: apiVersion: v1 data: @@ -50,7 +50,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober isOpenshift: 'false' kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15 loadbalancerAnnotations: | 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 7a111ec0dd..d171b3c123 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: master-garage_sli_prober 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober input: apiVersion: v1 data: @@ -52,7 +52,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: ghcr.io imageRepositoryPrefix: vshn - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober 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 37693b6dc5..7b2b0c6e74 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:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + image: ghcr.io/vshn/appcat:garage_sli_prober imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 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 852b9e6e5f..545394436e 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 @@ -39,7 +39,7 @@ spec: } - name: CROSSPLANE_EXTRA_RESOURCES value: '' - image: ghcr.io/vshn/appcat:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + image: ghcr.io/vshn/appcat:garage_sli_prober 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 c936ab8752..dd11eba1e7 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: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + function-revision: garage/sli_prober 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 31ca9fd370..4518eefa59 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: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + function-revision: garage/sli_prober 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 fedfa0189c..c84a5bff52 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:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + image: ghcr.io/vshn/appcat:garage_sli_prober 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 22c430ae59..b81a51afec 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober spec: - package: ghcr.io/vshn/appcat:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b-func + package: ghcr.io/vshn/appcat:garage_sli_prober-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 143e86a576..5506bed7c4 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:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + image: ghcr.io/vshn/appcat:garage_sli_prober 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 c936ab8752..dd11eba1e7 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: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + function-revision: garage/sli_prober 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 31ca9fd370..4518eefa59 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: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + function-revision: garage/sli_prober 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 dfe2956016..66622466be 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:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + image: ghcr.io/vshn/appcat:garage_sli_prober imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/golden/defaults/appcat/appcat/sli_exporter/rbac.authorization.k8s.io_v1_clusterrole_appcat-sliexporter-appcat-sli-exporter.yaml b/tests/golden/defaults/appcat/appcat/sli_exporter/rbac.authorization.k8s.io_v1_clusterrole_appcat-sliexporter-appcat-sli-exporter.yaml index c0b095271b..f289cbddfd 100644 --- a/tests/golden/defaults/appcat/appcat/sli_exporter/rbac.authorization.k8s.io_v1_clusterrole_appcat-sliexporter-appcat-sli-exporter.yaml +++ b/tests/golden/defaults/appcat/appcat/sli_exporter/rbac.authorization.k8s.io_v1_clusterrole_appcat-sliexporter-appcat-sli-exporter.yaml @@ -14,6 +14,17 @@ rules: - get - list - watch + - apiGroups: + - garage.rajsingh.info + resources: + - garagebuckets + - garagekeys + verbs: + - create + - delete + - get + - list + - watch - apiGroups: - managedupgrade.appuio.io resources: @@ -25,10 +36,12 @@ rules: - apiGroups: - vshn.appcat.vshn.io resources: + - vshngarages - vshnmariadbs - vshnminios - vshnpostgresqls - vshnredis + - xvshngarages - xvshnkeycloaks - xvshnmariadbs - xvshnminios @@ -41,10 +54,12 @@ rules: - apiGroups: - vshn.appcat.vshn.io resources: + - vshngarages/status - vshnmariadbs/status - vshnminios/status - vshnpostgresqls/status - vshnredis/status + - xvshngarages/status - xvshnkeycloaks/status - xvshnmariadbs/status - xvshnminios/status diff --git a/tests/golden/dev-talos/appcat/appcat/10_function_appcat.yaml b/tests/golden/dev-talos/appcat/appcat/10_function_appcat.yaml index 6020937ad5..5d555d8145 100644 --- a/tests/golden/dev-talos/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/dev-talos/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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-debug-garage-sli-prober spec: - package: ghcr.io/vshn/appcat:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b-func + package: ghcr.io/vshn/appcat:garage_sli_prober-func packagePullPolicy: Always runtimeConfigRef: name: function-appcat diff --git a/tests/golden/dev-talos/appcat/appcat/21_composition_objectstorage_minio.yaml b/tests/golden/dev-talos/appcat/appcat/21_composition_objectstorage_minio.yaml index 1c6220f3f5..f9175a9909 100644 --- a/tests/golden/dev-talos/appcat/appcat/21_composition_objectstorage_minio.yaml +++ b/tests/golden/dev-talos/appcat/appcat/21_composition_objectstorage_minio.yaml @@ -21,7 +21,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-debug-garage-sli-prober input: apiVersion: v1 data: diff --git a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_codey.yaml b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_codey.yaml index b0b92aa16f..067bc82bbc 100644 --- a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_codey.yaml +++ b/tests/golden/dev-talos/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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: debug-garage_sli_prober metadata.appcat.vshn.io/serviceID: vshn-codey name: codey.io name: codey.io diff --git a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_forgejo.yaml b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_forgejo.yaml index 801c1300c9..1aa68a661d 100644 --- a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_forgejo.yaml +++ b/tests/golden/dev-talos/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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: debug-garage_sli_prober 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-debug-garage-sli-prober input: apiVersion: v1 data: @@ -47,7 +47,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: code.forgejo.org - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-production isOpenshift: 'false' diff --git a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_garage.yaml b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_garage.yaml index 6758717807..c745871e7e 100644 --- a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_garage.yaml +++ b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_garage.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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: debug-garage_sli_prober metadata.appcat.vshn.io/serviceID: vshn-garage name: vshngarage.vshn.appcat.vshn.io name: vshngarage.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-debug-garage-sli-prober input: apiVersion: v1 data: @@ -46,7 +46,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: '' - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance maintenanceURL: '' diff --git a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_keycloak.yaml b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_keycloak.yaml index 9f89705df3..1b40a12b22 100644 --- a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_keycloak.yaml +++ b/tests/golden/dev-talos/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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: debug-garage_sli_prober 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-debug-garage-sli-prober input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober ingress_annotations: | nginx.ingress.kubernetes.io/backend-protocol: HTTPS cert-manager.io/cluster-issuer: letsencrypt-staging diff --git a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_mariadb.yaml b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_mariadb.yaml index fc241c84de..7f3eb4163e 100644 --- a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_mariadb.yaml +++ b/tests/golden/dev-talos/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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: debug-garage_sli_prober 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-debug-garage-sli-prober input: apiVersion: v1 data: @@ -47,7 +47,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io imageRepositoryPrefix: bitnamilegacy - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober 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-talos/appcat/appcat/21_composition_vshn_nextcloud.yaml b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_nextcloud.yaml index 9f40f1115e..a3901cc0c5 100644 --- a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_nextcloud.yaml +++ b/tests/golden/dev-talos/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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: debug-garage_sli_prober 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-debug-garage-sli-prober input: apiVersion: v1 data: @@ -55,7 +55,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-staging isOpenshift: 'false' diff --git a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_postgres.yaml b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_postgres.yaml index c3bd519ce7..ad4d76abf1 100644 --- a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_postgres.yaml +++ b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_postgres.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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: debug-garage_sli_prober metadata.appcat.vshn.io/serviceID: vshn-postgresql name: vshnpostgres.vshn.appcat.vshn.io name: vshnpostgres.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-debug-garage-sli-prober input: apiVersion: v1 data: @@ -48,7 +48,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober 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-talos/appcat/appcat/21_composition_vshn_postgrescnpg.yaml b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_postgrescnpg.yaml index 690ed289cd..ae543c4fef 100644 --- a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_postgrescnpg.yaml +++ b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_postgrescnpg.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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: debug-garage_sli_prober metadata.appcat.vshn.io/serviceID: vshn-postgresqlcnpg name: vshnpostgrescnpg.vshn.appcat.vshn.io name: vshnpostgrescnpg.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-debug-garage-sli-prober input: apiVersion: v1 data: @@ -48,7 +48,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober isOpenshift: 'false' kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15 loadbalancerAnnotations: | diff --git a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_redis.yaml b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_redis.yaml index 62ef60ec2f..190012aa08 100644 --- a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_redis.yaml +++ b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_redis.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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: debug-garage_sli_prober metadata.appcat.vshn.io/serviceID: vshn-redis name: vshnredis.vshn.appcat.vshn.io name: vshnredis.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-debug-garage-sli-prober input: apiVersion: v1 data: @@ -48,7 +48,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: ghcr.io imageRepositoryPrefix: vshn - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober isOpenshift: 'false' kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15 maintenanceSA: helm-based-service-maintenance diff --git a/tests/golden/dev-talos/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/dev-talos/appcat/appcat/apiserver/30_deployment.yaml index a63f7db63e..d10652478a 100644 --- a/tests/golden/dev-talos/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/dev-talos/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:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + image: ghcr.io/vshn/appcat:garage_sli_prober imagePullPolicy: Always livenessProbe: failureThreshold: 3 diff --git a/tests/golden/dev-talos/appcat/appcat/controllers/appcat/30_deployment.yaml b/tests/golden/dev-talos/appcat/appcat/controllers/appcat/30_deployment.yaml index 83ecfb01bf..1d90fc7c5e 100644 --- a/tests/golden/dev-talos/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/dev-talos/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -44,7 +44,7 @@ spec: } - name: CROSSPLANE_EXTRA_RESOURCES value: '' - image: ghcr.io/vshn/appcat:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + image: ghcr.io/vshn/appcat:garage_sli_prober imagePullPolicy: Always livenessProbe: httpGet: diff --git a/tests/golden/dev-talos/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml b/tests/golden/dev-talos/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml index dc434a2ab0..0511b6df31 100644 --- a/tests/golden/dev-talos/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml +++ b/tests/golden/dev-talos/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - function-revision: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + function-revision: garage/sli_prober labels: app: crossplane app.kubernetes.io/component: cloud-infrastructure-controller diff --git a/tests/golden/dev-talos/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml b/tests/golden/dev-talos/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml index 0625f29eec..b3a93d6f12 100644 --- a/tests/golden/dev-talos/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml +++ b/tests/golden/dev-talos/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - function-revision: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + function-revision: garage/sli_prober labels: app: crossplane-rbac-manager app.kubernetes.io/component: cloud-infrastructure-controller diff --git a/tests/golden/dev-talos/appcat/appcat/sla_reporter/01_cronjob.yaml b/tests/golden/dev-talos/appcat/appcat/sla_reporter/01_cronjob.yaml index fedfa0189c..c84a5bff52 100644 --- a/tests/golden/dev-talos/appcat/appcat/sla_reporter/01_cronjob.yaml +++ b/tests/golden/dev-talos/appcat/appcat/sla_reporter/01_cronjob.yaml @@ -30,7 +30,7 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds - image: ghcr.io/vshn/appcat:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + image: ghcr.io/vshn/appcat:garage_sli_prober name: sla-reporter resources: limits: diff --git a/tests/golden/dev-talos/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/dev-talos/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index 4ab9e0aee4..c3aaf5c89d 100644 --- a/tests/golden/dev-talos/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/dev-talos/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:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + image: ghcr.io/vshn/appcat:garage_sli_prober imagePullPolicy: Always livenessProbe: httpGet: diff --git a/tests/golden/dev-talos/appcat/appcat/sli_exporter/rbac.authorization.k8s.io_v1_clusterrole_appcat-sliexporter-appcat-sli-exporter.yaml b/tests/golden/dev-talos/appcat/appcat/sli_exporter/rbac.authorization.k8s.io_v1_clusterrole_appcat-sliexporter-appcat-sli-exporter.yaml index c0b095271b..f289cbddfd 100644 --- a/tests/golden/dev-talos/appcat/appcat/sli_exporter/rbac.authorization.k8s.io_v1_clusterrole_appcat-sliexporter-appcat-sli-exporter.yaml +++ b/tests/golden/dev-talos/appcat/appcat/sli_exporter/rbac.authorization.k8s.io_v1_clusterrole_appcat-sliexporter-appcat-sli-exporter.yaml @@ -14,6 +14,17 @@ rules: - get - list - watch + - apiGroups: + - garage.rajsingh.info + resources: + - garagebuckets + - garagekeys + verbs: + - create + - delete + - get + - list + - watch - apiGroups: - managedupgrade.appuio.io resources: @@ -25,10 +36,12 @@ rules: - apiGroups: - vshn.appcat.vshn.io resources: + - vshngarages - vshnmariadbs - vshnminios - vshnpostgresqls - vshnredis + - xvshngarages - xvshnkeycloaks - xvshnmariadbs - xvshnminios @@ -41,10 +54,12 @@ rules: - apiGroups: - vshn.appcat.vshn.io resources: + - vshngarages/status - vshnmariadbs/status - vshnminios/status - vshnpostgresqls/status - vshnredis/status + - xvshngarages/status - xvshnkeycloaks/status - xvshnmariadbs/status - xvshnminios/status diff --git a/tests/golden/dev/appcat/appcat/10_function_appcat.yaml b/tests/golden/dev/appcat/appcat/10_function_appcat.yaml index f041b3bbd5..2c1d8c001b 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-debug-garage-sli-prober spec: - package: ghcr.io/vshn/appcat:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b-func + package: ghcr.io/vshn/appcat:garage_sli_prober-func packagePullPolicy: Always runtimeConfigRef: name: enable-proxy diff --git a/tests/golden/dev/appcat/appcat/21_composition_objectstorage_garage.yaml b/tests/golden/dev/appcat/appcat/21_composition_objectstorage_garage.yaml index a4f2cd70fa..ae5e1db884 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_objectstorage_garage.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_objectstorage_garage.yaml @@ -21,7 +21,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-debug-garage-sli-prober 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 b0b92aa16f..067bc82bbc 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: debug-garage_sli_prober 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 c0ee4045e6..8f0c3a901c 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: debug-garage_sli_prober 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-debug-garage-sli-prober input: apiVersion: v1 data: @@ -47,7 +47,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: code.forgejo.org - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-production isOpenshift: 'false' diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_garage.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_garage.yaml index 21c0ead0a6..704533b6e8 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_garage.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_garage.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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: debug-garage_sli_prober metadata.appcat.vshn.io/serviceID: vshn-garage name: vshngarage.vshn.appcat.vshn.io name: vshngarage.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-debug-garage-sli-prober input: apiVersion: v1 data: @@ -46,7 +46,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: '' - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance maintenanceURL: '' 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 462865635d..d980339874 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: debug-garage_sli_prober 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-debug-garage-sli-prober input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober 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 bf38820770..e3f1d2e8af 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: debug-garage_sli_prober 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-debug-garage-sli-prober input: apiVersion: v1 data: @@ -47,7 +47,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io imageRepositoryPrefix: bitnamilegacy - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober 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 e0b7aa8283..d4003d5010 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: debug-garage_sli_prober 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-debug-garage-sli-prober input: apiVersion: v1 data: @@ -55,7 +55,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober 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 b656d68911..346103fd00 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: debug-garage_sli_prober 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-debug-garage-sli-prober input: apiVersion: v1 data: @@ -50,7 +50,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober 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_postgrescnpg.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_postgrescnpg.yaml index 0d890733fe..bab6671ffd 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_postgrescnpg.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_postgrescnpg.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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: debug-garage_sli_prober metadata.appcat.vshn.io/serviceID: vshn-postgresqlcnpg name: vshnpostgrescnpg.vshn.appcat.vshn.io name: vshnpostgrescnpg.vshn.appcat.vshn.io @@ -26,7 +26,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-debug-garage-sli-prober input: apiVersion: v1 data: @@ -50,7 +50,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober isOpenshift: 'false' kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15 loadbalancerAnnotations: | 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 dff9cb4bf4..0efc5a34f0 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: debug-garage_sli_prober 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-debug-garage-sli-prober input: apiVersion: v1 data: @@ -52,7 +52,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: ghcr.io imageRepositoryPrefix: vshn - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober 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 a63f7db63e..d10652478a 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:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + image: ghcr.io/vshn/appcat:garage_sli_prober imagePullPolicy: Always livenessProbe: failureThreshold: 3 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 eaa88f1ef7..0d2cbd16cb 100644 --- a/tests/golden/dev/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/dev/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -39,7 +39,7 @@ spec: } - name: CROSSPLANE_EXTRA_RESOURCES value: '' - image: ghcr.io/vshn/appcat:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + image: ghcr.io/vshn/appcat:garage_sli_prober 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 0d68838074..9cb90fa723 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: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + function-revision: garage/sli_prober 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 284e785092..7d0d692cbb 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: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + function-revision: garage/sli_prober 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 fedfa0189c..c84a5bff52 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:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + image: ghcr.io/vshn/appcat:garage_sli_prober 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 4ab9e0aee4..c3aaf5c89d 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:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + image: ghcr.io/vshn/appcat:garage_sli_prober imagePullPolicy: Always livenessProbe: httpGet: diff --git a/tests/golden/dev/appcat/appcat/sli_exporter/rbac.authorization.k8s.io_v1_clusterrole_appcat-sliexporter-appcat-sli-exporter.yaml b/tests/golden/dev/appcat/appcat/sli_exporter/rbac.authorization.k8s.io_v1_clusterrole_appcat-sliexporter-appcat-sli-exporter.yaml index c0b095271b..f289cbddfd 100644 --- a/tests/golden/dev/appcat/appcat/sli_exporter/rbac.authorization.k8s.io_v1_clusterrole_appcat-sliexporter-appcat-sli-exporter.yaml +++ b/tests/golden/dev/appcat/appcat/sli_exporter/rbac.authorization.k8s.io_v1_clusterrole_appcat-sliexporter-appcat-sli-exporter.yaml @@ -14,6 +14,17 @@ rules: - get - list - watch + - apiGroups: + - garage.rajsingh.info + resources: + - garagebuckets + - garagekeys + verbs: + - create + - delete + - get + - list + - watch - apiGroups: - managedupgrade.appuio.io resources: @@ -25,10 +36,12 @@ rules: - apiGroups: - vshn.appcat.vshn.io resources: + - vshngarages - vshnmariadbs - vshnminios - vshnpostgresqls - vshnredis + - xvshngarages - xvshnkeycloaks - xvshnmariadbs - xvshnminios @@ -41,10 +54,12 @@ rules: - apiGroups: - vshn.appcat.vshn.io resources: + - vshngarages/status - vshnmariadbs/status - vshnminios/status - vshnpostgresqls/status - vshnredis/status + - xvshngarages/status - xvshnkeycloaks/status - xvshnmariadbs/status - xvshnminios/status diff --git a/tests/golden/exodev/appcat/appcat/10_function_appcat.yaml b/tests/golden/exodev/appcat/appcat/10_function_appcat.yaml index 22c430ae59..b81a51afec 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober spec: - package: ghcr.io/vshn/appcat:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b-func + package: ghcr.io/vshn/appcat:garage_sli_prober-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 5c526f8541..9aab8e0e05 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober 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 b4ba117cc3..b801aad129 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:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + image: ghcr.io/vshn/appcat:garage_sli_prober imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 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 91af2ccc9c..8c47d42f9d 100644 --- a/tests/golden/exodev/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/exodev/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -39,7 +39,7 @@ spec: } - name: CROSSPLANE_EXTRA_RESOURCES value: '' - image: ghcr.io/vshn/appcat:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + image: ghcr.io/vshn/appcat:garage_sli_prober 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 c936ab8752..dd11eba1e7 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: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + function-revision: garage/sli_prober 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 31ca9fd370..4518eefa59 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: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + function-revision: garage/sli_prober 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 fedfa0189c..c84a5bff52 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:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + image: ghcr.io/vshn/appcat:garage_sli_prober name: sla-reporter resources: limits: 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 0d915b8a51..a7440f18be 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 @@ -44,7 +44,7 @@ spec: } - name: CROSSPLANE_EXTRA_RESOURCES value: '' - image: ghcr.io/vshn/appcat:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + image: ghcr.io/vshn/appcat:garage_sli_prober 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 08a80f0fb9..4f10304362 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:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + image: ghcr.io/vshn/appcat:garage_sli_prober imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/golden/service-cluster/appcat/appcat/sli_exporter/rbac.authorization.k8s.io_v1_clusterrole_appcat-sliexporter-appcat-sli-exporter.yaml b/tests/golden/service-cluster/appcat/appcat/sli_exporter/rbac.authorization.k8s.io_v1_clusterrole_appcat-sliexporter-appcat-sli-exporter.yaml index c0b095271b..f289cbddfd 100644 --- a/tests/golden/service-cluster/appcat/appcat/sli_exporter/rbac.authorization.k8s.io_v1_clusterrole_appcat-sliexporter-appcat-sli-exporter.yaml +++ b/tests/golden/service-cluster/appcat/appcat/sli_exporter/rbac.authorization.k8s.io_v1_clusterrole_appcat-sliexporter-appcat-sli-exporter.yaml @@ -14,6 +14,17 @@ rules: - get - list - watch + - apiGroups: + - garage.rajsingh.info + resources: + - garagebuckets + - garagekeys + verbs: + - create + - delete + - get + - list + - watch - apiGroups: - managedupgrade.appuio.io resources: @@ -25,10 +36,12 @@ rules: - apiGroups: - vshn.appcat.vshn.io resources: + - vshngarages - vshnmariadbs - vshnminios - vshnpostgresqls - vshnredis + - xvshngarages - xvshnkeycloaks - xvshnmariadbs - xvshnminios @@ -41,10 +54,12 @@ rules: - apiGroups: - vshn.appcat.vshn.io resources: + - vshngarages/status - vshnmariadbs/status - vshnminios/status - vshnpostgresqls/status - vshnredis/status + - xvshngarages/status - xvshnkeycloaks/status - xvshnmariadbs/status - xvshnminios/status 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 22c430ae59..b81a51afec 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober spec: - package: ghcr.io/vshn/appcat:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b-func + package: ghcr.io/vshn/appcat:garage_sli_prober-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 73f85da7e4..5626c55703 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober 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 5c526f8541..9aab8e0e05 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober 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 2115ed52a2..8643765056 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober 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 092f24c23a..79009166f3 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: master-garage_sli_prober 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 11b3603879..ea33f75736 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: master-garage_sli_prober 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober input: apiVersion: v1 data: @@ -47,7 +47,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: code.forgejo.org - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-production isOpenshift: 'true' diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_garage.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_garage.yaml index a24c3df8ff..88d0b14775 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_garage.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_garage.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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: master-garage_sli_prober metadata.appcat.vshn.io/serviceID: vshn-garage name: vshngarage.vshn.appcat.vshn.io name: vshngarage.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober input: apiVersion: v1 data: @@ -46,7 +46,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: '' - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance maintenanceURL: '' 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 4e9e73dff4..388e2fad53 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: master-garage_sli_prober 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober 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 2a32816d7a..eb44fa37f6 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: master-garage_sli_prober 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober input: apiVersion: v1 data: @@ -47,7 +47,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net imageRepositoryPrefix: bitnamilegacy - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober 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 df657bd1ea..68555e20b2 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: master-garage_sli_prober 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober input: apiVersion: v1 data: @@ -46,7 +46,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net/ - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober 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 2020dfe0e3..7e45c2ffd8 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: master-garage_sli_prober 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober input: apiVersion: v1 data: @@ -55,7 +55,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober 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 d2b6bbc2fb..eb1137d291 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: master-garage_sli_prober 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober input: apiVersion: v1 data: @@ -50,7 +50,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober 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_postgrescnpg.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_postgrescnpg.yaml index 6b4d3e8250..72501fa8ef 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_postgrescnpg.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_postgrescnpg.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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: master-garage_sli_prober metadata.appcat.vshn.io/serviceID: vshn-postgresqlcnpg name: vshnpostgrescnpg.vshn.appcat.vshn.io name: vshnpostgrescnpg.vshn.appcat.vshn.io @@ -26,7 +26,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober input: apiVersion: v1 data: @@ -50,7 +50,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober isOpenshift: 'true' kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15 loadbalancerAnnotations: | 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 4c6b7fdd8b..1c6fe37339 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: master-garage_sli_prober 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober input: apiVersion: v1 data: @@ -52,7 +52,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net imageRepositoryPrefix: vshn - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober 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 92a5c462d5..29a42ed5ba 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:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + image: ghcr.io/vshn/appcat:garage_sli_prober imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 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 b8afcc62f2..1a03176ff1 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 @@ -39,7 +39,7 @@ spec: } - name: CROSSPLANE_EXTRA_RESOURCES value: '' - image: ghcr.io/vshn/appcat:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + image: ghcr.io/vshn/appcat:garage_sli_prober 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 447265de6b..7ebe266088 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: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + function-revision: garage/sli_prober 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 bb6c71c308..849d914349 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: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + function-revision: garage/sli_prober 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 fedfa0189c..c84a5bff52 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:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + image: ghcr.io/vshn/appcat:garage_sli_prober 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 dfe2956016..66622466be 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:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + image: ghcr.io/vshn/appcat:garage_sli_prober imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/golden/vshn-cloud/appcat/appcat/sli_exporter/rbac.authorization.k8s.io_v1_clusterrole_appcat-sliexporter-appcat-sli-exporter.yaml b/tests/golden/vshn-cloud/appcat/appcat/sli_exporter/rbac.authorization.k8s.io_v1_clusterrole_appcat-sliexporter-appcat-sli-exporter.yaml index c0b095271b..f289cbddfd 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/sli_exporter/rbac.authorization.k8s.io_v1_clusterrole_appcat-sliexporter-appcat-sli-exporter.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/sli_exporter/rbac.authorization.k8s.io_v1_clusterrole_appcat-sliexporter-appcat-sli-exporter.yaml @@ -14,6 +14,17 @@ rules: - get - list - watch + - apiGroups: + - garage.rajsingh.info + resources: + - garagebuckets + - garagekeys + verbs: + - create + - delete + - get + - list + - watch - apiGroups: - managedupgrade.appuio.io resources: @@ -25,10 +36,12 @@ rules: - apiGroups: - vshn.appcat.vshn.io resources: + - vshngarages - vshnmariadbs - vshnminios - vshnpostgresqls - vshnredis + - xvshngarages - xvshnkeycloaks - xvshnmariadbs - xvshnminios @@ -41,10 +54,12 @@ rules: - apiGroups: - vshn.appcat.vshn.io resources: + - vshngarages/status - vshnmariadbs/status - vshnminios/status - vshnpostgresqls/status - vshnredis/status + - xvshngarages/status - xvshnkeycloaks/status - xvshnmariadbs/status - xvshnminios/status 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 22c430ae59..b81a51afec 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober spec: - package: ghcr.io/vshn/appcat:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b-func + package: ghcr.io/vshn/appcat:garage_sli_prober-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 73f85da7e4..5626c55703 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober 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 5c526f8541..9aab8e0e05 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober 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 2115ed52a2..8643765056 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober 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 092f24c23a..79009166f3 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: master-garage_sli_prober 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 fcf72df370..9dfec5fffb 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: master-garage_sli_prober 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober input: apiVersion: v1 data: @@ -47,7 +47,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: code.forgejo.org - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-production isOpenshift: 'true' diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_garage.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_garage.yaml index 4a2390ebc8..44631f3afb 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_garage.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_garage.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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: master-garage_sli_prober metadata.appcat.vshn.io/serviceID: vshn-garage name: vshngarage.vshn.appcat.vshn.io name: vshngarage.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober input: apiVersion: v1 data: @@ -46,7 +46,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: '' - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance maintenanceURL: '' 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 986b0786fd..7b6d95cb1c 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: master-garage_sli_prober 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober 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 c645a3e567..542b6289d3 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: master-garage_sli_prober 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober input: apiVersion: v1 data: @@ -47,7 +47,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io imageRepositoryPrefix: bitnamilegacy - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober 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 096ca04715..b7654e4bb1 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: master-garage_sli_prober 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober input: apiVersion: v1 data: @@ -46,7 +46,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: '' - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober 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 0f26099155..d27fc6654b 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: master-garage_sli_prober 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober input: apiVersion: v1 data: @@ -55,7 +55,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober 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 bdfcb34ca9..e0c7814814 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: master-garage_sli_prober 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober input: apiVersion: v1 data: @@ -50,7 +50,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober 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_postgrescnpg.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_postgrescnpg.yaml index 9ff3551d9b..bc227b80b6 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_postgrescnpg.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_postgrescnpg.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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: master-garage_sli_prober metadata.appcat.vshn.io/serviceID: vshn-postgresqlcnpg name: vshnpostgrescnpg.vshn.appcat.vshn.io name: vshnpostgrescnpg.vshn.appcat.vshn.io @@ -26,7 +26,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober input: apiVersion: v1 data: @@ -50,7 +50,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober isOpenshift: 'true' kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15 loadbalancerAnnotations: | 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 25990855d8..34ee5e4d66 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + metadata.appcat.vshn.io/revision: master-garage_sli_prober 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-68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + name: function-appcat-master-garage-sli-prober input: apiVersion: v1 data: @@ -52,7 +52,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: ghcr.io imageRepositoryPrefix: vshn - imageTag: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + imageTag: garage_sli_prober 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 92a5c462d5..29a42ed5ba 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:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + image: ghcr.io/vshn/appcat:garage_sli_prober imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 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 b8afcc62f2..1a03176ff1 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 @@ -39,7 +39,7 @@ spec: } - name: CROSSPLANE_EXTRA_RESOURCES value: '' - image: ghcr.io/vshn/appcat:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + image: ghcr.io/vshn/appcat:garage_sli_prober 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 447265de6b..7ebe266088 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: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + function-revision: garage/sli_prober 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 bb6c71c308..849d914349 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: 68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + function-revision: garage/sli_prober 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 fedfa0189c..c84a5bff52 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:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + image: ghcr.io/vshn/appcat:garage_sli_prober 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 dfe2956016..66622466be 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:68f4aa3cbdd88eb2ffdc6d333e0fa85a3ae24e4b + image: ghcr.io/vshn/appcat:garage_sli_prober imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/golden/vshn-managed/appcat/appcat/sli_exporter/rbac.authorization.k8s.io_v1_clusterrole_appcat-sliexporter-appcat-sli-exporter.yaml b/tests/golden/vshn-managed/appcat/appcat/sli_exporter/rbac.authorization.k8s.io_v1_clusterrole_appcat-sliexporter-appcat-sli-exporter.yaml index c0b095271b..f289cbddfd 100644 --- a/tests/golden/vshn-managed/appcat/appcat/sli_exporter/rbac.authorization.k8s.io_v1_clusterrole_appcat-sliexporter-appcat-sli-exporter.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/sli_exporter/rbac.authorization.k8s.io_v1_clusterrole_appcat-sliexporter-appcat-sli-exporter.yaml @@ -14,6 +14,17 @@ rules: - get - list - watch + - apiGroups: + - garage.rajsingh.info + resources: + - garagebuckets + - garagekeys + verbs: + - create + - delete + - get + - list + - watch - apiGroups: - managedupgrade.appuio.io resources: @@ -25,10 +36,12 @@ rules: - apiGroups: - vshn.appcat.vshn.io resources: + - vshngarages - vshnmariadbs - vshnminios - vshnpostgresqls - vshnredis + - xvshngarages - xvshnkeycloaks - xvshnmariadbs - xvshnminios @@ -41,10 +54,12 @@ rules: - apiGroups: - vshn.appcat.vshn.io resources: + - vshngarages/status - vshnmariadbs/status - vshnminios/status - vshnpostgresqls/status - vshnredis/status + - xvshngarages/status - xvshnkeycloaks/status - xvshnmariadbs/status - xvshnminios/status From a096c3e6d07f16962218c19a78a1b1cea9a8330a Mon Sep 17 00:00:00 2001 From: Nicolas Bigler Date: Thu, 23 Apr 2026 09:38:56 +0200 Subject: [PATCH 2/3] Adjust garage chart version Signed-off-by: Nicolas Bigler --- class/defaults.yml | 2 +- .../control-plane/appcat/appcat/21_composition_vshn_garage.yaml | 2 +- .../dev-talos/appcat/appcat/21_composition_vshn_garage.yaml | 2 +- tests/golden/dev/appcat/appcat/21_composition_vshn_garage.yaml | 2 +- .../vshn-cloud/appcat/appcat/21_composition_vshn_garage.yaml | 2 +- .../vshn-managed/appcat/appcat/21_composition_vshn_garage.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/class/defaults.yml b/class/defaults.yml index ba7d221b2d..70addedc6a 100644 --- a/class/defaults.yml +++ b/class/defaults.yml @@ -37,7 +37,7 @@ parameters: chartName: vshnpostgresql garage: source: https://charts.appcat.ch/ - version: 0.0.1 + version: 0.0.2 chartName: vshngaragecluster garageBucket: source: https://charts.appcat.ch/ diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_garage.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_garage.yaml index b4d5337a91..8839d6a0e1 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_garage.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_garage.yaml @@ -31,7 +31,7 @@ spec: billingEnabled: 'false' bucketRegion: lpg chartRepository: https://charts.appcat.ch/ - chartVersion: 0.0.1 + chartVersion: 0.0.2 cloudProvider: cloudscale clusterName: c-green-test-1234 controlNamespace: syn-appcat-control diff --git a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_garage.yaml b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_garage.yaml index c745871e7e..7473bfcf0d 100644 --- a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_garage.yaml +++ b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_garage.yaml @@ -31,7 +31,7 @@ spec: billingEnabled: 'false' bucketRegion: rma chartRepository: https://charts.appcat.ch/ - chartVersion: 0.0.1 + chartVersion: 0.0.2 cloudProvider: cloudscale clusterName: c-green-test-1234 controlNamespace: syn-appcat-control diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_garage.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_garage.yaml index 704533b6e8..d7d48f524d 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_garage.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_garage.yaml @@ -31,7 +31,7 @@ spec: billingEnabled: 'false' bucketRegion: rma chartRepository: https://charts.appcat.ch/ - chartVersion: 0.0.1 + chartVersion: 0.0.2 cloudProvider: cloudscale clusterName: c-green-test-1234 controlNamespace: syn-appcat-control diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_garage.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_garage.yaml index 88d0b14775..d245cb5761 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_garage.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_garage.yaml @@ -31,7 +31,7 @@ spec: billingEnabled: 'false' bucketRegion: lpg chartRepository: https://charts.appcat.ch/ - chartVersion: 0.0.1 + chartVersion: 0.0.2 cloudProvider: cloudscale clusterName: c-green-test-1234 controlNamespace: syn-appcat-control diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_garage.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_garage.yaml index 44631f3afb..8619498b46 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_garage.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_garage.yaml @@ -31,7 +31,7 @@ spec: billingEnabled: 'false' bucketRegion: lpg chartRepository: https://charts.appcat.ch/ - chartVersion: 0.0.1 + chartVersion: 0.0.2 cloudProvider: cloudscale clusterName: c-green-test-1234 controlNamespace: syn-appcat-control From 5b776f56c019d33b93a136e3c8fccdafd55d3ec4 Mon Sep 17 00:00:00 2001 From: GitHubBot Date: Mon, 27 Apr 2026 14:28:09 +0000 Subject: [PATCH 3/3] Auto update from appcat PR https://github.com/vshn/appcat/pull/651, dependency 5bee80618f73975564bd276a5f36d1028b1aaa9f --- class/defaults.yml | 2 +- .../control-plane/appcat/appcat/10_function_appcat.yaml | 4 ++-- .../appcat/appcat/21_composition_objectstorage_minio.yaml | 2 +- .../appcat/appcat/21_composition_vshn_codey.yaml | 2 +- .../appcat/appcat/21_composition_vshn_forgejo.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_garage.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_keycloak.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_mariadb.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_nextcloud.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_postgres.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_postgrescnpg.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_redis.yaml | 6 +++--- .../appcat/appcat/apiserver/30_deployment.yaml | 2 +- .../appcat/appcat/controllers/appcat/30_deployment.yaml | 2 +- .../helmchart/crossplane/templates/deployment.yaml | 2 +- .../crossplane/templates/rbac-manager-deployment.yaml | 2 +- .../appcat/appcat/sla_reporter/01_cronjob.yaml | 2 +- tests/golden/defaults/appcat/appcat/10_function_appcat.yaml | 4 ++-- .../defaults/appcat/appcat/apiserver/30_deployment.yaml | 2 +- .../helmchart/crossplane/templates/deployment.yaml | 2 +- .../crossplane/templates/rbac-manager-deployment.yaml | 2 +- ...v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- .../golden/dev-talos/appcat/appcat/10_function_appcat.yaml | 4 ++-- .../appcat/appcat/21_composition_objectstorage_minio.yaml | 2 +- .../dev-talos/appcat/appcat/21_composition_vshn_codey.yaml | 2 +- .../appcat/appcat/21_composition_vshn_forgejo.yaml | 6 +++--- .../dev-talos/appcat/appcat/21_composition_vshn_garage.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_keycloak.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_mariadb.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_nextcloud.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_postgres.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_postgrescnpg.yaml | 6 +++--- .../dev-talos/appcat/appcat/21_composition_vshn_redis.yaml | 6 +++--- .../dev-talos/appcat/appcat/apiserver/30_deployment.yaml | 2 +- .../appcat/appcat/controllers/appcat/30_deployment.yaml | 2 +- .../helmchart/crossplane/templates/deployment.yaml | 2 +- .../crossplane/templates/rbac-manager-deployment.yaml | 2 +- .../dev-talos/appcat/appcat/sla_reporter/01_cronjob.yaml | 2 +- ...v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- tests/golden/dev/appcat/appcat/10_function_appcat.yaml | 4 ++-- .../appcat/appcat/21_composition_objectstorage_garage.yaml | 2 +- .../golden/dev/appcat/appcat/21_composition_vshn_codey.yaml | 2 +- .../dev/appcat/appcat/21_composition_vshn_forgejo.yaml | 6 +++--- .../dev/appcat/appcat/21_composition_vshn_garage.yaml | 6 +++--- .../dev/appcat/appcat/21_composition_vshn_keycloak.yaml | 6 +++--- .../dev/appcat/appcat/21_composition_vshn_mariadb.yaml | 6 +++--- .../dev/appcat/appcat/21_composition_vshn_nextcloud.yaml | 6 +++--- .../dev/appcat/appcat/21_composition_vshn_postgres.yaml | 6 +++--- .../dev/appcat/appcat/21_composition_vshn_postgrescnpg.yaml | 6 +++--- .../golden/dev/appcat/appcat/21_composition_vshn_redis.yaml | 6 +++--- tests/golden/dev/appcat/appcat/apiserver/30_deployment.yaml | 2 +- .../dev/appcat/appcat/controllers/appcat/30_deployment.yaml | 2 +- .../helmchart/crossplane/templates/deployment.yaml | 2 +- .../crossplane/templates/rbac-manager-deployment.yaml | 2 +- tests/golden/dev/appcat/appcat/sla_reporter/01_cronjob.yaml | 2 +- ...v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- tests/golden/exodev/appcat/appcat/10_function_appcat.yaml | 4 ++-- .../appcat/21_composition_objectstorage_exoscale.yaml | 2 +- .../exodev/appcat/appcat/apiserver/30_deployment.yaml | 2 +- .../appcat/appcat/controllers/appcat/30_deployment.yaml | 2 +- .../helmchart/crossplane/templates/deployment.yaml | 2 +- .../crossplane/templates/rbac-manager-deployment.yaml | 2 +- .../exodev/appcat/appcat/sla_reporter/01_cronjob.yaml | 2 +- .../appcat/appcat/controllers/appcat/30_deployment.yaml | 2 +- ...v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- .../golden/vshn-cloud/appcat/appcat/10_function_appcat.yaml | 4 ++-- .../appcat/21_composition_objectstorage_cloudscale.yaml | 2 +- .../appcat/21_composition_objectstorage_exoscale.yaml | 2 +- .../appcat/appcat/21_composition_objectstorage_minio.yaml | 2 +- .../vshn-cloud/appcat/appcat/21_composition_vshn_codey.yaml | 2 +- .../appcat/appcat/21_composition_vshn_forgejo.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_garage.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_keycloak.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_mariadb.yaml | 6 +++--- .../vshn-cloud/appcat/appcat/21_composition_vshn_minio.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_nextcloud.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_postgres.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_postgrescnpg.yaml | 6 +++--- .../vshn-cloud/appcat/appcat/21_composition_vshn_redis.yaml | 6 +++--- .../vshn-cloud/appcat/appcat/apiserver/30_deployment.yaml | 2 +- .../appcat/appcat/controllers/appcat/30_deployment.yaml | 2 +- .../helmchart/crossplane/templates/deployment.yaml | 2 +- .../crossplane/templates/rbac-manager-deployment.yaml | 2 +- .../vshn-cloud/appcat/appcat/sla_reporter/01_cronjob.yaml | 2 +- ...v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- .../vshn-managed/appcat/appcat/10_function_appcat.yaml | 4 ++-- .../appcat/21_composition_objectstorage_cloudscale.yaml | 2 +- .../appcat/21_composition_objectstorage_exoscale.yaml | 2 +- .../appcat/appcat/21_composition_objectstorage_minio.yaml | 2 +- .../appcat/appcat/21_composition_vshn_codey.yaml | 2 +- .../appcat/appcat/21_composition_vshn_forgejo.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_garage.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_keycloak.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_mariadb.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_minio.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_nextcloud.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_postgres.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_postgrescnpg.yaml | 6 +++--- .../appcat/appcat/21_composition_vshn_redis.yaml | 6 +++--- .../vshn-managed/appcat/appcat/apiserver/30_deployment.yaml | 2 +- .../appcat/appcat/controllers/appcat/30_deployment.yaml | 2 +- .../helmchart/crossplane/templates/deployment.yaml | 2 +- .../crossplane/templates/rbac-manager-deployment.yaml | 2 +- .../vshn-managed/appcat/appcat/sla_reporter/01_cronjob.yaml | 2 +- ...v1_deployment_appcat-sliexporter-controller-manager.yaml | 2 +- 105 files changed, 196 insertions(+), 196 deletions(-) diff --git a/class/defaults.yml b/class/defaults.yml index 70addedc6a..6b5db366fc 100644 --- a/class/defaults.yml +++ b/class/defaults.yml @@ -87,7 +87,7 @@ parameters: appcat: registry: ghcr.io repository: vshn/appcat - tag: garage/sli_prober + tag: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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 b81a51afec..80888a00d3 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f spec: - package: ghcr.io/vshn/appcat:garage_sli_prober-func + package: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f-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 8643765056..397bdbaa93 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f 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 79009166f3..67b649229d 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-garage_sli_prober + metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f 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 3d01a89176..e24692c1f9 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-garage_sli_prober + metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -47,7 +47,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: code.forgejo.org - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-production isOpenshift: 'false' diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_garage.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_garage.yaml index 8839d6a0e1..1d7eef65e5 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_garage.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_garage.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-garage_sli_prober + metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f metadata.appcat.vshn.io/serviceID: vshn-garage name: vshngarage.vshn.appcat.vshn.io name: vshngarage.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -46,7 +46,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: '' - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance maintenanceURL: '' 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 5c63828ede..e359c22d26 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-garage_sli_prober + metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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 c496819936..b59823ebcb 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-garage_sli_prober + metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -47,7 +47,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io imageRepositoryPrefix: bitnamilegacy - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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 63c95ff5a9..01e68b8578 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-garage_sli_prober + metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -55,7 +55,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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 d576dfbc2c..feed04e20e 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-garage_sli_prober + metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -50,7 +50,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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_postgrescnpg.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgrescnpg.yaml index 1359781097..39f5a78a94 100644 --- a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgrescnpg.yaml +++ b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_postgrescnpg.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-garage_sli_prober + metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f metadata.appcat.vshn.io/serviceID: vshn-postgresqlcnpg name: vshnpostgrescnpg.vshn.appcat.vshn.io name: vshnpostgrescnpg.vshn.appcat.vshn.io @@ -26,7 +26,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -50,7 +50,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f isOpenshift: 'false' kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15 loadbalancerAnnotations: | 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 d171b3c123..7ae3898c73 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-garage_sli_prober + metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -52,7 +52,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: ghcr.io imageRepositoryPrefix: vshn - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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 7b2b0c6e74..8ee8f5a279 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:garage_sli_prober + image: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 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 545394436e..8fe1d33f3c 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 @@ -39,7 +39,7 @@ spec: } - name: CROSSPLANE_EXTRA_RESOURCES value: '' - image: ghcr.io/vshn/appcat:garage_sli_prober + image: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f 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 dd11eba1e7..ba28084494 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: garage/sli_prober + function-revision: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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 4518eefa59..b0f766d837 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: garage/sli_prober + function-revision: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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 c84a5bff52..1506927435 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:garage_sli_prober + image: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f 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 b81a51afec..80888a00d3 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f spec: - package: ghcr.io/vshn/appcat:garage_sli_prober-func + package: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f-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 5506bed7c4..2f71fb9e11 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:garage_sli_prober + image: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f 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 dd11eba1e7..ba28084494 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: garage/sli_prober + function-revision: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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 4518eefa59..b0f766d837 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: garage/sli_prober + function-revision: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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 66622466be..3cc80030d1 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:garage_sli_prober + image: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/golden/dev-talos/appcat/appcat/10_function_appcat.yaml b/tests/golden/dev-talos/appcat/appcat/10_function_appcat.yaml index 5d555d8145..12d1002a4d 100644 --- a/tests/golden/dev-talos/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/dev-talos/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-garage-sli-prober + name: function-appcat-debug-5bee80618f73975564bd276a5f36d1028b1aaa9f spec: - package: ghcr.io/vshn/appcat:garage_sli_prober-func + package: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f-func packagePullPolicy: Always runtimeConfigRef: name: function-appcat diff --git a/tests/golden/dev-talos/appcat/appcat/21_composition_objectstorage_minio.yaml b/tests/golden/dev-talos/appcat/appcat/21_composition_objectstorage_minio.yaml index f9175a9909..d1b3516123 100644 --- a/tests/golden/dev-talos/appcat/appcat/21_composition_objectstorage_minio.yaml +++ b/tests/golden/dev-talos/appcat/appcat/21_composition_objectstorage_minio.yaml @@ -21,7 +21,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-garage-sli-prober + name: function-appcat-debug-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: diff --git a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_codey.yaml b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_codey.yaml index 067bc82bbc..4627cc9108 100644 --- a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_codey.yaml +++ b/tests/golden/dev-talos/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-garage_sli_prober + metadata.appcat.vshn.io/revision: debug-5bee80618f73975564bd276a5f36d1028b1aaa9f metadata.appcat.vshn.io/serviceID: vshn-codey name: codey.io name: codey.io diff --git a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_forgejo.yaml b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_forgejo.yaml index 1aa68a661d..d1b751aa5d 100644 --- a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_forgejo.yaml +++ b/tests/golden/dev-talos/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-garage_sli_prober + metadata.appcat.vshn.io/revision: debug-5bee80618f73975564bd276a5f36d1028b1aaa9f 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-garage-sli-prober + name: function-appcat-debug-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -47,7 +47,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: code.forgejo.org - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-production isOpenshift: 'false' diff --git a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_garage.yaml b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_garage.yaml index 7473bfcf0d..c77131a41a 100644 --- a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_garage.yaml +++ b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_garage.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-garage_sli_prober + metadata.appcat.vshn.io/revision: debug-5bee80618f73975564bd276a5f36d1028b1aaa9f metadata.appcat.vshn.io/serviceID: vshn-garage name: vshngarage.vshn.appcat.vshn.io name: vshngarage.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-garage-sli-prober + name: function-appcat-debug-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -46,7 +46,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: '' - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance maintenanceURL: '' diff --git a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_keycloak.yaml b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_keycloak.yaml index 1b40a12b22..99b833dff7 100644 --- a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_keycloak.yaml +++ b/tests/golden/dev-talos/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-garage_sli_prober + metadata.appcat.vshn.io/revision: debug-5bee80618f73975564bd276a5f36d1028b1aaa9f 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-garage-sli-prober + name: function-appcat-debug-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f ingress_annotations: | nginx.ingress.kubernetes.io/backend-protocol: HTTPS cert-manager.io/cluster-issuer: letsencrypt-staging diff --git a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_mariadb.yaml b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_mariadb.yaml index 7f3eb4163e..59b1e10c12 100644 --- a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_mariadb.yaml +++ b/tests/golden/dev-talos/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-garage_sli_prober + metadata.appcat.vshn.io/revision: debug-5bee80618f73975564bd276a5f36d1028b1aaa9f 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-garage-sli-prober + name: function-appcat-debug-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -47,7 +47,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io imageRepositoryPrefix: bitnamilegacy - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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-talos/appcat/appcat/21_composition_vshn_nextcloud.yaml b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_nextcloud.yaml index a3901cc0c5..3f51e7a96c 100644 --- a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_nextcloud.yaml +++ b/tests/golden/dev-talos/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-garage_sli_prober + metadata.appcat.vshn.io/revision: debug-5bee80618f73975564bd276a5f36d1028b1aaa9f 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-garage-sli-prober + name: function-appcat-debug-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -55,7 +55,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-staging isOpenshift: 'false' diff --git a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_postgres.yaml b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_postgres.yaml index ad4d76abf1..bab4e4e7db 100644 --- a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_postgres.yaml +++ b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_postgres.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-garage_sli_prober + metadata.appcat.vshn.io/revision: debug-5bee80618f73975564bd276a5f36d1028b1aaa9f metadata.appcat.vshn.io/serviceID: vshn-postgresql name: vshnpostgres.vshn.appcat.vshn.io name: vshnpostgres.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-garage-sli-prober + name: function-appcat-debug-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -48,7 +48,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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-talos/appcat/appcat/21_composition_vshn_postgrescnpg.yaml b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_postgrescnpg.yaml index ae543c4fef..18b1e9b54c 100644 --- a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_postgrescnpg.yaml +++ b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_postgrescnpg.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-garage_sli_prober + metadata.appcat.vshn.io/revision: debug-5bee80618f73975564bd276a5f36d1028b1aaa9f metadata.appcat.vshn.io/serviceID: vshn-postgresqlcnpg name: vshnpostgrescnpg.vshn.appcat.vshn.io name: vshnpostgrescnpg.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-garage-sli-prober + name: function-appcat-debug-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -48,7 +48,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f isOpenshift: 'false' kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15 loadbalancerAnnotations: | diff --git a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_redis.yaml b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_redis.yaml index 190012aa08..cc18894458 100644 --- a/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_redis.yaml +++ b/tests/golden/dev-talos/appcat/appcat/21_composition_vshn_redis.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-garage_sli_prober + metadata.appcat.vshn.io/revision: debug-5bee80618f73975564bd276a5f36d1028b1aaa9f metadata.appcat.vshn.io/serviceID: vshn-redis name: vshnredis.vshn.appcat.vshn.io name: vshnredis.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-garage-sli-prober + name: function-appcat-debug-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -48,7 +48,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: ghcr.io imageRepositoryPrefix: vshn - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f isOpenshift: 'false' kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15 maintenanceSA: helm-based-service-maintenance diff --git a/tests/golden/dev-talos/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/dev-talos/appcat/appcat/apiserver/30_deployment.yaml index d10652478a..e249276078 100644 --- a/tests/golden/dev-talos/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/dev-talos/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:garage_sli_prober + image: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f imagePullPolicy: Always livenessProbe: failureThreshold: 3 diff --git a/tests/golden/dev-talos/appcat/appcat/controllers/appcat/30_deployment.yaml b/tests/golden/dev-talos/appcat/appcat/controllers/appcat/30_deployment.yaml index 1d90fc7c5e..465441bc64 100644 --- a/tests/golden/dev-talos/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/dev-talos/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -44,7 +44,7 @@ spec: } - name: CROSSPLANE_EXTRA_RESOURCES value: '' - image: ghcr.io/vshn/appcat:garage_sli_prober + image: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f imagePullPolicy: Always livenessProbe: httpGet: diff --git a/tests/golden/dev-talos/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml b/tests/golden/dev-talos/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml index 0511b6df31..e77b78501b 100644 --- a/tests/golden/dev-talos/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml +++ b/tests/golden/dev-talos/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - function-revision: garage/sli_prober + function-revision: 5bee80618f73975564bd276a5f36d1028b1aaa9f labels: app: crossplane app.kubernetes.io/component: cloud-infrastructure-controller diff --git a/tests/golden/dev-talos/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml b/tests/golden/dev-talos/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml index b3a93d6f12..9ba9ca89e1 100644 --- a/tests/golden/dev-talos/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml +++ b/tests/golden/dev-talos/appcat/appcat/crossplane/helmchart/crossplane/templates/rbac-manager-deployment.yaml @@ -26,7 +26,7 @@ spec: template: metadata: annotations: - function-revision: garage/sli_prober + function-revision: 5bee80618f73975564bd276a5f36d1028b1aaa9f labels: app: crossplane-rbac-manager app.kubernetes.io/component: cloud-infrastructure-controller diff --git a/tests/golden/dev-talos/appcat/appcat/sla_reporter/01_cronjob.yaml b/tests/golden/dev-talos/appcat/appcat/sla_reporter/01_cronjob.yaml index c84a5bff52..1506927435 100644 --- a/tests/golden/dev-talos/appcat/appcat/sla_reporter/01_cronjob.yaml +++ b/tests/golden/dev-talos/appcat/appcat/sla_reporter/01_cronjob.yaml @@ -30,7 +30,7 @@ spec: envFrom: - secretRef: name: appcat-sla-reports-creds - image: ghcr.io/vshn/appcat:garage_sli_prober + image: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f name: sla-reporter resources: limits: diff --git a/tests/golden/dev-talos/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/tests/golden/dev-talos/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml index c3aaf5c89d..412245da7a 100644 --- a/tests/golden/dev-talos/appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml +++ b/tests/golden/dev-talos/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:garage_sli_prober + image: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f imagePullPolicy: Always 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 2c1d8c001b..4fdb1b72c3 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-garage-sli-prober + name: function-appcat-debug-5bee80618f73975564bd276a5f36d1028b1aaa9f spec: - package: ghcr.io/vshn/appcat:garage_sli_prober-func + package: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f-func packagePullPolicy: Always runtimeConfigRef: name: enable-proxy diff --git a/tests/golden/dev/appcat/appcat/21_composition_objectstorage_garage.yaml b/tests/golden/dev/appcat/appcat/21_composition_objectstorage_garage.yaml index ae5e1db884..f9b78977c6 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_objectstorage_garage.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_objectstorage_garage.yaml @@ -21,7 +21,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-garage-sli-prober + name: function-appcat-debug-5bee80618f73975564bd276a5f36d1028b1aaa9f 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 067bc82bbc..4627cc9108 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-garage_sli_prober + metadata.appcat.vshn.io/revision: debug-5bee80618f73975564bd276a5f36d1028b1aaa9f 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 8f0c3a901c..08e2be6185 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-garage_sli_prober + metadata.appcat.vshn.io/revision: debug-5bee80618f73975564bd276a5f36d1028b1aaa9f 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-garage-sli-prober + name: function-appcat-debug-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -47,7 +47,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: code.forgejo.org - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-production isOpenshift: 'false' diff --git a/tests/golden/dev/appcat/appcat/21_composition_vshn_garage.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_garage.yaml index d7d48f524d..26fa063a1b 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_garage.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_garage.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-garage_sli_prober + metadata.appcat.vshn.io/revision: debug-5bee80618f73975564bd276a5f36d1028b1aaa9f metadata.appcat.vshn.io/serviceID: vshn-garage name: vshngarage.vshn.appcat.vshn.io name: vshngarage.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-garage-sli-prober + name: function-appcat-debug-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -46,7 +46,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: '' - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance maintenanceURL: '' 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 d980339874..b4c1c75298 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-garage_sli_prober + metadata.appcat.vshn.io/revision: debug-5bee80618f73975564bd276a5f36d1028b1aaa9f 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-garage-sli-prober + name: function-appcat-debug-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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 e3f1d2e8af..b05b2a82a8 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-garage_sli_prober + metadata.appcat.vshn.io/revision: debug-5bee80618f73975564bd276a5f36d1028b1aaa9f 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-garage-sli-prober + name: function-appcat-debug-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -47,7 +47,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io imageRepositoryPrefix: bitnamilegacy - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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 d4003d5010..59bc288ba8 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-garage_sli_prober + metadata.appcat.vshn.io/revision: debug-5bee80618f73975564bd276a5f36d1028b1aaa9f 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-garage-sli-prober + name: function-appcat-debug-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -55,7 +55,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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 346103fd00..94e2d7abde 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-garage_sli_prober + metadata.appcat.vshn.io/revision: debug-5bee80618f73975564bd276a5f36d1028b1aaa9f 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-garage-sli-prober + name: function-appcat-debug-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -50,7 +50,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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_postgrescnpg.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_postgrescnpg.yaml index bab6671ffd..ece173d978 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_postgrescnpg.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_postgrescnpg.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-garage_sli_prober + metadata.appcat.vshn.io/revision: debug-5bee80618f73975564bd276a5f36d1028b1aaa9f metadata.appcat.vshn.io/serviceID: vshn-postgresqlcnpg name: vshnpostgrescnpg.vshn.appcat.vshn.io name: vshnpostgrescnpg.vshn.appcat.vshn.io @@ -26,7 +26,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-debug-garage-sli-prober + name: function-appcat-debug-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -50,7 +50,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f isOpenshift: 'false' kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15 loadbalancerAnnotations: | 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 0efc5a34f0..be3ea67c54 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-garage_sli_prober + metadata.appcat.vshn.io/revision: debug-5bee80618f73975564bd276a5f36d1028b1aaa9f 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-garage-sli-prober + name: function-appcat-debug-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -52,7 +52,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: ghcr.io imageRepositoryPrefix: vshn - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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 d10652478a..e249276078 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:garage_sli_prober + image: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f imagePullPolicy: Always livenessProbe: failureThreshold: 3 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 0d2cbd16cb..0ded142b35 100644 --- a/tests/golden/dev/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/dev/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -39,7 +39,7 @@ spec: } - name: CROSSPLANE_EXTRA_RESOURCES value: '' - image: ghcr.io/vshn/appcat:garage_sli_prober + image: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f 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 9cb90fa723..dbc69a3777 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: garage/sli_prober + function-revision: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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 7d0d692cbb..bc585ca57a 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: garage/sli_prober + function-revision: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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 c84a5bff52..1506927435 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:garage_sli_prober + image: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f 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 c3aaf5c89d..412245da7a 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:garage_sli_prober + image: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f 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 b81a51afec..80888a00d3 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f spec: - package: ghcr.io/vshn/appcat:garage_sli_prober-func + package: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f-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 9aab8e0e05..d6ab141e95 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f 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 b801aad129..588e08694b 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:garage_sli_prober + image: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 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 8c47d42f9d..23402103b6 100644 --- a/tests/golden/exodev/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/exodev/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -39,7 +39,7 @@ spec: } - name: CROSSPLANE_EXTRA_RESOURCES value: '' - image: ghcr.io/vshn/appcat:garage_sli_prober + image: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f 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 dd11eba1e7..ba28084494 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: garage/sli_prober + function-revision: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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 4518eefa59..b0f766d837 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: garage/sli_prober + function-revision: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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 c84a5bff52..1506927435 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:garage_sli_prober + image: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f name: sla-reporter resources: limits: 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 a7440f18be..5dc96f9441 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 @@ -44,7 +44,7 @@ spec: } - name: CROSSPLANE_EXTRA_RESOURCES value: '' - image: ghcr.io/vshn/appcat:garage_sli_prober + image: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f 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 4f10304362..fcbd9cae9e 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:garage_sli_prober + image: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f 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 b81a51afec..80888a00d3 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f spec: - package: ghcr.io/vshn/appcat:garage_sli_prober-func + package: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f-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 5626c55703..8e42892240 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f 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 9aab8e0e05..d6ab141e95 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f 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 8643765056..397bdbaa93 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f 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 79009166f3..67b649229d 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-garage_sli_prober + metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f 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 ea33f75736..d01fcfbcbb 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-garage_sli_prober + metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -47,7 +47,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: code.forgejo.org - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-production isOpenshift: 'true' diff --git a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_garage.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_garage.yaml index d245cb5761..b0e2d460e9 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_garage.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_garage.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-garage_sli_prober + metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f metadata.appcat.vshn.io/serviceID: vshn-garage name: vshngarage.vshn.appcat.vshn.io name: vshngarage.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -46,7 +46,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: '' - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance maintenanceURL: '' 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 388e2fad53..56522bc130 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-garage_sli_prober + metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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 eb44fa37f6..54aefef005 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-garage_sli_prober + metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -47,7 +47,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net imageRepositoryPrefix: bitnamilegacy - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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 68555e20b2..f3bd9a033e 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-garage_sli_prober + metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -46,7 +46,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net/ - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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 7e45c2ffd8..61894dff35 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-garage_sli_prober + metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -55,7 +55,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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 eb1137d291..e0ab01cafd 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-garage_sli_prober + metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -50,7 +50,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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_postgrescnpg.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_postgrescnpg.yaml index 72501fa8ef..f96ce844db 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_postgrescnpg.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_postgrescnpg.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-garage_sli_prober + metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f metadata.appcat.vshn.io/serviceID: vshn-postgresqlcnpg name: vshnpostgrescnpg.vshn.appcat.vshn.io name: vshnpostgrescnpg.vshn.appcat.vshn.io @@ -26,7 +26,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -50,7 +50,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f isOpenshift: 'true' kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15 loadbalancerAnnotations: | 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 1c6fe37339..42c7608375 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-garage_sli_prober + metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -52,7 +52,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net imageRepositoryPrefix: vshn - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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 29a42ed5ba..b630889254 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:garage_sli_prober + image: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 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 1a03176ff1..657361ea9e 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 @@ -39,7 +39,7 @@ spec: } - name: CROSSPLANE_EXTRA_RESOURCES value: '' - image: ghcr.io/vshn/appcat:garage_sli_prober + image: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f 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 7ebe266088..cc0ef5e9d9 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: garage/sli_prober + function-revision: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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 849d914349..fee3eea427 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: garage/sli_prober + function-revision: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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 c84a5bff52..1506927435 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:garage_sli_prober + image: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f 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 66622466be..3cc80030d1 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:garage_sli_prober + image: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f 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 b81a51afec..80888a00d3 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f spec: - package: ghcr.io/vshn/appcat:garage_sli_prober-func + package: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f-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 5626c55703..8e42892240 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f 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 9aab8e0e05..d6ab141e95 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f 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 8643765056..397bdbaa93 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f 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 79009166f3..67b649229d 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-garage_sli_prober + metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f 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 9dfec5fffb..aea1e9fe02 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-garage_sli_prober + metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -47,7 +47,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: code.forgejo.org - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f ingress_annotations: | cert-manager.io/cluster-issuer: letsencrypt-production isOpenshift: 'true' diff --git a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_garage.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_garage.yaml index 8619498b46..d08adb7d84 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_garage.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_garage.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-garage_sli_prober + metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f metadata.appcat.vshn.io/serviceID: vshn-garage name: vshngarage.vshn.appcat.vshn.io name: vshngarage.vshn.appcat.vshn.io @@ -24,7 +24,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -46,7 +46,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: '' - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance maintenanceURL: '' 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 7b6d95cb1c..5e90008088 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-garage_sli_prober + metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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 542b6289d3..8d0bdc071c 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-garage_sli_prober + metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -47,7 +47,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io imageRepositoryPrefix: bitnamilegacy - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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 b7654e4bb1..ee46b966c8 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-garage_sli_prober + metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -46,7 +46,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: '' - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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 d27fc6654b..5f4f52b136 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-garage_sli_prober + metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -55,7 +55,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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 e0c7814814..fbb468e663 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-garage_sli_prober + metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -50,7 +50,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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_postgrescnpg.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_postgrescnpg.yaml index bc227b80b6..e6591768be 100644 --- a/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_postgrescnpg.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_postgrescnpg.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-garage_sli_prober + metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f metadata.appcat.vshn.io/serviceID: vshn-postgresqlcnpg name: vshnpostgrescnpg.vshn.appcat.vshn.io name: vshnpostgrescnpg.vshn.appcat.vshn.io @@ -26,7 +26,7 @@ spec: mode: Pipeline pipeline: - functionRef: - name: function-appcat-master-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -50,7 +50,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f isOpenshift: 'true' kubectl_image: docker.io/bitnamilegacy/kubectl:1.25.15 loadbalancerAnnotations: | 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 34ee5e4d66..61b3dbed8c 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-garage_sli_prober + metadata.appcat.vshn.io/revision: master-5bee80618f73975564bd276a5f36d1028b1aaa9f 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-garage-sli-prober + name: function-appcat-master-5bee80618f73975564bd276a5f36d1028b1aaa9f input: apiVersion: v1 data: @@ -52,7 +52,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: ghcr.io imageRepositoryPrefix: vshn - imageTag: garage_sli_prober + imageTag: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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 29a42ed5ba..b630889254 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:garage_sli_prober + image: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 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 1a03176ff1..657361ea9e 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 @@ -39,7 +39,7 @@ spec: } - name: CROSSPLANE_EXTRA_RESOURCES value: '' - image: ghcr.io/vshn/appcat:garage_sli_prober + image: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f 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 7ebe266088..cc0ef5e9d9 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: garage/sli_prober + function-revision: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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 849d914349..fee3eea427 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: garage/sli_prober + function-revision: 5bee80618f73975564bd276a5f36d1028b1aaa9f 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 c84a5bff52..1506927435 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:garage_sli_prober + image: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f 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 66622466be..3cc80030d1 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:garage_sli_prober + image: ghcr.io/vshn/appcat:5bee80618f73975564bd276a5f36d1028b1aaa9f imagePullPolicy: IfNotPresent livenessProbe: httpGet: