wip

robpearce-flux · Jun 23, 2022 · aff0652 · aff0652
1 parent 83fe64d
commit aff0652
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 54 deletions.
diff --git a/example_app.yaml b/example_app.yaml
@@ -0,0 +1,50 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: django
+  labels:
+    foo: "bar"
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  namespace: django
+  name: django
+  labels:
+    app: django
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: django
+  template:
+    metadata:
+      labels:
+        app: django
+    spec:
+      containers:
+        - name: django
+          image: strm/helloworld-http
+          ports:
+            - containerPort: 8000
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: django
+  namespace: django
+spec:
+  selector:
+    app: django
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 8000
+
+
+
+
+
diff --git a/example_composition.yaml b/example_composition.yaml
@@ -25,38 +25,6 @@ spec:
           fromFieldPath: spec.resourceConfig.namespace
           toFieldPath: spec.forProvider.manifest.metadata.namespace
   resources:
-    - base:
-        apiVersion: kubernetes.crossplane.io/v1alpha1
-        kind: Object
-        metadata:
-          name: django-deployment
-        spec:
-          forProvider:
-            manifest:
-              apiVersion: apps/v1
-              kind: Deployment
-              metadata:
-                labels:
-                  app: django
-              spec:
-                replicas: 1
-                selector:
-                  matchLabels:
-                    app: django
-                template:
-                  metadata:
-                    labels:
-                      app: django
-                  spec:
-                    containers:
-                      - name: django
-                        image: strm/helloworld-http
-                        ports:
-                          - containerPort: 8000
-      patches:
-        - type: PatchSet
-          patchSetName: common-fields
-
     - base:
         apiVersion: kubernetes.crossplane.io/v1alpha1
         kind: Object
@@ -84,13 +52,13 @@ spec:
           toFieldPath: spec.forProvider.manifest.spec.defaultBackend.service.port.number
         - type: ToCompositeFieldPath
           fromFieldPath: status.atProvider.manifest.status.loadBalancer.ingress.hostname
-          toFieldpath: compositeFields.ingress.hostname
+          toFieldPath: metadata.annotations.ingress.hostname
 
     - base:
-        apiVersion: kubernetes.crossplane.io/v1alpha1
-        kind: Object
+        apiVersion: route53.aws.crossplane.io/v1alpha1
+        kind: ResourceRecordSet
         metadata:
-          name: django-r53
+          name: foobar.testingtesting123.com
         spec:
           references:
             - patchesFrom:
@@ -101,25 +69,18 @@ spec:
                 fieldPath: status.loadBalancer.ingress.hostname
               toFieldPath: spec.forProvider.dnsName
           forProvider:
-            manifest:
-              apiVersion: route53.aws.crossplane.io/v1alpha1
-              kind: ResourceRecordSet
-              metadata:
-                name: foobar.testingtesting123.com
-              spec:
-                forProvider:
-                  aliasTarget:
-                    evaluateTargetHealth: false
-                  type: A
+            aliasTarget:
+              evaluateTargetHealth: false
+            type: A
       patches:
         - type: PatchSet
           patchSetName: common-fields
         - type: FromCompositeFieldPath
           fromFieldPath: spec.resourceConfig.hostedZoneId
-          toFieldPath: spec.forProvider.manifest.spec.forProvider.aliasTarget.hostedZoneId
+          toFieldPath: spec.forProvider.aliasTarget.hostedZoneId
         - type: FromCompositeFieldPath
           fromFieldPath: spec.resourceConfig.zoneId
           toFieldPath: spec.forProvider.manifest.spec.forProvider.zoneId
         - type: FromCompositeFieldPath
-          fromFieldPath: compositeFields.ingress.hostname
-          toFieldPath: spec.forProvider.manifest.spec.forProvider.aliasTarget.dnsName
+          fromFieldPath: metadata.annotations.ingress.hostname
+          toFieldPath: spec.forProvider.aliasTarget.dnsName
diff --git a/example_composition_claim.yaml b/example_composition_claim.yaml
@@ -6,7 +6,6 @@ metadata:
 spec:
   resourceConfig:
     providerConfigName: default
-    region: ap-southeast-2
     tags:
       - key: foo
         value: bar

diff --git a/example_composition_definition.yaml b/example_composition_definition.yaml
@@ -43,9 +43,6 @@ spec:
                       type: string
                     providerConfigName:
                       type: string
-                    region:
-                      description: The aws region to make resources in, eg ap-southeast-2
-                      type: string
                     tags:
                       items:
                         properties:
@@ -60,7 +57,6 @@ spec:
                       type: array
                   required:
                     - providerConfigName
-                    - region
                     - tags
                   type: object
               required: