diff --git a/class/defaults.yml b/class/defaults.yml index 3f6fd8ded..9beb6ddaa 100644 --- a/class/defaults.yml +++ b/class/defaults.yml @@ -94,7 +94,7 @@ parameters: appcat: registry: ghcr.io repository: vshn/appcat - tag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + tag: enable-forgejo-billing 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 33c544709..3f7026cf4 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing spec: - package: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f-func + package: ghcr.io/vshn/appcat:enable-forgejo-billing-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 884a93e2a..0ca06bd98 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing 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 84b6ecc56..a9292011b 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-enable-forgejo-billing 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 24d323006..9bd6cd17c 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: code.forgejo.org - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 a1700d0f8..1ee5f17dd 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing input: apiVersion: v1 data: @@ -48,7 +48,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: '' - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 6300ca1df..dd651e6f1 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing input: apiVersion: v1 data: @@ -54,7 +54,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 9cfeff5ce..909c30667 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io imageRepositoryPrefix: bitnamilegacy - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 2bf7c9578..6e9d2ac7c 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing input: apiVersion: v1 data: @@ -57,7 +57,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 280d37cb5..d76c9267c 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing input: apiVersion: v1 data: @@ -52,7 +52,7 @@ spec: httpGatewayName: '' httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 52c7bfe97..7576e413f 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing input: apiVersion: v1 data: @@ -52,7 +52,7 @@ spec: httpGatewayName: '' httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 63a987bdf..c3a500a7f 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing input: apiVersion: v1 data: @@ -54,7 +54,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: ghcr.io imageRepositoryPrefix: vshn - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 2322990b7..f3389c542 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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:enable-forgejo-billing 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 e60b86990..54022b006 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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:enable-forgejo-billing 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 0e2025d8c..d72ee52c0 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: 2e7c65656ed82828dbceb4a1196c17d128a2033f + function-revision: enable-forgejo-billing 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 cbfad7d30..660c59a60 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: 2e7c65656ed82828dbceb4a1196c17d128a2033f + function-revision: enable-forgejo-billing 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 c8299593d..1342bdbc2 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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:enable-forgejo-billing 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 33c544709..3f7026cf4 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing spec: - package: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f-func + package: ghcr.io/vshn/appcat:enable-forgejo-billing-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 25c597550..1f24879b8 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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:enable-forgejo-billing 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 0e2025d8c..d72ee52c0 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: 2e7c65656ed82828dbceb4a1196c17d128a2033f + function-revision: enable-forgejo-billing 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 cbfad7d30..660c59a60 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: 2e7c65656ed82828dbceb4a1196c17d128a2033f + function-revision: enable-forgejo-billing 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 a67cb6fb7..5e83b997a 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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:enable-forgejo-billing 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 2a3e8d6a6..5623e6231 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-enable-forgejo-billing spec: - package: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f-func + package: ghcr.io/vshn/appcat:enable-forgejo-billing-func packagePullPolicy: Always runtimeConfigRef: name: enable-proxy 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 773f782cf..302296d68 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-enable-forgejo-billing 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 2eeb39f20..e1753e7a5 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-enable-forgejo-billing 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 3dac24068..fb7983451 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-enable-forgejo-billing input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: httpGatewayNamespace: kgateway-system ignoreNamespaceForBilling: vshn-test imageRegistry: code.forgejo.org - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 0ff97badb..7444265b2 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-enable-forgejo-billing input: apiVersion: v1 data: @@ -48,7 +48,7 @@ spec: httpGatewayNamespace: kgateway-system ignoreNamespaceForBilling: vshn-test imageRegistry: '' - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 e0f5acb2e..40a108e0a 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-enable-forgejo-billing input: apiVersion: v1 data: @@ -54,7 +54,7 @@ spec: httpGatewayNamespace: kgateway-system ignoreNamespaceForBilling: vshn-test imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 e975c250d..7a03c5b0c 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-enable-forgejo-billing input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io imageRepositoryPrefix: bitnamilegacy - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 585029b59..a3199cc8b 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-enable-forgejo-billing input: apiVersion: v1 data: @@ -57,7 +57,7 @@ spec: httpGatewayNamespace: kgateway-system ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 46b2e290b..fffeab358 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-enable-forgejo-billing input: apiVersion: v1 data: @@ -50,7 +50,7 @@ spec: httpGatewayName: http-gateway httpGatewayNamespace: kgateway-system ignoreNamespaceForBilling: vshn-test - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 c78a2c4d6..316663fb5 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-enable-forgejo-billing input: apiVersion: v1 data: @@ -50,7 +50,7 @@ spec: httpGatewayName: http-gateway httpGatewayNamespace: kgateway-system ignoreNamespaceForBilling: vshn-test - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 f3e8240d2..8cca4332a 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-enable-forgejo-billing input: apiVersion: v1 data: @@ -50,7 +50,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: ghcr.io imageRepositoryPrefix: vshn - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 7bfa026aa..76fdcb50d 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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:enable-forgejo-billing 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 b5b53ff87..5c550ce93 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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:enable-forgejo-billing 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 5853d59c5..51480475d 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: 2e7c65656ed82828dbceb4a1196c17d128a2033f + function-revision: enable-forgejo-billing 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 c6333557a..371a894f6 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: 2e7c65656ed82828dbceb4a1196c17d128a2033f + function-revision: enable-forgejo-billing 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 c8299593d..1342bdbc2 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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:enable-forgejo-billing 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 cb4918776..c4af8596c 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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:enable-forgejo-billing 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 2a3e8d6a6..5623e6231 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-enable-forgejo-billing spec: - package: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f-func + package: ghcr.io/vshn/appcat:enable-forgejo-billing-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 77e468931..94948fb43 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-enable-forgejo-billing 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 2eeb39f20..e1753e7a5 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-enable-forgejo-billing 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 6575ff4d1..275bdb1aa 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-enable-forgejo-billing input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: code.forgejo.org - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 fc5f43fef..30e0c7ccc 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-enable-forgejo-billing input: apiVersion: v1 data: @@ -48,7 +48,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: '' - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 1154986f2..e7daedd58 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-enable-forgejo-billing input: apiVersion: v1 data: @@ -54,7 +54,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 2222cc398..4e160e272 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-enable-forgejo-billing input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io imageRepositoryPrefix: bitnamilegacy - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 3a02538b9..37fc4f13e 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-enable-forgejo-billing input: apiVersion: v1 data: @@ -57,7 +57,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 807aac75c..eaf153516 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-enable-forgejo-billing input: apiVersion: v1 data: @@ -52,7 +52,7 @@ spec: httpGatewayName: '' httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 021144f4a..a06d5a5c3 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-enable-forgejo-billing input: apiVersion: v1 data: @@ -52,7 +52,7 @@ spec: httpGatewayName: '' httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 94c989bbb..7e8cedf32 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: debug-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-debug-enable-forgejo-billing input: apiVersion: v1 data: @@ -54,7 +54,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: ghcr.io imageRepositoryPrefix: vshn - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 7bfa026aa..76fdcb50d 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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:enable-forgejo-billing 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 0fef85a60..ce7cb936b 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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:enable-forgejo-billing 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 f7ad9468c..4e66b28ca 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: 2e7c65656ed82828dbceb4a1196c17d128a2033f + function-revision: enable-forgejo-billing 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 0ee6b72d2..8a3b65cb8 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: 2e7c65656ed82828dbceb4a1196c17d128a2033f + function-revision: enable-forgejo-billing 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 c8299593d..1342bdbc2 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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:enable-forgejo-billing 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 cb4918776..c4af8596c 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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:enable-forgejo-billing 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 33c544709..3f7026cf4 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing spec: - package: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f-func + package: ghcr.io/vshn/appcat:enable-forgejo-billing-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 a13201be1..2bf66d9c2 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing 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 123f3260e..be8631cc3 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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:enable-forgejo-billing 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 b3d59d5ea..e73efb205 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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:enable-forgejo-billing 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 0e2025d8c..d72ee52c0 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: 2e7c65656ed82828dbceb4a1196c17d128a2033f + function-revision: enable-forgejo-billing 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 cbfad7d30..660c59a60 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: 2e7c65656ed82828dbceb4a1196c17d128a2033f + function-revision: enable-forgejo-billing 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 c8299593d..1342bdbc2 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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:enable-forgejo-billing 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 44b37f767..84393a807 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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:enable-forgejo-billing 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 eff78a844..3e4d13c25 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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:enable-forgejo-billing 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 33c544709..3f7026cf4 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing spec: - package: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f-func + package: ghcr.io/vshn/appcat:enable-forgejo-billing-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 3ad663092..1e62bdc8b 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing 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 a13201be1..2bf66d9c2 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing 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 884a93e2a..0ca06bd98 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing 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 84b6ecc56..a9292011b 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-enable-forgejo-billing 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 97431f479..a7a6e10d7 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: code.forgejo.org - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 a86cd066d..887f68401 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing input: apiVersion: v1 data: @@ -48,7 +48,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: '' - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 11d0129a0..9a2c05326 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing input: apiVersion: v1 data: @@ -54,7 +54,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 21b4c1f0c..50e56df25 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net imageRepositoryPrefix: bitnamilegacy - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 f08ae943f..62c0afe02 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing input: apiVersion: v1 data: @@ -48,7 +48,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net/ - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 60bc72927..002117443 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing input: apiVersion: v1 data: @@ -57,7 +57,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 1cb998011..6336f17e1 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing input: apiVersion: v1 data: @@ -52,7 +52,7 @@ spec: httpGatewayName: '' httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 45ea215b5..b10159aef 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing input: apiVersion: v1 data: @@ -52,7 +52,7 @@ spec: httpGatewayName: '' httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 7cfd59d55..f651b84d2 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing input: apiVersion: v1 data: @@ -54,7 +54,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: dockerhub.vshn.net imageRepositoryPrefix: vshn - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 04c368971..9861d3015 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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:enable-forgejo-billing 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 22acbccb9..51ab68bd9 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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:enable-forgejo-billing 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 f817dfe6d..e109f25a5 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: 2e7c65656ed82828dbceb4a1196c17d128a2033f + function-revision: enable-forgejo-billing 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 5aec4c417..2e062e207 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: 2e7c65656ed82828dbceb4a1196c17d128a2033f + function-revision: enable-forgejo-billing 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 c8299593d..1342bdbc2 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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:enable-forgejo-billing 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 a67cb6fb7..5e83b997a 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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:enable-forgejo-billing 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 33c544709..3f7026cf4 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing spec: - package: ghcr.io/vshn/appcat:2e7c65656ed82828dbceb4a1196c17d128a2033f-func + package: ghcr.io/vshn/appcat:enable-forgejo-billing-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 3ad663092..1e62bdc8b 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing 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 a13201be1..2bf66d9c2 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing 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 884a93e2a..0ca06bd98 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing 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 84b6ecc56..a9292011b 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-enable-forgejo-billing 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 403cb4ad7..0b8fbc252 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: code.forgejo.org - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 b12f71b22..2917943d7 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing input: apiVersion: v1 data: @@ -48,7 +48,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: '' - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 a488d4075..284515ab4 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing input: apiVersion: v1 data: @@ -54,7 +54,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 daf428ab5..6b1a700c6 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing input: apiVersion: v1 data: @@ -49,7 +49,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io imageRepositoryPrefix: bitnamilegacy - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 97f052c73..240d33ec6 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing input: apiVersion: v1 data: @@ -48,7 +48,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: '' - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 b8d104de6..18122faf8 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing input: apiVersion: v1 data: @@ -57,7 +57,7 @@ spec: httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test imageRegistry: docker.io - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 0c54cdd0c..9590e7f12 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing input: apiVersion: v1 data: @@ -52,7 +52,7 @@ spec: httpGatewayName: '' httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 097ef537d..f748db9f1 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing input: apiVersion: v1 data: @@ -52,7 +52,7 @@ spec: httpGatewayName: '' httpGatewayNamespace: '' ignoreNamespaceForBilling: vshn-test - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 d1db3b836..3e7e442d4 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + metadata.appcat.vshn.io/revision: master-enable-forgejo-billing 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-2e7c65656ed82828dbceb4a1196c17d128a2033f + name: function-appcat-master-enable-forgejo-billing input: apiVersion: v1 data: @@ -54,7 +54,7 @@ spec: ignoreNamespaceForBilling: vshn-test imageRegistry: ghcr.io imageRepositoryPrefix: vshn - imageTag: 2e7c65656ed82828dbceb4a1196c17d128a2033f + imageTag: enable-forgejo-billing 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 04c368971..9861d3015 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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:enable-forgejo-billing 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 22acbccb9..51ab68bd9 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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:enable-forgejo-billing 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 f817dfe6d..e109f25a5 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: 2e7c65656ed82828dbceb4a1196c17d128a2033f + function-revision: enable-forgejo-billing 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 5aec4c417..2e062e207 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: 2e7c65656ed82828dbceb4a1196c17d128a2033f + function-revision: enable-forgejo-billing 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 c8299593d..1342bdbc2 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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:enable-forgejo-billing 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 a67cb6fb7..5e83b997a 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:2e7c65656ed82828dbceb4a1196c17d128a2033f + image: ghcr.io/vshn/appcat:enable-forgejo-billing imagePullPolicy: IfNotPresent livenessProbe: httpGet: