Update billing add on cronjob

vshn · Dec 6, 2024 · 7fffab9 · 7fffab9
1 parent 3c51ae7
commit 7fffab9
Show file tree

Hide file tree

Showing 58 changed files with 82 additions and 70 deletions.
diff --git a/class/defaults.yml b/class/defaults.yml
@@ -55,7 +55,7 @@ parameters:
       appcat:
         registry: ghcr.io
         repository: vshn/appcat
-        tag: v4.116.0
+        tag: v4.116.1
       functionAppcat:
         registry: ${appcat:images:appcat:registry}
         repository: ${appcat:images:appcat:repository}

diff --git a/component/billing.jsonnet b/component/billing.jsonnet
@@ -73,7 +73,7 @@ local commonEnv = std.prune([
   },
 ]);
 
-local backfillCJ = function(name, query, sla, type)
+local backfillCJ = function(name, query, sla, type, isAddOn)
 
   local orgId = if type == 'cloud' then paramsBilling.prometheus.cloud_org_id else paramsBilling.prometheus.managed_org_id;
 
@@ -91,9 +91,11 @@ local backfillCJ = function(name, query, sla, type)
 
   local instanceJsonnet = 'local labels = std.extVar("labels"); "%s" %% labels' % '%(cluster_id)s/%(label_appcat_vshn_io_claim_namespace)s/%(label_appcat_vshn_io_claim_name)s';
 
+  local instanceAddOnJsonnet = 'local labels = std.extVar("labels"); "%s" %% labels' % '%(cluster_id)s/%(label_appcat_vshn_io_claim_namespace)s/%(label_appcat_vshn_io_claim_name)s/%(label_appcat_vshn_io_addon_name)s';
+
   local productID = 'appcat-vshn-%(name)s-%(sla)s' % { name: name, sla: sla };
 
-  local jobEnv = std.prune([
+  local jobEnv = function(isAddOn) std.prune([
     {
       name: 'AR_ORG_ID',
       value: orgId,
@@ -108,7 +110,7 @@ local backfillCJ = function(name, query, sla, type)
     },
     {
       name: 'AR_INSTANCE_JSONNET',
-      value: instanceJsonnet,
+      value: if isAddOn then instanceAddOnJsonnet else instanceJsonnet,
     },
     if itemGroupDescJsonnet != null then {
       name: 'AR_ITEM_GROUP_DESCRIPTION_JSONNET',
@@ -123,12 +125,13 @@ local backfillCJ = function(name, query, sla, type)
       value: paramsBilling.instanceUOM,
     },
   ]);
+
   cronjob.CronJob('%(product)s-%(type)s' % { product: escape(productID), type: type }, 'backfill', {
     containers: [
       {
         name: 'backfill',
         image: formatImage(params.images.reporting),
-        env+: commonEnv + jobEnv,
+        env+: commonEnv + jobEnv(isAddOn),
         command: [ 'sh', '-c' ],
         args: [
           'appuio-reporting report --timerange 1h --begin=$(date -d "now -3 hours" -u +"%Y-%m-%dT%H:00:00Z") --repeat-until=$(date -u +"%Y-%m-%dT%H:00:00Z")',
@@ -185,14 +188,7 @@ local getPermutations = function(cloudQuery, managedQuery)
     },
   ];
 
-local generateAddOnsCloudAndManaged = function(name)
-  local queryName = if name == 'postgres' then name + 'ql' else name;
-  local managedQuery = getManagedQuery(queryName);
-  local cloudQuery = getCloudQuery(queryName);
-  local permutations = getPermutations(cloudQuery, managedQuery);
-  std.flatMap(function(r) [ backfillCJ(name, r.query, r.sla, r.type) ], permutations);
-
-local generateCloudAndManaged = function(name)
+local generateCloudAndManaged = function(name, isAddOn)
 
   // For postgresql we have a missmatch between the label and the name in our definition.
   local queryName = if name == 'postgres' then name + 'ql' else name;
@@ -223,11 +219,11 @@ local generateCloudAndManaged = function(name)
     },
   ];
 
-  std.flatMap(function(r) [ backfillCJ(name, r.query, r.sla, r.type) ], permutations);
+  std.flatMap(function(r) [ backfillCJ(name, r.query, r.sla, r.type, isAddOn) ], permutations);
 
 local vshnServices = common.FilterServiceByBoolean('billing');
-local billingCronjobs = std.flattenArrays(std.flatMap(function(r) [ generateCloudAndManaged(r.name) ], vshnServices));
-local billingAddOnsCronjobs = std.flattenArrays(std.flatMap(function(addOn) [ generateAddOnsCloudAndManaged(addOn) ], addOns));
+local billingCronjobs = std.flattenArrays(std.flatMap(function(r) [ generateCloudAndManaged(r.name, false) ], vshnServices));
+local billingAddOnsCronjobs = std.flattenArrays(std.flatMap(function(addOn) [ generateCloudAndManaged(addOn, true) ], addOns));
 
 if paramsBilling.vshn.enableCronjobs then
   {

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.116.0-func
+  package: ghcr.io/vshn/appcat:v4.116.1-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
@@ -11719,6 +11719,7 @@ spec:
                                   type: boolean
                               type: object
                             service:
+                              default: {}
                               description: Service contains PostgreSQL DBaaS specific
                                 properties
                               properties:
@@ -11847,6 +11848,7 @@ spec:
                                     - guaranteed
                                   type: string
                                 tls:
+                                  default: {}
                                   description: TLS settings for the instance.
                                   properties:
                                     enabled:

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
@@ -11705,6 +11705,7 @@ spec:
                                   type: boolean
                               type: object
                             service:
+                              default: {}
                               description: Service contains PostgreSQL DBaaS specific
                                 properties
                               properties:
@@ -11833,6 +11834,7 @@ spec:
                                     - guaranteed
                                   type: string
                                 tls:
+                                  default: {}
                                   description: TLS settings for the instance.
                                   properties:
                                     enabled:

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: appcat@appuio.cloud
           ignoreNamespaceForBilling: vshn-test
-          imageTag: v4.116.0
+          imageTag: v4.116.1
           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: appcat@appuio.cloud
           ignoreNamespaceForBilling: vshn-test
-          imageTag: v4.116.0
+          imageTag: v4.116.1
           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: appcat@appuio.cloud
           ignoreNamespaceForBilling: vshn-test
-          imageTag: v4.116.0
+          imageTag: v4.116.1
           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: appcat@appuio.cloud
           externalDatabaseConnectionsEnabled: 'true'
           ignoreNamespaceForBilling: vshn-test
-          imageTag: v4.116.0
+          imageTag: v4.116.1
           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: appcat@appuio.cloud
           ignoreNamespaceForBilling: vshn-test
-          imageTag: v4.116.0
+          imageTag: v4.116.1
           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.116.0
+          image: ghcr.io/vshn/appcat:v4.116.1
           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.116.0
+          image: ghcr.io/vshn/appcat:v4.116.1
           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.116.0
+              image: ghcr.io/vshn/appcat:v4.116.1
               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
@@ -36,7 +36,7 @@ spec:
               value: 'true'
             - name: APPCAT_SLI_VSHNMARIADB
               value: 'true'
-          image: ghcr.io/vshn/appcat:v4.116.0
+          image: ghcr.io/vshn/appcat:v4.116.1
           livenessProbe:
             httpGet:
               path: /healthz

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.116.0-func
+  package: ghcr.io/vshn/appcat:v4.116.1-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.116.0
+          image: ghcr.io/vshn/appcat:v4.116.1
           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
@@ -36,7 +36,7 @@ spec:
               value: 'false'
             - name: APPCAT_SLI_VSHNMARIADB
               value: 'false'
-          image: ghcr.io/vshn/appcat:v4.116.0
+          image: ghcr.io/vshn/appcat:v4.116.1
           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.116.0-func
+  package: ghcr.io/vshn/appcat:v4.116.1-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
@@ -11719,6 +11719,7 @@ spec:
                                   type: boolean
                               type: object
                             service:
+                              default: {}
                               description: Service contains PostgreSQL DBaaS specific
                                 properties
                               properties:
@@ -11847,6 +11848,7 @@ spec:
                                     - guaranteed
                                   type: string
                                 tls:
+                                  default: {}
                                   description: TLS settings for the instance.
                                   properties:
                                     enabled:

diff --git a/tests/golden/dev/appcat/appcat/20_xrd_vshn_nextcloud.yaml b/tests/golden/dev/appcat/appcat/20_xrd_vshn_nextcloud.yaml
@@ -11705,6 +11705,7 @@ spec:
                                   type: boolean
                               type: object
                             service:
+                              default: {}
                               description: Service contains PostgreSQL DBaaS specific
                                 properties
                               properties:
@@ -11833,6 +11834,7 @@ spec:
                                     - guaranteed
                                   type: string
                                 tls:
+                                  default: {}
                                   description: TLS settings for the instance.
                                   properties:
                                     enabled:

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: appcat@appuio.cloud
           ignoreNamespaceForBilling: vshn-test
-          imageTag: v4.116.0
+          imageTag: v4.116.1
           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: appcat@appuio.cloud
           ignoreNamespaceForBilling: vshn-test
-          imageTag: v4.116.0
+          imageTag: v4.116.1
           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: appcat@appuio.cloud
           ignoreNamespaceForBilling: vshn-test
-          imageTag: v4.116.0
+          imageTag: v4.116.1
           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: appcat@appuio.cloud
           externalDatabaseConnectionsEnabled: 'true'
           ignoreNamespaceForBilling: vshn-test
-          imageTag: v4.116.0
+          imageTag: v4.116.1
           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: appcat@appuio.cloud
           ignoreNamespaceForBilling: vshn-test
-          imageTag: v4.116.0
+          imageTag: v4.116.1
           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.116.0
+          image: ghcr.io/vshn/appcat:v4.116.1
           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.116.0
+          image: ghcr.io/vshn/appcat:v4.116.1
           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.116.0
+              image: ghcr.io/vshn/appcat:v4.116.1
               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
@@ -36,7 +36,7 @@ spec:
               value: 'true'
             - name: APPCAT_SLI_VSHNMARIADB
               value: 'true'
-          image: ghcr.io/vshn/appcat:v4.116.0
+          image: ghcr.io/vshn/appcat:v4.116.1
           livenessProbe:
             httpGet:
               path: /healthz

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
@@ -31,7 +31,7 @@ spec:
                   name: vcluster-kubeconfig
             - name: PLANS_NAMESPACE
               value: syn-appcat
-          image: ghcr.io/vshn/appcat:v4.116.0
+          image: ghcr.io/vshn/appcat:v4.116.1
           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
@@ -6,6 +6,6 @@ metadata:
     argocd.argoproj.io/sync-wave: '-40'
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.116.0-func
+  package: ghcr.io/vshn/appcat:v4.116.1-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
@@ -11719,6 +11719,7 @@ spec:
                                   type: boolean
                               type: object
                             service:
+                              default: {}
                               description: Service contains PostgreSQL DBaaS specific
                                 properties
                               properties:
@@ -11847,6 +11848,7 @@ spec:
                                     - guaranteed
                                   type: string
                                 tls:
+                                  default: {}
                                   description: TLS settings for the instance.
                                   properties:
                                     enabled: