Merge pull request #373 from vshn/event-forward

Event forwarding for external object storage
vshn · Jun 5, 2024 · 433ba09 · 433ba09
2 parents d22f327 + 1b60521
commit 433ba09
Show file tree

Hide file tree

Showing 36 changed files with 118 additions and 42 deletions.
diff --git a/component/class/defaults.yml b/component/class/defaults.yml
@@ -49,7 +49,7 @@ parameters:
       appcat:
         registry: ghcr.io
         repository: vshn/appcat
-        tag: v4.74.0
+        tag: v4.75.0
       apiserver:
         registry: ghcr.io
         repository: vshn/appcat-apiserver

diff --git a/component/component/objectstorage.jsonnet b/component/component/objectstorage.jsonnet
@@ -26,13 +26,19 @@ local xrd = xrds.XRDFromCRD(
   ]
 );
 
+local eventForwarder = {
+  annotations+: {
+    'appcat.vshn.io/forward-events-to': '',
+  },
+};
+
 local compositionCloudscale =
   local compParams = objStoParams.compositions.cloudscale;
 
   local baseUser = {
     apiVersion: 'cloudscale.crossplane.io/v1',
     kind: 'ObjectsUser',
-    metadata: {},
+    metadata: {} + eventForwarder,
     spec: {
       forProvider: {
         displayName: '',
@@ -54,7 +60,7 @@ local compositionCloudscale =
   local baseBucket = {
     apiVersion: 'cloudscale.crossplane.io/v1',
     kind: 'Bucket',
-    metadata: {},
+    metadata: {} + eventForwarder,
     spec: {
       forProvider: {
         bucketName: '',
@@ -87,6 +93,7 @@ local compositionCloudscale =
             comp.FromCompositeFieldPath('metadata.labels[crossplane.io/composite]', 'metadata.name'),
             comp.ToCompositeFieldPath('status.conditions', 'status.accessUserConditions'),
             comp.FromCompositeFieldPath('metadata.labels[crossplane.io/composite]', 'spec.writeConnectionSecretToRef.name'),
+            comp.CombineCompositeFromTwoFieldPaths('metadata.labels[crossplane.io/claim-namespace]', 'metadata.labels[crossplane.io/claim-name]', 'spec.forProvider.values.commonAnnotations[appcat.vshn.io/forward-events-to]', 'cloudscale.crossplane.io/v1/ObjectsUser/%s/%s'),
             {
               type: 'CombineFromComposite',
               toFieldPath: 'spec.forProvider.displayName',
@@ -121,6 +128,7 @@ local compositionCloudscale =
             comp.FromCompositeFieldPath('spec.parameters.bucketName', 'spec.forProvider.bucketName'),
             comp.FromCompositeFieldPath('metadata.labels[crossplane.io/composite]', 'spec.forProvider.credentialsSecretRef.name'),
             comp.FromCompositeFieldPath('spec.parameters.bucketDeletionPolicy', 'spec.forProvider.bucketDeletionPolicy'),
+            comp.CombineCompositeFromTwoFieldPaths('metadata.labels[crossplane.io/claim-namespace]', 'metadata.labels[crossplane.io/claim-name]', 'spec.forProvider.values.commonAnnotations[appcat.vshn.io/forward-events-to]', 'cloudscale.crossplane.io/v1/Bucket/%s/%s'),
             comp.FromCompositeFieldPath('spec.parameters.region', 'spec.forProvider.region') {
               transforms: [
                 {
@@ -145,7 +153,7 @@ local compositionExoscale =
   local IAMKeyBase = {
     apiVersion: 'exoscale.crossplane.io/v1',
     kind: 'IAMKey',
-    metadata: {},
+    metadata: {} + eventForwarder,
     spec: {
       forProvider: {
         keyName: '',
@@ -170,7 +178,7 @@ local compositionExoscale =
   local bucketBase = {
     apiVersion: 'exoscale.crossplane.io/v1',
     kind: 'Bucket',
-    metadata: {},
+    metadata: {} + eventForwarder,
     spec: {
       forProvider: {
         bucketName: '',
@@ -200,6 +208,7 @@ local compositionExoscale =
           patches: [
             comp.FromCompositeFieldPath('metadata.labels[crossplane.io/composite]', 'metadata.name'),
             comp.ToCompositeFieldPath('status.conditions', 'status.accessUserConditions'),
+            comp.CombineCompositeFromTwoFieldPaths('metadata.labels[crossplane.io/claim-namespace]', 'metadata.labels[crossplane.io/claim-name]', 'spec.forProvider.values.commonAnnotations[appcat.vshn.io/forward-events-to]', 'exoscale.crossplane.io/v1/IAMKey/%s/%s'),
             comp.FromCompositeFieldPath('metadata.labels[crossplane.io/composite]', 'spec.writeConnectionSecretToRef.name'),
             {
               type: 'CombineFromComposite',
@@ -237,6 +246,7 @@ local compositionExoscale =
             comp.FromCompositeFieldPath('spec.parameters.bucketName', 'spec.forProvider.bucketName'),
             comp.FromCompositeFieldPath('spec.parameters.region', 'spec.forProvider.zone'),
             comp.FromCompositeFieldPath('spec.parameters.bucketDeletionPolicy', 'spec.forProvider.bucketDeletionPolicy'),
+            comp.CombineCompositeFromTwoFieldPaths('metadata.labels[crossplane.io/claim-namespace]', 'metadata.labels[crossplane.io/claim-name]', 'spec.forProvider.values.commonAnnotations[appcat.vshn.io/forward-events-to]', 'exoscale.crossplane.io/v1/Bucket/%s/%s'),
           ],
         },
       ],

diff --git a/component/tests/golden/apiserver/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/apiserver/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.74.0-func
+  package: ghcr.io/vshn/appcat:v4.75.0-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/...ent/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml b/...ent/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.74.0-func
+  package: ghcr.io/vshn/appcat:v4.75.0-func
   runtimeConfigRef:
     name: function-appcat
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.74.0
+        image: ghcr.io/vshn/appcat:v4.75.0
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/...t/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/10_function_appcat.yaml b/...t/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.74.0-func
+  package: ghcr.io/vshn/appcat:v4.75.0-func
   runtimeConfigRef:
     name: function-appcat
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.74.0
+        image: ghcr.io/vshn/appcat:v4.75.0
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/component/tests/golden/cloudscale/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/cloudscale/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.74.0-func
+  package: ghcr.io/vshn/appcat:v4.75.0-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/component/tests/golden/cloudscale/appcat/appcat/21_composition_objectstorage_cloudscale.yaml b/component/tests/golden/cloudscale/appcat/appcat/21_composition_objectstorage_cloudscale.yaml
@@ -22,7 +22,9 @@ spec:
     - base:
         apiVersion: cloudscale.crossplane.io/v1
         kind: ObjectsUser
-        metadata: {}
+        metadata:
+          annotations:
+            appcat.vshn.io/forward-events-to: ''
         spec:
           forProvider:
             displayName: ''
@@ -51,6 +53,15 @@ spec:
         - fromFieldPath: metadata.labels[crossplane.io/composite]
           toFieldPath: spec.writeConnectionSecretToRef.name
           type: FromCompositeFieldPath
+        - combine:
+            strategy: string
+            string:
+              fmt: cloudscale.crossplane.io/v1/ObjectsUser/%s/%s
+            variables:
+              - fromFieldPath: metadata.labels[crossplane.io/claim-namespace]
+              - fromFieldPath: metadata.labels[crossplane.io/claim-name]
+          toFieldPath: spec.forProvider.values.commonAnnotations[appcat.vshn.io/forward-events-to]
+          type: CombineFromComposite
         - combine:
             strategy: string
             string:
@@ -68,7 +79,9 @@ spec:
     - base:
         apiVersion: cloudscale.crossplane.io/v1
         kind: Bucket
-        metadata: {}
+        metadata:
+          annotations:
+            appcat.vshn.io/forward-events-to: ''
         spec:
           forProvider:
             bucketDeletionPolicy: ''
@@ -107,6 +120,15 @@ spec:
         - fromFieldPath: spec.parameters.bucketDeletionPolicy
           toFieldPath: spec.forProvider.bucketDeletionPolicy
           type: FromCompositeFieldPath
+        - combine:
+            strategy: string
+            string:
+              fmt: cloudscale.crossplane.io/v1/Bucket/%s/%s
+            variables:
+              - fromFieldPath: metadata.labels[crossplane.io/claim-namespace]
+              - fromFieldPath: metadata.labels[crossplane.io/claim-name]
+          toFieldPath: spec.forProvider.values.commonAnnotations[appcat.vshn.io/forward-events-to]
+          type: CombineFromComposite
         - fromFieldPath: spec.parameters.region
           toFieldPath: spec.forProvider.region
           transforms:

diff --git a/component/tests/golden/controllers/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/controllers/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.74.0-func
+  package: ghcr.io/vshn/appcat:v4.75.0-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/component/tests/golden/controllers/appcat/appcat/controllers/appcat/30_deployment.yaml b/component/tests/golden/controllers/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.74.0
+          image: ghcr.io/vshn/appcat:v4.75.0
           livenessProbe:
             httpGet:
               path: /healthz

diff --git a/component/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.74.0-func
+  package: ghcr.io/vshn/appcat:v4.75.0-func
   runtimeConfigRef:
     name: function-appcat
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.74.0
+        image: ghcr.io/vshn/appcat:v4.75.0
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/...onent/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml b/...onent/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.74.0-func
+  package: ghcr.io/vshn/appcat:v4.75.0-func
   runtimeConfigRef:
     name: function-appcat
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.74.0
+        image: ghcr.io/vshn/appcat:v4.75.0
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/...ent/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/10_function_appcat.yaml b/...ent/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.74.0-func
+  package: ghcr.io/vshn/appcat:v4.75.0-func
   runtimeConfigRef:
     name: function-appcat
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.74.0
+        image: ghcr.io/vshn/appcat:v4.75.0
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/component/tests/golden/exoscale/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/exoscale/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.74.0-func
+  package: ghcr.io/vshn/appcat:v4.75.0-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/component/tests/golden/exoscale/appcat/appcat/21_composition_objectstorage_exoscale.yaml b/component/tests/golden/exoscale/appcat/appcat/21_composition_objectstorage_exoscale.yaml
@@ -23,7 +23,9 @@ spec:
     - base:
         apiVersion: exoscale.crossplane.io/v1
         kind: IAMKey
-        metadata: {}
+        metadata:
+          annotations:
+            appcat.vshn.io/forward-events-to: ''
         spec:
           forProvider:
             keyName: ''
@@ -51,6 +53,15 @@ spec:
         - fromFieldPath: status.conditions
           toFieldPath: status.accessUserConditions
           type: ToCompositeFieldPath
+        - combine:
+            strategy: string
+            string:
+              fmt: exoscale.crossplane.io/v1/IAMKey/%s/%s
+            variables:
+              - fromFieldPath: metadata.labels[crossplane.io/claim-namespace]
+              - fromFieldPath: metadata.labels[crossplane.io/claim-name]
+          toFieldPath: spec.forProvider.values.commonAnnotations[appcat.vshn.io/forward-events-to]
+          type: CombineFromComposite
         - fromFieldPath: metadata.labels[crossplane.io/composite]
           toFieldPath: spec.writeConnectionSecretToRef.name
           type: FromCompositeFieldPath
@@ -72,7 +83,9 @@ spec:
     - base:
         apiVersion: exoscale.crossplane.io/v1
         kind: Bucket
-        metadata: {}
+        metadata:
+          annotations:
+            appcat.vshn.io/forward-events-to: ''
         spec:
           forProvider:
             bucketDeletionPolicy: ''
@@ -109,4 +122,13 @@ spec:
         - fromFieldPath: spec.parameters.bucketDeletionPolicy
           toFieldPath: spec.forProvider.bucketDeletionPolicy
           type: FromCompositeFieldPath
+        - combine:
+            strategy: string
+            string:
+              fmt: exoscale.crossplane.io/v1/Bucket/%s/%s
+            variables:
+              - fromFieldPath: metadata.labels[crossplane.io/claim-namespace]
+              - fromFieldPath: metadata.labels[crossplane.io/claim-name]
+          toFieldPath: spec.forProvider.values.commonAnnotations[appcat.vshn.io/forward-events-to]
+          type: CombineFromComposite
   writeConnectionSecretsToNamespace: crossplane-system
diff --git a/component/tests/golden/minio/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/minio/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.74.0-func
+  package: ghcr.io/vshn/appcat:v4.75.0-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/component/tests/golden/minio/appcat/appcat/21_composition_vshn_minio.yaml b/component/tests/golden/minio/appcat/appcat/21_composition_vshn_minio.yaml
@@ -28,7 +28,7 @@ spec:
         data:
           controlNamespace: syn-appcat-control
           defaultPlan: standard-1
-          imageTag: v4.74.0
+          imageTag: v4.75.0
           isOpenshift: 'false'
           maintenanceSA: helm-based-service-maintenance
           minioChartRepository: https://charts.min.io

diff --git a/component/tests/golden/minio/appcat/appcat/controllers/appcat/30_deployment.yaml b/component/tests/golden/minio/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.74.0
+          image: ghcr.io/vshn/appcat:v4.75.0
           livenessProbe:
             httpGet:
               path: /healthz

diff --git a/component/tests/golden/minio/appcat/appcat/sla_reporter/01_cronjob.yaml b/component/tests/golden/minio/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.74.0
+              image: ghcr.io/vshn/appcat:v4.75.0
               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: "false"
         - name: APPCAT_SLI_VSHNMARIADB
           value: "false"
-        image: ghcr.io/vshn/appcat:v4.74.0
+        image: ghcr.io/vshn/appcat:v4.75.0
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/component/tests/golden/openshift/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/openshift/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.74.0-func
+  package: ghcr.io/vshn/appcat:v4.75.0-func
   runtimeConfigRef:
     name: function-appcat