f

Signed-off-by: Nicolas Bigler <nicolas.bigler@vshn.ch>
vshn · Nov 15, 2023 · 4a962a4 · 4a962a4
1 parent 3c38853
commit 4a962a4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/component/component/vshn_redis.jsonnet b/component/component/vshn_redis.jsonnet
@@ -663,13 +663,13 @@ local composition =
                                                                        redisPlans)),
             comp.FromCompositeFieldPath('spec.parameters.scheduling.nodeSelector', 'spec.forProvider.values.master.nodeSelector'),
             comp.FromCompositeFieldPath('spec.parameters.service.redisSettings', 'spec.forProvider.values.commonConfiguration'),
-            comp.CombineCompositeFromTwoFieldPaths('metadata.labels[crossplane.io/claim-namespace]', 'metadata.labels[crossplane.io/claim-name]', 'spec.forProvider.values.commonAnnotations[vshn.net/forward-events-to]', 'vshn.appcat.vshn.io/v1/VSHNRedis/%s/%s'),
-            comp.CombineCompositeFromTwoFieldPaths('metadata.labels[crossplane.io/claim-namespace]', 'metadata.labels[crossplane.io/claim-name]', 'spec.forProvider.values.master.podAnnotations[vshn.net/forward-events-to]', 'vshn.appcat.vshn.io/v1/VSHNRedis/%s/%s'),
-            comp.CombineCompositeFromTwoFieldPaths('metadata.labels[crossplane.io/claim-namespace]', 'metadata.labels[crossplane.io/claim-name]', 'spec.forProvider.values.persistence.annotations[vshn.net/forward-events-to]', 'vshn.appcat.vshn.io/v1/VSHNRedis/%s/%s'),
-            comp.CombineCompositeFromTwoFieldPaths('metadata.labels[crossplane.io/claim-namespace]', 'metadata.labels[crossplane.io/claim-name]', 'spec.forProvider.values.service.annotations[vshn.net/forward-events-to]', 'vshn.appcat.vshn.io/v1/VSHNRedis/%s/%s'),
-            comp.CombineCompositeFromTwoFieldPaths('metadata.labels[crossplane.io/claim-namespace]', 'metadata.labels[crossplane.io/claim-name]', 'spec.forProvider.values.replica.podAnnotations[vshn.net/forward-events-to]', 'vshn.appcat.vshn.io/v1/VSHNRedis/%s/%s'),
-            comp.CombineCompositeFromTwoFieldPaths('metadata.labels[crossplane.io/claim-namespace]', 'metadata.labels[crossplane.io/claim-name]', 'spec.forProvider.values.persistence.annotations[vshn.net/forward-events-to]', 'vshn.appcat.vshn.io/v1/VSHNRedis/%s/%s'),
-            comp.CombineCompositeFromTwoFieldPaths('metadata.labels[crossplane.io/claim-namespace]', 'metadata.labels[crossplane.io/claim-name]', 'spec.forProvider.values.service.annotations[vshn.net/forward-events-to]', 'vshn.appcat.vshn.io/v1/VSHNRedis/%s/%s'),
+            comp.CombineCompositeFromTwoFieldPaths('metadata.labels[crossplane.io/claim-namespace]', 'metadata.labels[crossplane.io/claim-name]', 'spec.forProvider.values.commonAnnotations[appcat.vshn.io/forward-events-to]', 'vshn.appcat.vshn.io/v1/VSHNRedis/%s/%s'),
+            comp.CombineCompositeFromTwoFieldPaths('metadata.labels[crossplane.io/claim-namespace]', 'metadata.labels[crossplane.io/claim-name]', 'spec.forProvider.values.master.podAnnotations[appcat.vshn.io/forward-events-to]', 'vshn.appcat.vshn.io/v1/VSHNRedis/%s/%s'),
+            comp.CombineCompositeFromTwoFieldPaths('metadata.labels[crossplane.io/claim-namespace]', 'metadata.labels[crossplane.io/claim-name]', 'spec.forProvider.values.persistence.annotations[appcat.vshn.io/forward-events-to]', 'vshn.appcat.vshn.io/v1/VSHNRedis/%s/%s'),
+            comp.CombineCompositeFromTwoFieldPaths('metadata.labels[crossplane.io/claim-namespace]', 'metadata.labels[crossplane.io/claim-name]', 'spec.forProvider.values.service.annotations[appcat.vshn.io/forward-events-to]', 'vshn.appcat.vshn.io/v1/VSHNRedis/%s/%s'),
+            comp.CombineCompositeFromTwoFieldPaths('metadata.labels[crossplane.io/claim-namespace]', 'metadata.labels[crossplane.io/claim-name]', 'spec.forProvider.values.replica.podAnnotations[appcat.vshn.io/forward-events-to]', 'vshn.appcat.vshn.io/v1/VSHNRedis/%s/%s'),
+            comp.CombineCompositeFromTwoFieldPaths('metadata.labels[crossplane.io/claim-namespace]', 'metadata.labels[crossplane.io/claim-name]', 'spec.forProvider.values.persistence.annotations[appcat.vshn.io/forward-events-to]', 'vshn.appcat.vshn.io/v1/VSHNRedis/%s/%s'),
+            comp.CombineCompositeFromTwoFieldPaths('metadata.labels[crossplane.io/claim-namespace]', 'metadata.labels[crossplane.io/claim-name]', 'spec.forProvider.values.service.annotations[appcat.vshn.io/forward-events-to]', 'vshn.appcat.vshn.io/v1/VSHNRedis/%s/%s'),
           ],
         },
       ],

diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_redis.yaml
@@ -886,7 +886,7 @@ spec:
             variables:
               - fromFieldPath: metadata.labels[crossplane.io/claim-namespace]
               - fromFieldPath: metadata.labels[crossplane.io/claim-name]
-          toFieldPath: spec.forProvider.values.commonAnnotations[vshn.net/forward-events-to]
+          toFieldPath: spec.forProvider.values.commonAnnotations[appcat.vshn.io/forward-events-to]
           type: CombineFromComposite
         - combine:
             strategy: string
@@ -895,7 +895,7 @@ spec:
             variables:
               - fromFieldPath: metadata.labels[crossplane.io/claim-namespace]
               - fromFieldPath: metadata.labels[crossplane.io/claim-name]
-          toFieldPath: spec.forProvider.values.master.podAnnotations[vshn.net/forward-events-to]
+          toFieldPath: spec.forProvider.values.master.podAnnotations[appcat.vshn.io/forward-events-to]
           type: CombineFromComposite
         - combine:
             strategy: string
@@ -904,7 +904,7 @@ spec:
             variables:
               - fromFieldPath: metadata.labels[crossplane.io/claim-namespace]
               - fromFieldPath: metadata.labels[crossplane.io/claim-name]
-          toFieldPath: spec.forProvider.values.persistence.annotations[vshn.net/forward-events-to]
+          toFieldPath: spec.forProvider.values.persistence.annotations[appcat.vshn.io/forward-events-to]
           type: CombineFromComposite
         - combine:
             strategy: string
@@ -913,7 +913,7 @@ spec:
             variables:
               - fromFieldPath: metadata.labels[crossplane.io/claim-namespace]
               - fromFieldPath: metadata.labels[crossplane.io/claim-name]
-          toFieldPath: spec.forProvider.values.service.annotations[vshn.net/forward-events-to]
+          toFieldPath: spec.forProvider.values.service.annotations[appcat.vshn.io/forward-events-to]
           type: CombineFromComposite
         - combine:
             strategy: string
@@ -922,7 +922,7 @@ spec:
             variables:
               - fromFieldPath: metadata.labels[crossplane.io/claim-namespace]
               - fromFieldPath: metadata.labels[crossplane.io/claim-name]
-          toFieldPath: spec.forProvider.values.replica.podAnnotations[vshn.net/forward-events-to]
+          toFieldPath: spec.forProvider.values.replica.podAnnotations[appcat.vshn.io/forward-events-to]
           type: CombineFromComposite
         - combine:
             strategy: string
@@ -931,7 +931,7 @@ spec:
             variables:
               - fromFieldPath: metadata.labels[crossplane.io/claim-namespace]
               - fromFieldPath: metadata.labels[crossplane.io/claim-name]
-          toFieldPath: spec.forProvider.values.persistence.annotations[vshn.net/forward-events-to]
+          toFieldPath: spec.forProvider.values.persistence.annotations[appcat.vshn.io/forward-events-to]
           type: CombineFromComposite
         - combine:
             strategy: string
@@ -940,6 +940,6 @@ spec:
             variables:
               - fromFieldPath: metadata.labels[crossplane.io/claim-namespace]
               - fromFieldPath: metadata.labels[crossplane.io/claim-name]
-          toFieldPath: spec.forProvider.values.service.annotations[vshn.net/forward-events-to]
+          toFieldPath: spec.forProvider.values.service.annotations[appcat.vshn.io/forward-events-to]
           type: CombineFromComposite
   writeConnectionSecretsToNamespace: syn-crossplane