Merge pull request #122 from haarchri/feature/xeks-split

feat(split): split xeks
upbound · Oct 27, 2023 · 41eab0e · 41eab0e
2 parents 786b2b6 + 380c3b0
commit 41eab0e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 568 deletions.
diff --git a/apis/app/composition.yaml b/apis/app/composition.yaml
@@ -77,7 +77,7 @@ spec:
         kind: Usage
         spec:
           of:
-            apiVersion: aws.platformref.upbound.io/v1alpha1
+            apiVersion: aws.platform.upbound.io/v1alpha1
             kind: XEKS
           by:
             apiVersion: helm.crossplane.io/v1beta1
@@ -86,4 +86,4 @@ spec:
               matchControllerRef: true
       patches:
         - fromFieldPath: spec.parameters.providerConfigName
-          toFieldPath: spec.of.resourceSelector.matchLabels[xeks.aws.platformref.upbound.io/cluster-id]
+          toFieldPath: spec.of.resourceSelector.matchLabels[xeks.aws.platform.upbound.io/cluster-id]
diff --git a/apis/cluster/composition.yaml b/apis/cluster/composition.yaml
@@ -29,14 +29,14 @@ spec:
             fromFieldPath: Required
       name: compositeNetworkEKS
     - base:
-        apiVersion: aws.platformref.upbound.io/v1alpha1
+        apiVersion: aws.platform.upbound.io/v1alpha1
         kind: XEKS
       connectionDetails:
         - fromConnectionSecretKey: kubeconfig
       name: compositeClusterEKS
       patches:
         - fromFieldPath: spec.parameters.id
-          toFieldPath: metadata.labels[xeks.aws.platformref.upbound.io/cluster-id]
+          toFieldPath: metadata.labels[xeks.aws.platform.upbound.io/cluster-id]
         - fromFieldPath: spec.parameters.id
           toFieldPath: spec.parameters.id
         - fromFieldPath: spec.parameters.region
@@ -65,10 +65,6 @@ spec:
           toFieldPath: spec.parameters.iam.roleArn
         - fromFieldPath: spec.parameters.iam.userArn
           toFieldPath: spec.parameters.iam.userArn
-        - fromFieldPath: status.subnetIds
-          toFieldPath: spec.parameters.subnetIds
-          policy:
-            fromFieldPath: Required
     - base:
         apiVersion: aws.platformref.upbound.io/v1alpha1
         kind: XServices
@@ -99,7 +95,7 @@ spec:
         kind: Usage
         spec:
           of:
-            apiVersion: aws.platformref.upbound.io/v1alpha1
+            apiVersion: aws.platform.upbound.io/v1alpha1
             kind: XEKS
             resourceSelector:
               matchControllerRef: true