vshn · vshnbot · Jan 8, 2026 · Jan 16, 2026
diff --git a/class/defaults.yml b/class/defaults.yml
@@ -72,7 +72,7 @@ parameters:
       appcat:
         registry: ghcr.io
         repository: vshn/appcat
-        tag: 8af486767f62151ab7290018fb289f92d4d5e95a
+        tag: extended-billing
       functionAppcat:
         registry: ${appcat:images:appcat:registry}
         repository: ${appcat:images:appcat:repository}
@@ -399,6 +399,7 @@ parameters:
         odooClientID: ${appcat:billing:odoo:oauth:clientID}
         odooClientSecret: ${appcat:billing:odoo:oauth:clientSecret}
         odooTokenURL: ${appcat:billing:odoo:oauth:url}
+        maxEventsPerProduct: 100
       monitoring:
         crossplane_label_mapping: ${appcat:monitoring:crossplane:label_mapping}
         crossplane_extra_resources: ${appcat:monitoring:crossplane:extra_resources}

diff --git a/component/appcat_controller.jsonnet b/component/appcat_controller.jsonnet
@@ -83,6 +83,10 @@ local mergedEnv = com.envList(controllersParams.extraEnv) + std.prune([
     name: 'ODOO_TOKEN_URL',
     value: controllersParams.billing.odooTokenURL,
   },
+  {
+    name: 'BILLING_MAX_EVENTS_PRODUCT',
+    value: std.toString(controllersParams.billing.maxEventsPerProduct),
+  },
 ] else [] + if controllersParams.monitoringEnabled then [
   {
     name: 'CROSSPLANE_LABEL_MAPPING',

diff --git 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-8af486767f62151ab7290018fb289f92d4d5e95a
+  name: function-appcat-master-extended-billing
 spec:
-  package: ghcr.io/vshn/appcat:8af486767f62151ab7290018fb289f92d4d5e95a-func
+  package: ghcr.io/vshn/appcat:extended-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
@@ -21,7 +21,7 @@ spec:
   mode: Pipeline
   pipeline:
     - functionRef:
-        name: function-appcat-master-8af486767f62151ab7290018fb289f92d4d5e95a
+        name: function-appcat-master-extended-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
@@ -13,7 +13,7 @@ metadata:
     metadata.appcat.vshn.io/zone: rma1
   labels:
     metadata.appcat.vshn.io/offered: 'true'
-    metadata.appcat.vshn.io/revision: master-8af486767f62151ab7290018fb289f92d4d5e95a
+    metadata.appcat.vshn.io/revision: master-extended-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
@@ -13,7 +13,7 @@ metadata:
     metadata.appcat.vshn.io/zone: rma1
   labels:
     metadata.appcat.vshn.io/offered: 'true'
-    metadata.appcat.vshn.io/revision: master-8af486767f62151ab7290018fb289f92d4d5e95a
+    metadata.appcat.vshn.io/revision: master-extended-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-8af486767f62151ab7290018fb289f92d4d5e95a
+        name: function-appcat-master-extended-billing
       input:
         apiVersion: v1
         data:
@@ -48,7 +48,7 @@ spec:
           emailAlertingSmtpUsername: [email protected]
           ignoreNamespaceForBilling: vshn-test
           imageRegistry: code.forgejo.org
-          imageTag: 8af486767f62151ab7290018fb289f92d4d5e95a
+          imageTag: extended-billing
           ingress_annotations: |
             cert-manager.io/cluster-issuer: letsencrypt-production
           isOpenshift: 'false'

diff --git a/tests/golden/control-plane/appcat/appcat/21_composition_vshn_keycloak.yaml b/tests/golden/control-plane/appcat/appcat/21_composition_vshn_keycloak.yaml
@@ -13,7 +13,7 @@ metadata:
     metadata.appcat.vshn.io/zone: rma1
   labels:
     metadata.appcat.vshn.io/offered: 'true'
-    metadata.appcat.vshn.io/revision: master-8af486767f62151ab7290018fb289f92d4d5e95a
+    metadata.appcat.vshn.io/revision: master-extended-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-8af486767f62151ab7290018fb289f92d4d5e95a
+        name: function-appcat-master-extended-billing
       input:
         apiVersion: v1
         data:
@@ -49,7 +49,7 @@ spec:
           emailAlertingSmtpUsername: [email protected]
           ignoreNamespaceForBilling: vshn-test
           imageRegistry: docker-registry.inventage.com:10121/keycloak-competence-center/keycloak-managed
-          imageTag: 8af486767f62151ab7290018fb289f92d4d5e95a
+          imageTag: extended-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
@@ -13,7 +13,7 @@ metadata:
     metadata.appcat.vshn.io/zone: rma1
   labels:
     metadata.appcat.vshn.io/offered: 'true'
-    metadata.appcat.vshn.io/revision: master-8af486767f62151ab7290018fb289f92d4d5e95a
+    metadata.appcat.vshn.io/revision: master-extended-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-8af486767f62151ab7290018fb289f92d4d5e95a
+        name: function-appcat-master-extended-billing
       input:
         apiVersion: v1
         data:
@@ -48,7 +48,7 @@ spec:
           ignoreNamespaceForBilling: vshn-test
           imageRegistry: docker.io
           imageRepositoryPrefix: bitnamilegacy
-          imageTag: 8af486767f62151ab7290018fb289f92d4d5e95a
+          imageTag: extended-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
@@ -13,7 +13,7 @@ metadata:
     metadata.appcat.vshn.io/zone: rma1
   labels:
     metadata.appcat.vshn.io/offered: 'true'
-    metadata.appcat.vshn.io/revision: master-8af486767f62151ab7290018fb289f92d4d5e95a
+    metadata.appcat.vshn.io/revision: master-extended-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-8af486767f62151ab7290018fb289f92d4d5e95a
+        name: function-appcat-master-extended-billing
       input:
         apiVersion: v1
         data:
@@ -55,7 +55,7 @@ spec:
           emailAlertingSmtpUsername: [email protected]
           ignoreNamespaceForBilling: vshn-test
           imageRegistry: docker.io
-          imageTag: 8af486767f62151ab7290018fb289f92d4d5e95a
+          imageTag: extended-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
@@ -15,7 +15,7 @@ metadata:
     metadata.appcat.vshn.io/zone: rma1
   labels:
     metadata.appcat.vshn.io/offered: 'true'
-    metadata.appcat.vshn.io/revision: master-8af486767f62151ab7290018fb289f92d4d5e95a
+    metadata.appcat.vshn.io/revision: master-extended-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-8af486767f62151ab7290018fb289f92d4d5e95a
+        name: function-appcat-master-extended-billing
       input:
         apiVersion: v1
         data:
@@ -51,7 +51,7 @@ spec:
           emailAlertingSmtpUsername: [email protected]
           externalDatabaseConnectionsEnabled: 'true'
           ignoreNamespaceForBilling: vshn-test
-          imageTag: 8af486767f62151ab7290018fb289f92d4d5e95a
+          imageTag: extended-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
@@ -15,7 +15,7 @@ metadata:
     metadata.appcat.vshn.io/zone: rma1
   labels:
     metadata.appcat.vshn.io/offered: 'true'
-    metadata.appcat.vshn.io/revision: master-8af486767f62151ab7290018fb289f92d4d5e95a
+    metadata.appcat.vshn.io/revision: master-extended-billing
     metadata.appcat.vshn.io/serviceID: vshn-postgresql
     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-8af486767f62151ab7290018fb289f92d4d5e95a
+        name: function-appcat-master-extended-billing
       input:
         apiVersion: v1
         data:
@@ -51,7 +51,7 @@ spec:
           emailAlertingSmtpUsername: [email protected]
           externalDatabaseConnectionsEnabled: 'true'
           ignoreNamespaceForBilling: vshn-test
-          imageTag: 8af486767f62151ab7290018fb289f92d4d5e95a
+          imageTag: extended-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
@@ -17,7 +17,7 @@ metadata:
     metadata.appcat.vshn.io/zone: rma1
   labels:
     metadata.appcat.vshn.io/offered: 'true'
-    metadata.appcat.vshn.io/revision: master-8af486767f62151ab7290018fb289f92d4d5e95a
+    metadata.appcat.vshn.io/revision: master-extended-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-8af486767f62151ab7290018fb289f92d4d5e95a
+        name: function-appcat-master-extended-billing
       input:
         apiVersion: v1
         data:
@@ -52,7 +52,7 @@ spec:
           ignoreNamespaceForBilling: vshn-test
           imageRegistry: ghcr.io
           imageRepositoryPrefix: vshn
-          imageTag: 8af486767f62151ab7290018fb289f92d4d5e95a
+          imageTag: extended-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
@@ -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:8af486767f62151ab7290018fb289f92d4d5e95a
+          image: ghcr.io/vshn/appcat:extended-billing
           imagePullPolicy: IfNotPresent
           livenessProbe:
             failureThreshold: 3

diff --git a/tests/golden/control-plane/appcat/appcat/controllers/appcat/10_billingservice_crd.yaml b/tests/golden/control-plane/appcat/appcat/controllers/appcat/10_billingservice_crd.yaml
@@ -69,28 +69,54 @@ spec:
                       description: ItemGroupDescription describes the billing item
                         group
                       type: string
+                    items:
+                      description: |-
+                        Items defines list of billable products for this instance
+                        Each item represents a product with independent lifecycle and event tracking
+                      items:
+                        description: ItemSpec defines a single billable product/item
+                        properties:
+                          description:
+                            description: Description is a human-readable description
+                              of this product
+                            type: string
+                          maxEvents:
+                            default: 100
+                            description: MaxEvents defines maximum events to retain
+                              for THIS product
+                            type: integer
+                          productID:
+                            description: ProductID identifies the product in the billing
+                              system
+                            maxLength: 100
+                            minLength: 1
+                            type: string
+                          unit:
+                            description: Unit defines the billing unit type for this
+                              product
+                            type: string
+                          value:
+                            description: |-
+                              Value represents the billable metric for this product
+                              Can be: replica count, disk size (e.g., "50Gi"), percentage, etc.
+                            type: string
+                        required:
+                          - productID
+                          - value
+                        type: object
+                      minItems: 1
+                      type: array
                     organization:
                       description: Organization used to identify sales order
                       type: string
-                    productID:
-                      description: ProductID identifies the product in the billing
-                        system
-                      type: string
                     salesOrderID:
                       description: SalesOrderID identifies the sales order in Odoo
                       type: string
-                    size:
-                      description: Size represents the size of the service instance
-                      type: string
-                    unitID:
-                      description: UnitID defines the billing unit type in Odoo
-                      type: string
                   required:
                     - instanceID
                     - itemDescription
                     - itemGroupDescription
-                    - productID
-                    - unitID
+                    - items
                   type: object
               type: object
             status:
@@ -175,10 +201,6 @@ spec:
                         description: RetryCount tracks the number of retry attempts
                           for failed events
                         type: integer
-                      size:
-                        description: Size represents the size/plan at the time of
-                          the event
-                        type: string
                       state:
                         description: State represents the current state of the event
                           (sent, pending, failed, superseded)
@@ -187,6 +209,7 @@ spec:
                           - pending
                           - failed
                           - superseded
+                          - resend
                         type: string
                       timestamp:
                         description: Timestamp when the event occurred
@@ -200,12 +223,17 @@ spec:
                           - deleted
                           - scaled
                         type: string
+                      value:
+                        description: |-
+                          Value represents the billable metric at the time of the event
+                          Generic field supporting replica count, disk size, percentages, etc.
+                        type: string
                     required:
                       - productId
-                      - size
                       - state
                       - timestamp
                       - type
+                      - value
                     type: object
                   type: array
               type: object

diff --git a/tests/golden/control-plane/appcat/appcat/controllers/appcat/10_cluster_role.yaml b/tests/golden/control-plane/appcat/appcat/controllers/appcat/10_cluster_role.yaml
@@ -127,18 +127,9 @@ rules:
       - xvshnpostgresqls/status
       - xvshnredis
       - xvshnredis/status
-      - xobjectbuckets
     verbs:
       - get
       - list
       - patch
       - update
       - watch
-  - apiGroups:
-      - apiextensions.crossplane.io
-    resources:
-      - compositeresourcedefinitions
-    verbs:
-      - get
-      - list
-      - watch
diff --git a/tests/golden/control-plane/appcat/appcat/controllers/appcat/30_deployment.yaml b/tests/golden/control-plane/appcat/appcat/controllers/appcat/30_deployment.yaml
@@ -29,7 +29,7 @@ spec:
           env:
             - name: PLANS_NAMESPACE
               value: syn-appcat
-          image: ghcr.io/vshn/appcat:8af486767f62151ab7290018fb289f92d4d5e95a
+          image: ghcr.io/vshn/appcat:extended-billing
           imagePullPolicy: IfNotPresent
           livenessProbe:
             httpGet:

diff --git a/...den/control-plane/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml b/...den/control-plane/appcat/appcat/crossplane/helmchart/crossplane/templates/deployment.yaml
@@ -26,7 +26,7 @@ spec:
   template:
     metadata:
       annotations:
-        function-revision: 8af486767f62151ab7290018fb289f92d4d5e95a
+        function-revision: extended-billing
       labels:
         app: crossplane
         app.kubernetes.io/component: cloud-infrastructure-controller