From 7fffe511fc1942acea1ddb844b72eedc2ec188aa Mon Sep 17 00:00:00 2001 From: zugao <58511627+zugao@users.noreply.github.com> Date: Thu, 5 Dec 2024 12:16:44 +0000 Subject: [PATCH] [create-pull-request] automated change --- class/defaults.yml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/appcat/20_xrd_vshn_keycloak.yaml | 1 - .../appcat/appcat/20_xrd_vshn_mariadb.yaml | 1 - .../appcat/appcat/20_xrd_vshn_nextcloud.yaml | 44 +++++++++++-------- .../appcat/appcat/20_xrd_vshn_redis.yaml | 1 - .../appcat/21_composition_vshn_keycloak.yaml | 2 +- .../appcat/21_composition_vshn_mariadb.yaml | 2 +- .../appcat/21_composition_vshn_nextcloud.yaml | 2 +- .../appcat/21_composition_vshn_postgres.yaml | 2 +- .../appcat/21_composition_vshn_redis.yaml | 2 +- .../appcat/apiserver/30_deployment.yaml | 2 +- .../controllers/appcat/30_deployment.yaml | 2 +- .../appcat/sla_reporter/01_cronjob.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/apiserver/30_deployment.yaml | 2 +- ...appcat-sliexporter-controller-manager.yaml | 2 +- .../dev/appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/appcat/20_xrd_vshn_keycloak.yaml | 1 - .../appcat/appcat/20_xrd_vshn_mariadb.yaml | 1 - .../appcat/appcat/20_xrd_vshn_nextcloud.yaml | 44 +++++++++++-------- .../dev/appcat/appcat/20_xrd_vshn_redis.yaml | 1 - .../appcat/21_composition_vshn_keycloak.yaml | 2 +- .../appcat/21_composition_vshn_mariadb.yaml | 2 +- .../appcat/21_composition_vshn_nextcloud.yaml | 2 +- .../appcat/21_composition_vshn_postgres.yaml | 2 +- .../appcat/21_composition_vshn_redis.yaml | 2 +- .../appcat/apiserver/30_deployment.yaml | 2 +- .../controllers/appcat/30_deployment.yaml | 2 +- .../appcat/sla_reporter/01_cronjob.yaml | 2 +- ...appcat-sliexporter-controller-manager.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/apiserver/30_deployment.yaml | 2 +- .../controllers/appcat/30_deployment.yaml | 2 +- .../appcat/sla_reporter/01_cronjob.yaml | 2 +- .../controllers/appcat/30_deployment.yaml | 2 +- ...appcat-sliexporter-controller-manager.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/appcat/20_xrd_vshn_keycloak.yaml | 1 - .../appcat/appcat/20_xrd_vshn_mariadb.yaml | 1 - .../appcat/appcat/20_xrd_vshn_nextcloud.yaml | 44 +++++++++++-------- .../appcat/appcat/20_xrd_vshn_redis.yaml | 1 - .../appcat/21_composition_vshn_keycloak.yaml | 2 +- .../appcat/21_composition_vshn_mariadb.yaml | 2 +- .../appcat/21_composition_vshn_minio.yaml | 2 +- .../appcat/21_composition_vshn_nextcloud.yaml | 2 +- .../appcat/21_composition_vshn_postgres.yaml | 2 +- .../appcat/21_composition_vshn_redis.yaml | 2 +- .../appcat/apiserver/30_deployment.yaml | 2 +- .../controllers/appcat/30_deployment.yaml | 2 +- .../appcat/sla_reporter/01_cronjob.yaml | 2 +- ...appcat-sliexporter-controller-manager.yaml | 2 +- .../appcat/appcat/10_function_appcat.yaml | 2 +- .../appcat/appcat/20_xrd_vshn_keycloak.yaml | 1 - .../appcat/appcat/20_xrd_vshn_mariadb.yaml | 1 - .../appcat/appcat/20_xrd_vshn_nextcloud.yaml | 44 +++++++++++-------- .../appcat/appcat/20_xrd_vshn_redis.yaml | 1 - .../appcat/21_composition_vshn_keycloak.yaml | 2 +- .../appcat/21_composition_vshn_mariadb.yaml | 2 +- .../appcat/21_composition_vshn_minio.yaml | 2 +- .../appcat/21_composition_vshn_nextcloud.yaml | 2 +- .../appcat/21_composition_vshn_postgres.yaml | 2 +- .../appcat/21_composition_vshn_redis.yaml | 2 +- .../appcat/apiserver/30_deployment.yaml | 2 +- .../controllers/appcat/30_deployment.yaml | 2 +- .../appcat/sla_reporter/01_cronjob.yaml | 2 +- ...appcat-sliexporter-controller-manager.yaml | 2 +- 67 files changed, 151 insertions(+), 139 deletions(-) diff --git a/class/defaults.yml b/class/defaults.yml index 22ac4576a8..285bed4e90 100644 --- a/class/defaults.yml +++ b/class/defaults.yml @@ -55,7 +55,7 @@ parameters: appcat: registry: ghcr.io repository: vshn/appcat - tag: v4.118.3 + tag: id-addon-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 8cd6109886..106dfad8b1 100644 --- a/tests/golden/control-plane/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/control-plane/appcat/appcat/10_function_appcat.yaml @@ -6,6 +6,6 @@ metadata: argocd.argoproj.io/sync-wave: '-40' name: function-appcat spec: - package: ghcr.io/vshn/appcat:v4.118.3-func + package: ghcr.io/vshn/appcat:id-addon-billing-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_keycloak.yaml b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_keycloak.yaml index 4a83d77cf6..291d16ef75 100644 --- a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_keycloak.yaml +++ b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_keycloak.yaml @@ -43,7 +43,6 @@ spec: should get backed up. properties: retention: - default: {} description: K8upRetentionPolicy describes the retention configuration for a K8up backup. properties: diff --git a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_mariadb.yaml b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_mariadb.yaml index 4dce35cd4b..1a71c67ec9 100644 --- a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_mariadb.yaml +++ b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_mariadb.yaml @@ -44,7 +44,6 @@ spec: should get backed up. properties: retention: - default: {} description: K8upRetentionPolicy describes the retention configuration for a K8up backup. properties: diff --git a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_nextcloud.yaml b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_nextcloud.yaml index d6c652e94b..5fe45965f9 100644 --- a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_nextcloud.yaml +++ b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_nextcloud.yaml @@ -37,13 +37,37 @@ spec: default: {} description: Parameters are the configurable fields of a VSHNNextcloud. properties: + addOns: + description: |- + VSHNNextcloudAddOns are additional components, modules, or extensions that enhances the functionality of VSHN Nextcloud. + Add-ons are designed to provide optional features or capabilities that are not part of the main product but + can be installed as needed. Usually add-on are billed separately. + properties: + office: + description: Office contains settings to control the Collabora + integration. + properties: + enabled: + default: false + description: Enabled enables the Collabora integration. + It will autoconfigure the Collabora server URL in + Your Nextcloud instance. + type: boolean + fqdn: + description: FQDN contains the FQDN of the Collabora + server. This is used to configure the Collabora server + URL in Your Nextcloud instance. + type: string + required: + - enabled + type: object + type: object backup: default: {} description: Backup contains settings to control how the instance should get backed up. properties: retention: - default: {} description: K8upRetentionPolicy describes the retention configuration for a K8up backup. properties: @@ -5615,24 +5639,6 @@ spec: default: {} description: Service contains nextcloud DBaaS specific properties properties: - collabora: - description: Collabora contains settings to control the - Collabora integration. - properties: - enabled: - default: false - description: Enabled enables the Collabora integration. - It will autoconfigure the Collabora server URL in - Your Nextcloud instance. - type: boolean - fqdn: - description: FQDN contains the FQDN of the Collabora - server. This is used to configure the Collabora server - URL in Your Nextcloud instance. - type: string - required: - - enabled - type: object fqdn: description: |- FQDN contains the FQDNs array, which will be used for the ingress. diff --git a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_redis.yaml b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_redis.yaml index bfde9ddeda..7fd70639ae 100644 --- a/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_redis.yaml +++ b/tests/golden/control-plane/appcat/appcat/20_xrd_vshn_redis.yaml @@ -46,7 +46,6 @@ spec: should get backed up. properties: retention: - default: {} description: K8upRetentionPolicy describes the retention configuration for a K8up backup. properties: 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 f8939b5b37..49c5f868b8 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 @@ -40,7 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.118.3 + imageTag: id-addon-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 834496c322..b4e9e9dbeb 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 @@ -40,7 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.118.3 + imageTag: id-addon-billing isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance mode: standalone 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 bb199dd707..39ee8fc59c 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 @@ -45,7 +45,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.118.3 + imageTag: id-addon-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 8c11e1f996..6f6fe49cd1 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 @@ -41,7 +41,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: v4.118.3 + imageTag: id-addon-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_redis.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_redis.yaml index 6013497540..135fc8bbae 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 @@ -597,7 +597,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.118.3 + imageTag: id-addon-billing isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance ownerGroup: vshn.appcat.vshn.io 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 2a9a736cd5..3e76067bf8 100644 --- a/tests/golden/control-plane/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/control-plane/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +29,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:v4.118.3 + image: ghcr.io/vshn/appcat:id-addon-billing livenessProbe: failureThreshold: 3 httpGet: 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 b5130d2fc0..9f08128c0f 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 @@ -23,7 +23,7 @@ spec: env: - name: PLANS_NAMESPACE value: syn-appcat - image: ghcr.io/vshn/appcat:v4.118.3 + image: ghcr.io/vshn/appcat:id-addon-billing livenessProbe: httpGet: path: /healthz 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 e6787f567a..bded94676f 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:v4.118.3 + image: ghcr.io/vshn/appcat:id-addon-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 8cd6109886..106dfad8b1 100644 --- a/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml @@ -6,6 +6,6 @@ metadata: argocd.argoproj.io/sync-wave: '-40' name: function-appcat spec: - package: ghcr.io/vshn/appcat:v4.118.3-func + package: ghcr.io/vshn/appcat:id-addon-billing-func 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 2a9a736cd5..3e76067bf8 100644 --- a/tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/defaults/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +29,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:v4.118.3 + image: ghcr.io/vshn/appcat:id-addon-billing livenessProbe: failureThreshold: 3 httpGet: 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 edbe612c73..51b6dfe19a 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 @@ -24,7 +24,7 @@ spec: - --health-probe-bind-address=:8081 - --metrics-bind-address=127.0.0.1:8080 env: [] - image: ghcr.io/vshn/appcat:v4.118.3 + image: ghcr.io/vshn/appcat:id-addon-billing livenessProbe: httpGet: path: /healthz diff --git a/tests/golden/dev/appcat/appcat/10_function_appcat.yaml b/tests/golden/dev/appcat/appcat/10_function_appcat.yaml index 8cd6109886..106dfad8b1 100644 --- a/tests/golden/dev/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/dev/appcat/appcat/10_function_appcat.yaml @@ -6,6 +6,6 @@ metadata: argocd.argoproj.io/sync-wave: '-40' name: function-appcat spec: - package: ghcr.io/vshn/appcat:v4.118.3-func + package: ghcr.io/vshn/appcat:id-addon-billing-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/dev/appcat/appcat/20_xrd_vshn_keycloak.yaml b/tests/golden/dev/appcat/appcat/20_xrd_vshn_keycloak.yaml index 6c24d51519..a16962851e 100644 --- a/tests/golden/dev/appcat/appcat/20_xrd_vshn_keycloak.yaml +++ b/tests/golden/dev/appcat/appcat/20_xrd_vshn_keycloak.yaml @@ -43,7 +43,6 @@ spec: should get backed up. properties: retention: - default: {} description: K8upRetentionPolicy describes the retention configuration for a K8up backup. properties: diff --git a/tests/golden/dev/appcat/appcat/20_xrd_vshn_mariadb.yaml b/tests/golden/dev/appcat/appcat/20_xrd_vshn_mariadb.yaml index f1affe1bc1..db2406390e 100644 --- a/tests/golden/dev/appcat/appcat/20_xrd_vshn_mariadb.yaml +++ b/tests/golden/dev/appcat/appcat/20_xrd_vshn_mariadb.yaml @@ -44,7 +44,6 @@ spec: should get backed up. properties: retention: - default: {} description: K8upRetentionPolicy describes the retention configuration for a K8up backup. properties: diff --git a/tests/golden/dev/appcat/appcat/20_xrd_vshn_nextcloud.yaml b/tests/golden/dev/appcat/appcat/20_xrd_vshn_nextcloud.yaml index 6efba87400..7f7a671a54 100644 --- a/tests/golden/dev/appcat/appcat/20_xrd_vshn_nextcloud.yaml +++ b/tests/golden/dev/appcat/appcat/20_xrd_vshn_nextcloud.yaml @@ -37,13 +37,37 @@ spec: default: {} description: Parameters are the configurable fields of a VSHNNextcloud. properties: + addOns: + description: |- + VSHNNextcloudAddOns are additional components, modules, or extensions that enhances the functionality of VSHN Nextcloud. + Add-ons are designed to provide optional features or capabilities that are not part of the main product but + can be installed as needed. Usually add-on are billed separately. + properties: + office: + description: Office contains settings to control the Collabora + integration. + properties: + enabled: + default: false + description: Enabled enables the Collabora integration. + It will autoconfigure the Collabora server URL in + Your Nextcloud instance. + type: boolean + fqdn: + description: FQDN contains the FQDN of the Collabora + server. This is used to configure the Collabora server + URL in Your Nextcloud instance. + type: string + required: + - enabled + type: object + type: object backup: default: {} description: Backup contains settings to control how the instance should get backed up. properties: retention: - default: {} description: K8upRetentionPolicy describes the retention configuration for a K8up backup. properties: @@ -5615,24 +5639,6 @@ spec: default: {} description: Service contains nextcloud DBaaS specific properties properties: - collabora: - description: Collabora contains settings to control the - Collabora integration. - properties: - enabled: - default: false - description: Enabled enables the Collabora integration. - It will autoconfigure the Collabora server URL in - Your Nextcloud instance. - type: boolean - fqdn: - description: FQDN contains the FQDN of the Collabora - server. This is used to configure the Collabora server - URL in Your Nextcloud instance. - type: string - required: - - enabled - type: object fqdn: description: |- FQDN contains the FQDNs array, which will be used for the ingress. diff --git a/tests/golden/dev/appcat/appcat/20_xrd_vshn_redis.yaml b/tests/golden/dev/appcat/appcat/20_xrd_vshn_redis.yaml index a3849a5808..47de0f5c0b 100644 --- a/tests/golden/dev/appcat/appcat/20_xrd_vshn_redis.yaml +++ b/tests/golden/dev/appcat/appcat/20_xrd_vshn_redis.yaml @@ -46,7 +46,6 @@ spec: should get backed up. properties: retention: - default: {} description: K8upRetentionPolicy describes the retention configuration for a K8up backup. properties: 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 c7dfb2c369..0352c17609 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_keycloak.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_keycloak.yaml @@ -40,7 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.118.3 + imageTag: id-addon-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 5c16d9af2b..79b5702169 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_mariadb.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_mariadb.yaml @@ -40,7 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.118.3 + imageTag: id-addon-billing isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance mode: standalone 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 ac7d831066..4dabce0caf 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_nextcloud.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_nextcloud.yaml @@ -45,7 +45,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.118.3 + imageTag: id-addon-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 f08620c1d8..7ec7c9fb07 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_postgres.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_postgres.yaml @@ -41,7 +41,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: v4.118.3 + imageTag: id-addon-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_redis.yaml b/tests/golden/dev/appcat/appcat/21_composition_vshn_redis.yaml index 923db39ff8..97145603c1 100644 --- a/tests/golden/dev/appcat/appcat/21_composition_vshn_redis.yaml +++ b/tests/golden/dev/appcat/appcat/21_composition_vshn_redis.yaml @@ -597,7 +597,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.118.3 + imageTag: id-addon-billing isOpenshift: 'false' maintenanceSA: helm-based-service-maintenance ownerGroup: vshn.appcat.vshn.io diff --git a/tests/golden/dev/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/dev/appcat/appcat/apiserver/30_deployment.yaml index 2a9a736cd5..3e76067bf8 100644 --- a/tests/golden/dev/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/dev/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +29,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:v4.118.3 + image: ghcr.io/vshn/appcat:id-addon-billing livenessProbe: failureThreshold: 3 httpGet: 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 b5130d2fc0..9f08128c0f 100644 --- a/tests/golden/dev/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/dev/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -23,7 +23,7 @@ spec: env: - name: PLANS_NAMESPACE value: syn-appcat - image: ghcr.io/vshn/appcat:v4.118.3 + image: ghcr.io/vshn/appcat:id-addon-billing livenessProbe: httpGet: path: /healthz 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 e6787f567a..bded94676f 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:v4.118.3 + image: ghcr.io/vshn/appcat:id-addon-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 edbe612c73..51b6dfe19a 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 @@ -24,7 +24,7 @@ spec: - --health-probe-bind-address=:8081 - --metrics-bind-address=127.0.0.1:8080 env: [] - image: ghcr.io/vshn/appcat:v4.118.3 + image: ghcr.io/vshn/appcat:id-addon-billing livenessProbe: httpGet: path: /healthz diff --git a/tests/golden/exodev/appcat/appcat/10_function_appcat.yaml b/tests/golden/exodev/appcat/appcat/10_function_appcat.yaml index 8cd6109886..106dfad8b1 100644 --- a/tests/golden/exodev/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/exodev/appcat/appcat/10_function_appcat.yaml @@ -6,6 +6,6 @@ metadata: argocd.argoproj.io/sync-wave: '-40' name: function-appcat spec: - package: ghcr.io/vshn/appcat:v4.118.3-func + package: ghcr.io/vshn/appcat:id-addon-billing-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/exodev/appcat/appcat/apiserver/30_deployment.yaml b/tests/golden/exodev/appcat/appcat/apiserver/30_deployment.yaml index 2a9a736cd5..3e76067bf8 100644 --- a/tests/golden/exodev/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/exodev/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +29,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:v4.118.3 + image: ghcr.io/vshn/appcat:id-addon-billing livenessProbe: failureThreshold: 3 httpGet: 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 b5130d2fc0..9f08128c0f 100644 --- a/tests/golden/exodev/appcat/appcat/controllers/appcat/30_deployment.yaml +++ b/tests/golden/exodev/appcat/appcat/controllers/appcat/30_deployment.yaml @@ -23,7 +23,7 @@ spec: env: - name: PLANS_NAMESPACE value: syn-appcat - image: ghcr.io/vshn/appcat:v4.118.3 + image: ghcr.io/vshn/appcat:id-addon-billing livenessProbe: httpGet: path: /healthz 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 e6787f567a..bded94676f 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:v4.118.3 + image: ghcr.io/vshn/appcat:id-addon-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 7110c05ac6..95cab5e781 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 @@ -30,7 +30,7 @@ spec: secretKeyRef: key: kubeconfig name: controlclustercredentials - image: ghcr.io/vshn/appcat:v4.118.3 + image: ghcr.io/vshn/appcat:id-addon-billing livenessProbe: httpGet: path: /healthz 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 1880457703..a730daba58 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 @@ -26,7 +26,7 @@ spec: env: - name: KUBECONFIG value: /.kube/config - image: ghcr.io/vshn/appcat:v4.118.3 + image: ghcr.io/vshn/appcat:id-addon-billing livenessProbe: httpGet: path: /healthz 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 8cd6109886..106dfad8b1 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/10_function_appcat.yaml @@ -6,6 +6,6 @@ metadata: argocd.argoproj.io/sync-wave: '-40' name: function-appcat spec: - package: ghcr.io/vshn/appcat:v4.118.3-func + package: ghcr.io/vshn/appcat:id-addon-billing-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_keycloak.yaml b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_keycloak.yaml index 4a83d77cf6..291d16ef75 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_keycloak.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_keycloak.yaml @@ -43,7 +43,6 @@ spec: should get backed up. properties: retention: - default: {} description: K8upRetentionPolicy describes the retention configuration for a K8up backup. properties: diff --git a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_mariadb.yaml b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_mariadb.yaml index 4dce35cd4b..1a71c67ec9 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_mariadb.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_mariadb.yaml @@ -44,7 +44,6 @@ spec: should get backed up. properties: retention: - default: {} description: K8upRetentionPolicy describes the retention configuration for a K8up backup. properties: diff --git a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_nextcloud.yaml b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_nextcloud.yaml index d6c652e94b..5fe45965f9 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_nextcloud.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_nextcloud.yaml @@ -37,13 +37,37 @@ spec: default: {} description: Parameters are the configurable fields of a VSHNNextcloud. properties: + addOns: + description: |- + VSHNNextcloudAddOns are additional components, modules, or extensions that enhances the functionality of VSHN Nextcloud. + Add-ons are designed to provide optional features or capabilities that are not part of the main product but + can be installed as needed. Usually add-on are billed separately. + properties: + office: + description: Office contains settings to control the Collabora + integration. + properties: + enabled: + default: false + description: Enabled enables the Collabora integration. + It will autoconfigure the Collabora server URL in + Your Nextcloud instance. + type: boolean + fqdn: + description: FQDN contains the FQDN of the Collabora + server. This is used to configure the Collabora server + URL in Your Nextcloud instance. + type: string + required: + - enabled + type: object + type: object backup: default: {} description: Backup contains settings to control how the instance should get backed up. properties: retention: - default: {} description: K8upRetentionPolicy describes the retention configuration for a K8up backup. properties: @@ -5615,24 +5639,6 @@ spec: default: {} description: Service contains nextcloud DBaaS specific properties properties: - collabora: - description: Collabora contains settings to control the - Collabora integration. - properties: - enabled: - default: false - description: Enabled enables the Collabora integration. - It will autoconfigure the Collabora server URL in - Your Nextcloud instance. - type: boolean - fqdn: - description: FQDN contains the FQDN of the Collabora - server. This is used to configure the Collabora server - URL in Your Nextcloud instance. - type: string - required: - - enabled - type: object fqdn: description: |- FQDN contains the FQDNs array, which will be used for the ingress. diff --git a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_redis.yaml b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_redis.yaml index bfde9ddeda..7fd70639ae 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_redis.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/20_xrd_vshn_redis.yaml @@ -46,7 +46,6 @@ spec: should get backed up. properties: retention: - default: {} description: K8upRetentionPolicy describes the retention configuration for a K8up backup. properties: 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 793d0bbdaf..c34305e199 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 @@ -40,7 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.118.3 + imageTag: id-addon-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 390e6a781e..eacc23aade 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 @@ -40,7 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.118.3 + imageTag: id-addon-billing isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance mode: standalone 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 6b572f68f7..62551526bb 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 @@ -40,7 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.118.3 + imageTag: id-addon-billing isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance minioChartRepository: https://charts.min.io 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 ffabdc2943..4bf5e51317 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 @@ -45,7 +45,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.118.3 + imageTag: id-addon-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 99bf274c54..8e335f72fe 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 @@ -41,7 +41,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: v4.118.3 + imageTag: id-addon-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_redis.yaml b/tests/golden/vshn-cloud/appcat/appcat/21_composition_vshn_redis.yaml index 6a990a6ba7..e4032a059a 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 @@ -597,7 +597,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.118.3 + imageTag: id-addon-billing isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance ownerGroup: vshn.appcat.vshn.io 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 879ff5c0d7..ed2dcae0d9 100644 --- a/tests/golden/vshn-cloud/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/vshn-cloud/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +29,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:v4.118.3 + image: ghcr.io/vshn/appcat:id-addon-billing livenessProbe: failureThreshold: 3 httpGet: 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 b5130d2fc0..9f08128c0f 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 @@ -23,7 +23,7 @@ spec: env: - name: PLANS_NAMESPACE value: syn-appcat - image: ghcr.io/vshn/appcat:v4.118.3 + image: ghcr.io/vshn/appcat:id-addon-billing livenessProbe: httpGet: path: /healthz 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 e6787f567a..bded94676f 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:v4.118.3 + image: ghcr.io/vshn/appcat:id-addon-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 edbe612c73..51b6dfe19a 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 @@ -24,7 +24,7 @@ spec: - --health-probe-bind-address=:8081 - --metrics-bind-address=127.0.0.1:8080 env: [] - image: ghcr.io/vshn/appcat:v4.118.3 + image: ghcr.io/vshn/appcat:id-addon-billing livenessProbe: httpGet: path: /healthz 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 8cd6109886..106dfad8b1 100644 --- a/tests/golden/vshn-managed/appcat/appcat/10_function_appcat.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/10_function_appcat.yaml @@ -6,6 +6,6 @@ metadata: argocd.argoproj.io/sync-wave: '-40' name: function-appcat spec: - package: ghcr.io/vshn/appcat:v4.118.3-func + package: ghcr.io/vshn/appcat:id-addon-billing-func runtimeConfigRef: name: function-appcat diff --git a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_keycloak.yaml b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_keycloak.yaml index 4a83d77cf6..291d16ef75 100644 --- a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_keycloak.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_keycloak.yaml @@ -43,7 +43,6 @@ spec: should get backed up. properties: retention: - default: {} description: K8upRetentionPolicy describes the retention configuration for a K8up backup. properties: diff --git a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_mariadb.yaml b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_mariadb.yaml index 4dce35cd4b..1a71c67ec9 100644 --- a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_mariadb.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_mariadb.yaml @@ -44,7 +44,6 @@ spec: should get backed up. properties: retention: - default: {} description: K8upRetentionPolicy describes the retention configuration for a K8up backup. properties: diff --git a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_nextcloud.yaml b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_nextcloud.yaml index d6c652e94b..5fe45965f9 100644 --- a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_nextcloud.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_nextcloud.yaml @@ -37,13 +37,37 @@ spec: default: {} description: Parameters are the configurable fields of a VSHNNextcloud. properties: + addOns: + description: |- + VSHNNextcloudAddOns are additional components, modules, or extensions that enhances the functionality of VSHN Nextcloud. + Add-ons are designed to provide optional features or capabilities that are not part of the main product but + can be installed as needed. Usually add-on are billed separately. + properties: + office: + description: Office contains settings to control the Collabora + integration. + properties: + enabled: + default: false + description: Enabled enables the Collabora integration. + It will autoconfigure the Collabora server URL in + Your Nextcloud instance. + type: boolean + fqdn: + description: FQDN contains the FQDN of the Collabora + server. This is used to configure the Collabora server + URL in Your Nextcloud instance. + type: string + required: + - enabled + type: object + type: object backup: default: {} description: Backup contains settings to control how the instance should get backed up. properties: retention: - default: {} description: K8upRetentionPolicy describes the retention configuration for a K8up backup. properties: @@ -5615,24 +5639,6 @@ spec: default: {} description: Service contains nextcloud DBaaS specific properties properties: - collabora: - description: Collabora contains settings to control the - Collabora integration. - properties: - enabled: - default: false - description: Enabled enables the Collabora integration. - It will autoconfigure the Collabora server URL in - Your Nextcloud instance. - type: boolean - fqdn: - description: FQDN contains the FQDN of the Collabora - server. This is used to configure the Collabora server - URL in Your Nextcloud instance. - type: string - required: - - enabled - type: object fqdn: description: |- FQDN contains the FQDNs array, which will be used for the ingress. diff --git a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_redis.yaml b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_redis.yaml index bfde9ddeda..7fd70639ae 100644 --- a/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_redis.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/20_xrd_vshn_redis.yaml @@ -46,7 +46,6 @@ spec: should get backed up. properties: retention: - default: {} description: K8upRetentionPolicy describes the retention configuration for a K8up backup. properties: 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 3627a5c7cf..d624d3043a 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 @@ -40,7 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.118.3 + imageTag: id-addon-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 3806d295bc..5b773549aa 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 @@ -40,7 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.118.3 + imageTag: id-addon-billing isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance mode: standalone 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 1044a676ed..8d8173f32f 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 @@ -40,7 +40,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.118.3 + imageTag: id-addon-billing isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance minioChartRepository: https://charts.min.io 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 1a5b0ebd44..bc569ca4a5 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 @@ -45,7 +45,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.118.3 + imageTag: id-addon-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 df8c109f83..4ff213f0c2 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 @@ -41,7 +41,7 @@ spec: emailAlertingSmtpUsername: appcat@appuio.cloud externalDatabaseConnectionsEnabled: 'true' ignoreNamespaceForBilling: vshn-test - imageTag: v4.118.3 + imageTag: id-addon-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_redis.yaml b/tests/golden/vshn-managed/appcat/appcat/21_composition_vshn_redis.yaml index 4fb12c722c..89d836a569 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 @@ -597,7 +597,7 @@ spec: emailAlertingSmtpHost: smtp.eu.mailgun.org:465 emailAlertingSmtpUsername: appcat@appuio.cloud ignoreNamespaceForBilling: vshn-test - imageTag: v4.118.3 + imageTag: id-addon-billing isOpenshift: 'true' maintenanceSA: helm-based-service-maintenance ownerGroup: vshn.appcat.vshn.io 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 879ff5c0d7..ed2dcae0d9 100644 --- a/tests/golden/vshn-managed/appcat/appcat/apiserver/30_deployment.yaml +++ b/tests/golden/vshn-managed/appcat/appcat/apiserver/30_deployment.yaml @@ -29,7 +29,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:v4.118.3 + image: ghcr.io/vshn/appcat:id-addon-billing livenessProbe: failureThreshold: 3 httpGet: 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 b5130d2fc0..9f08128c0f 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 @@ -23,7 +23,7 @@ spec: env: - name: PLANS_NAMESPACE value: syn-appcat - image: ghcr.io/vshn/appcat:v4.118.3 + image: ghcr.io/vshn/appcat:id-addon-billing livenessProbe: httpGet: path: /healthz 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 e6787f567a..bded94676f 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:v4.118.3 + image: ghcr.io/vshn/appcat:id-addon-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 edbe612c73..51b6dfe19a 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 @@ -24,7 +24,7 @@ spec: - --health-probe-bind-address=:8081 - --metrics-bind-address=127.0.0.1:8080 env: [] - image: ghcr.io/vshn/appcat:v4.118.3 + image: ghcr.io/vshn/appcat:id-addon-billing livenessProbe: httpGet: path: /healthz