Merge pull request #45 from ytsarev/split-network-database-app

Split network, database and app
upbound · Nov 9, 2023 · f927caa · f927caa
2 parents 38d0d15 + d9c5284
commit f927caa
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 686 deletions.
diff --git a/apis/app/composition.yaml b/apis/app/composition.yaml
diff --git a/apis/app/definition.yaml b/apis/app/definition.yaml
diff --git a/apis/cluster/aks/composition.yaml b/apis/cluster/aks/composition.yaml
@@ -51,9 +51,9 @@ spec:
             string:
               fmt: "%s-aks"
         - fromFieldPath: spec.parameters.id
-          toFieldPath: spec.forProvider.resourceGroupNameSelector.matchLabels[azure.platformref.upbound.io/network-id]
+          toFieldPath: spec.forProvider.resourceGroupNameSelector.matchLabels[azure.platform.upbound.io/network-id]
         - fromFieldPath: spec.parameters.id
-          toFieldPath: spec.forProvider.defaultNodePool[0].vnetSubnetIdSelector.matchLabels[azure.platformref.upbound.io/network-id]
+          toFieldPath: spec.forProvider.defaultNodePool[0].vnetSubnetIdSelector.matchLabels[azure.platform.upbound.io/network-id]
         - fromFieldPath: spec.parameters.id
           toFieldPath: spec.forProvider.dnsPrefix
         - fromFieldPath: spec.parameters.nodes.instanceType
@@ -92,25 +92,3 @@ spec:
               fmt: "%s-akscluster"
       readinessChecks:
         - type: None
-    - name: providerConfigKubernetes
-      base:
-        apiVersion: kubernetes.crossplane.io/v1alpha1
-        kind: ProviderConfig
-        spec:
-          credentials:
-            source: Secret
-            secretRef:
-              key: kubeconfig
-      patches:
-        - fromFieldPath: spec.parameters.id
-          toFieldPath: metadata.name
-        - fromFieldPath: spec.writeConnectionSecretToRef.namespace
-          toFieldPath: spec.credentials.secretRef.namespace
-        - fromFieldPath: metadata.uid
-          toFieldPath: spec.credentials.secretRef.name
-          transforms:
-          - type: string
-            string:
-              fmt: "%s-akscluster"
-      readinessChecks:
-        - type: None
diff --git a/apis/cluster/composition.yaml b/apis/cluster/composition.yaml
@@ -10,7 +10,7 @@ spec:
   resources:
     - name: compositeNetworkAKS
       base:
-        apiVersion: azure.platformref.upbound.io/v1alpha1
+        apiVersion: azure.platform.upbound.io/v1alpha1
         kind: XNetwork
       patches:
         - fromFieldPath: spec.parameters.id
@@ -93,3 +93,22 @@ spec:
             kind: XServices
             resourceSelector:
               matchControllerRef: true
+
+    - name: usageXAksByArbitraryLabeledRelease
+      base:
+        apiVersion: apiextensions.crossplane.io/v1alpha1
+        kind: Usage
+        spec:
+          of:
+            apiVersion: aws.platform.upbound.io/v1alpha1
+            kind: XAKS
+            resourceSelector:
+              matchControllerRef: true
+          by:
+            apiVersion: helm.crossplane.io/v1beta1
+            kind: Release
+            resourceSelector:
+              matchLabels:
+                platform.upbound.io/deletion-ordering: enabled
+      readinessChecks:
+        - type: None
diff --git a/apis/cluster/network/default/composition.yaml b/apis/cluster/network/default/composition.yaml
diff --git a/apis/cluster/network/definition.yaml b/apis/cluster/network/definition.yaml