vshn · vshnbot · Dec 5, 2024
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -40,7 +40,7 @@ spec:
           emailAlertingSmtpHost: smtp.eu.mailgun.org:465
           emailAlertingSmtpUsername: [email protected]
           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
@@ -40,7 +40,7 @@ spec:
           emailAlertingSmtpHost: smtp.eu.mailgun.org:465
           emailAlertingSmtpUsername: [email protected]
           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
@@ -45,7 +45,7 @@ spec:
           emailAlertingSmtpHost: smtp.eu.mailgun.org:465
           emailAlertingSmtpUsername: [email protected]
           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
@@ -41,7 +41,7 @@ spec:
           emailAlertingSmtpUsername: [email protected]
           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
@@ -597,7 +597,7 @@ spec:
           emailAlertingSmtpHost: smtp.eu.mailgun.org:465
           emailAlertingSmtpUsername: [email protected]
           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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -40,7 +40,7 @@ spec:
           emailAlertingSmtpHost: smtp.eu.mailgun.org:465
           emailAlertingSmtpUsername: [email protected]
           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
@@ -40,7 +40,7 @@ spec:
           emailAlertingSmtpHost: smtp.eu.mailgun.org:465
           emailAlertingSmtpUsername: [email protected]
           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
@@ -45,7 +45,7 @@ spec:
           emailAlertingSmtpHost: smtp.eu.mailgun.org:465
           emailAlertingSmtpUsername: [email protected]
           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
@@ -41,7 +41,7 @@ spec:
           emailAlertingSmtpUsername: [email protected]
           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
@@ -597,7 +597,7 @@ spec:
           emailAlertingSmtpHost: smtp.eu.mailgun.org:465
           emailAlertingSmtpUsername: [email protected]
           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
@@ -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
@@ -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
@@ -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/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../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
@@ -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
@@ -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: