update compositions for usage

Signed-off-by: Steven Borrelli <steve@borrelli.org>
upbound · Aug 31, 2023 · 4b576b6 · 4b576b6
1 parent 671ccaa
commit 4b576b6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/package/cluster/composition.yaml b/package/cluster/composition.yaml
@@ -71,18 +71,3 @@ spec:
           toFieldPath: spec.operators.universal-crossplane.version
         - fromFieldPath: spec.id
           toFieldPath: spec.operators.universal-crossplane.clusterRef
-    - name: usage-service-eks
-      base:
-        apiVersion: apiextensions.crossplane.io/v1alpha1
-        kind: Usage
-        spec:
-          of:
-            apiVersion: aws.platformref.upbound.io/v1alpha1
-            kind: XEKS
-            resourceSelector:
-              matchControllerRef: true
-          by:
-            apiVersion: aws.platformref.upbound.io/v1alpha1
-            kind: XServices
-            resourceSelector:
-              matchControllerRef: true
diff --git a/package/cluster/services/composition.yaml b/package/cluster/services/composition.yaml
@@ -56,6 +56,8 @@ spec:
       patches:
         - fromFieldPath: metadata.labels[crossplane.io/claim-name]
           toFieldPath: spec.of.resourceSelector.matchLabels[crossplane.io/claim-name]
+        - fromFieldPath: metadata.labels[crossplane.io/claim-namespace]
+          toFieldPath: spec.of.resourceSelector.matchLabels[crossplane.io/claim-namespace]
         - fromFieldPath: status.releaseNamePrometheus
           toFieldPath: spec.by.resourceRef.name
 
@@ -158,5 +160,7 @@ spec:
       patches:
         - fromFieldPath: metadata.labels[crossplane.io/claim-name]
           toFieldPath: spec.of.resourceSelector.matchLabels[crossplane.io/claim-name]
+        - fromFieldPath: metadata.labels[crossplane.io/claim-namespace]
+          toFieldPath: spec.of.resourceSelector.matchLabels[crossplane.io/claim-namespace]
         - fromFieldPath: status.releaseNameUXP
           toFieldPath: spec.by.resourceRef.name