change usage to work between composites

Signed-off-by: Steven Borrelli <steve@borrelli.org>
upbound · Sep 7, 2023 · c60cc75 · c60cc75
1 parent 4623d0d
commit c60cc75
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 36 deletions.
diff --git a/package/cluster/composition.yaml b/package/cluster/composition.yaml
@@ -71,3 +71,18 @@ spec:
           toFieldPath: spec.operators.universal-crossplane.version
         - fromFieldPath: spec.id
           toFieldPath: spec.operators.universal-crossplane.clusterRef
+    - name: usage-of-eks-by-services
+      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/definition.yaml b/package/cluster/definition.yaml
@@ -3,6 +3,7 @@ kind: CompositeResourceDefinition
 metadata:
   name: xclusters.aws.platformref.upbound.io
 spec:
+  defaultCompositeDeletePolicy: Foreground
   group: aws.platformref.upbound.io
   names:
     kind: XCluster

diff --git a/package/cluster/services/composition.yaml b/package/cluster/services/composition.yaml
@@ -42,24 +42,24 @@ spec:
           fromFieldPath: metadata.name
           toFieldPath: status.releaseNamePrometheus
 
-    - name: release-promotheus-uses-xeks
-      base:
-        apiVersion: apiextensions.crossplane.io/v1alpha1
-        kind: Usage
-        spec:
-          of:
-            apiVersion: aws.platformref.upbound.io/v1alpha1
-            kind: XEKS
-          by:
-            apiVersion: helm.crossplane.io/v1beta1
-            kind: Release
-      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
+    # - name: release-promotheus-uses-xeks
+    #   base:
+    #     apiVersion: apiextensions.crossplane.io/v1alpha1
+    #     kind: Usage
+    #     spec:
+    #       of:
+    #         apiVersion: aws.platformref.upbound.io/v1alpha1
+    #         kind: XEKS
+    #       by:
+    #         apiVersion: helm.crossplane.io/v1beta1
+    #         kind: Release
+    #   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
 
     - name: irsaCrossplane
       base:
@@ -146,21 +146,21 @@ spec:
           fromFieldPath: metadata.name
           toFieldPath: status.releaseNameUXP
 
-    - name: release-uxp-uses-xeks
-      base:
-        apiVersion: apiextensions.crossplane.io/v1alpha1
-        kind: Usage
-        spec:
-          of:
-            apiVersion: aws.platformref.upbound.io/v1alpha1
-            kind: XEKS
-          by:
-            apiVersion: helm.crossplane.io/v1beta1
-            kind: Release
-      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
+    # - name: release-uxp-uses-xeks
+    #   base:
+    #     apiVersion: apiextensions.crossplane.io/v1alpha1
+    #     kind: Usage
+    #     spec:
+    #       of:
+    #         apiVersion: aws.platformref.upbound.io/v1alpha1
+    #         kind: XEKS
+    #       by:
+    #         apiVersion: helm.crossplane.io/v1beta1
+    #         kind: Release
+    #   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