Random

vfarcic · Aug 31, 2022 · 986cf71 · 986cf71
1 parent c2c22e5
commit 986cf71
Show file tree

Hide file tree

Showing 17 changed files with 250 additions and 153 deletions.
diff --git a/crossplane-config/config-k8s.yaml b/crossplane-config/config-k8s.yaml
@@ -5,4 +5,4 @@ kind: Configuration
 metadata:
   name: crossplane-k8s
 spec:
-  package: xpkg.upbound.io/devops-toolkit/dot-kubernetes:v0.4.32
+  package: xpkg.upbound.io/devops-toolkit/dot-kubernetes:v0.4.35
diff --git a/crossplane-config/config-sql.yaml b/crossplane-config/config-sql.yaml
@@ -5,4 +5,4 @@ kind: Configuration
 metadata:
   name: crossplane-sql
 spec:
-  package: xpkg.upbound.io/devops-toolkit/dot-sql:v0.4.2
+  package: xpkg.upbound.io/devops-toolkit/dot-sql:v0.4.3
diff --git a/examples/app/backend-azure-postgresql.yaml b/examples/app/backend-azure-postgresql.yaml
@@ -0,0 +1,33 @@
+---
+apiVersion: devopstoolkitseries.com/v1alpha1
+kind: AppClaim
+metadata:
+  name: silly-demo
+spec:
+  id: silly-demo
+  compositionSelector:
+    matchLabels:
+      type: backend-db
+      location: local
+  parameters:
+    namespace: production
+    image: vfarcic/sql-demo:0.1.10
+    port: 8080
+    host: silly-demo.20.81.12.26.nip.io
+---
+apiVersion: devopstoolkitseries.com/v1alpha1
+kind: SQLClaim
+metadata:
+  name: silly-demo
+spec:
+  id: silly-demo
+  compositionSelector:
+    matchLabels:
+      provider: azure
+      db: postgresql
+  parameters:
+    version: "13"
+    size: small
+    namespace: production
+  writeConnectionSecretToRef:
+    name: silly-demo
diff --git a/examples/app/backend-prod.yaml b/examples/app/backend-prod.yaml
@@ -14,4 +14,4 @@ spec:
     namespace: production
     image: vfarcic/silly-demo:1.0.8
     port: 8080
-    host: silly-demo.34.139.13.104.nip.io
+    host: silly-demo.20.81.12.26.nip.io
diff --git a/packages/k8s/README.md b/packages/k8s/README.md
@@ -1,7 +1,7 @@
 ## Publish To Upbound
 
 ```bash
-export VERSION=v0.4.32
+export VERSION=v0.4.35
 
 # Replace `[...]` with the Upbound Cloud account
 export UP_ACCOUNT=[...]

diff --git a/packages/k8s/aks.yaml b/packages/k8s/aks.yaml
@@ -415,7 +415,7 @@ spec:
             metadata:
               name: crossplane-sql
             spec:
-              package: xpkg.upbound.io/devops-toolkit/dot-sql:v0.4.2
+              package: xpkg.upbound.io/devops-toolkit/dot-sql:v0.4.3
     patches:
     - fromFieldPath: spec.id
       toFieldPath: metadata.name
@@ -425,3 +425,52 @@ spec:
           fmt: '%s-config-sql'
     - fromFieldPath: spec.id
       toFieldPath: spec.providerConfigRef.name
+  - name: jet-azure-p
+    base:
+      apiVersion: kubernetes.crossplane.io/v1alpha1
+      kind: Object
+      spec:
+        forProvider:
+          manifest:
+            apiVersion: pkg.crossplane.io/v1
+            kind: Provider
+            metadata:
+              name: crossplane-provider-jet-azure
+            spec:
+              package: crossplane/provider-jet-azure:v0.12.0
+    patches:
+    - fromFieldPath: spec.id
+      toFieldPath: metadata.name
+      transforms:
+      - type: string
+        string:
+          fmt: '%s-jet-azure-p'
+    - fromFieldPath: spec.id
+      toFieldPath: spec.providerConfigRef.name
+  - name: jet-azure-pc
+    base:
+      apiVersion: kubernetes.crossplane.io/v1alpha1
+      kind: Object
+      spec:
+        forProvider:
+          manifest:
+            apiVersion: azure.jet.crossplane.io/v1alpha1
+            kind: ProviderConfig
+            metadata:
+              name: default
+            spec:
+              credentials:
+                source: Secret
+                secretRef:
+                  namespace: crossplane-system
+                  name: azure-creds
+                  key: creds
+    patches:
+    - fromFieldPath: spec.id
+      toFieldPath: metadata.name
+      transforms:
+      - type: string
+        string:
+          fmt: '%s-jet-azure-pc'
+    - fromFieldPath: spec.id
+      toFieldPath: spec.providerConfigRef.name
diff --git a/packages/k8s/eks.yaml b/packages/k8s/eks.yaml
@@ -448,55 +448,6 @@ spec:
     patches:
     - fromFieldPath: spec.id
       toFieldPath: metadata.name
-  - name: aws-p
-    base:
-      apiVersion: kubernetes.crossplane.io/v1alpha1
-      kind: Object
-      spec:
-        forProvider:
-          manifest:
-            apiVersion: pkg.crossplane.io/v1
-            kind: Provider
-            metadata:
-              name: crossplane-provider-aws
-            spec:
-              package: crossplane/provider-aws:v0.24.1
-    patches:
-    - fromFieldPath: spec.id
-      toFieldPath: metadata.name
-      transforms:
-      - type: string
-        string:
-          fmt: '%s-aws-p'
-    - fromFieldPath: spec.id
-      toFieldPath: spec.providerConfigRef.name
-  - name: aws-pc
-    base:
-      apiVersion: kubernetes.crossplane.io/v1alpha1
-      kind: Object
-      spec:
-        forProvider:
-          manifest:
-            apiVersion: aws.crossplane.io/v1beta1
-            kind: ProviderConfig
-            metadata:
-              name: default
-            spec:
-              credentials:
-                source: Secret
-                secretRef:
-                  namespace: crossplane-system
-                  name: aws-creds
-                  key: creds
-    patches:
-    - fromFieldPath: spec.id
-      toFieldPath: metadata.name
-      transforms:
-      - type: string
-        string:
-          fmt: '%s-aws-pc'
-    - fromFieldPath: spec.id
-      toFieldPath: spec.providerConfigRef.name
   - name: helm
     base:
       apiVersion: helm.crossplane.io/v1beta1
@@ -828,7 +779,7 @@ spec:
             metadata:
               name: crossplane-sql
             spec:
-              package: xpkg.upbound.io/devops-toolkit/dot-sql:v0.4.2
+              package: xpkg.upbound.io/devops-toolkit/dot-sql:v0.4.3
     patches:
     - fromFieldPath: spec.id
       toFieldPath: metadata.name
@@ -838,3 +789,52 @@ spec:
           fmt: '%s-config-sql'
     - fromFieldPath: spec.id
       toFieldPath: spec.providerConfigRef.name
+  - name: aws-p
+    base:
+      apiVersion: kubernetes.crossplane.io/v1alpha1
+      kind: Object
+      spec:
+        forProvider:
+          manifest:
+            apiVersion: pkg.crossplane.io/v1
+            kind: Provider
+            metadata:
+              name: crossplane-provider-aws
+            spec:
+              package: crossplane/provider-aws:v0.24.1
+    patches:
+    - fromFieldPath: spec.id
+      toFieldPath: metadata.name
+      transforms:
+      - type: string
+        string:
+          fmt: '%s-aws-p'
+    - fromFieldPath: spec.id
+      toFieldPath: spec.providerConfigRef.name
+  - name: aws-pc
+    base:
+      apiVersion: kubernetes.crossplane.io/v1alpha1
+      kind: Object
+      spec:
+        forProvider:
+          manifest:
+            apiVersion: aws.crossplane.io/v1beta1
+            kind: ProviderConfig
+            metadata:
+              name: default
+            spec:
+              credentials:
+                source: Secret
+                secretRef:
+                  namespace: crossplane-system
+                  name: aws-creds
+                  key: creds
+    patches:
+    - fromFieldPath: spec.id
+      toFieldPath: metadata.name
+      transforms:
+      - type: string
+        string:
+          fmt: '%s-aws-pc'
+    - fromFieldPath: spec.id
+      toFieldPath: spec.providerConfigRef.name
diff --git a/packages/k8s/gke.yaml b/packages/k8s/gke.yaml
@@ -96,28 +96,6 @@ spec:
     - type: MatchString
       fieldPath: status.atProvider.status
       matchString: RUNNING
-  - name: gcp-p
-    base:
-      apiVersion: kubernetes.crossplane.io/v1alpha1
-      kind: Object
-      spec:
-        forProvider:
-          manifest:
-            apiVersion: pkg.crossplane.io/v1
-            kind: Provider
-            metadata:
-              name: crossplane-provider-gcp
-            spec:
-              package: crossplane/provider-gcp:v0.21.0
-    patches:
-    - fromFieldPath: spec.id
-      toFieldPath: metadata.name
-      transforms:
-      - type: string
-        string:
-          fmt: '%s-gcp-p'
-    - fromFieldPath: spec.id
-      toFieldPath: spec.providerConfigRef.name
   - name: helm
     base:
       apiVersion: helm.crossplane.io/v1beta1
@@ -463,7 +441,7 @@ spec:
             metadata:
               name: crossplane-sql
             spec:
-              package: xpkg.upbound.io/devops-toolkit/dot-sql:v0.4.2
+              package: xpkg.upbound.io/devops-toolkit/dot-sql:v0.4.3
     patches:
     - fromFieldPath: spec.id
       toFieldPath: metadata.name
@@ -473,3 +451,25 @@ spec:
           fmt: '%s-config-sql'
     - fromFieldPath: spec.id
       toFieldPath: spec.providerConfigRef.name
+  - name: gcp-p
+    base:
+      apiVersion: kubernetes.crossplane.io/v1alpha1
+      kind: Object
+      spec:
+        forProvider:
+          manifest:
+            apiVersion: pkg.crossplane.io/v1
+            kind: Provider
+            metadata:
+              name: crossplane-provider-gcp
+            spec:
+              package: crossplane/provider-gcp:v0.21.0
+    patches:
+    - fromFieldPath: spec.id
+      toFieldPath: metadata.name
+      transforms:
+      - type: string
+        string:
+          fmt: '%s-gcp-p'
+    - fromFieldPath: spec.id
+      toFieldPath: spec.providerConfigRef.name
diff --git a/packages/sql/README.md b/packages/sql/README.md
@@ -1,7 +1,7 @@
 ## Publish To Upbound
 
 ```bash
-export VERSION=v0.4.2
+export VERSION=v0.4.3
 
 # Replace `[...]` with the Upbound Cloud account
 export UP_ACCOUNT=[...]

diff --git a/packages/sql/azure.yaml b/packages/sql/azure.yaml
@@ -46,9 +46,17 @@ spec:
             key: password
           publicNetworkAccessEnabled: true
           sslMinimalTlsVersionEnforced: TLS1_2
+        writeConnectionSecretToRef:
+          namespace: crossplane-system
     patches:
     - fromFieldPath: spec.id
       toFieldPath: metadata.name
+    - fromFieldPath: metadata.uid
+      toFieldPath: spec.writeConnectionSecretToRef.name
+      transforms:
+        - type: string
+          string:
+            fmt: "%s-sql"
     - fromFieldPath: spec.parameters.version
       toFieldPath: spec.forProvider.version
     - fromFieldPath: spec.parameters.size
@@ -67,3 +75,8 @@ spec:
       - type: string
         string:
           fmt: '%s-creds'
+    connectionDetails:
+    - fromConnectionSecretKey: username
+    - fromConnectionSecretKey: password
+    - fromConnectionSecretKey: endpoint
+    - fromConnectionSecretKey: port
diff --git a/packages/ytt-k8s/_ytt_lib/aws/config.yaml b/packages/ytt-k8s/_ytt_lib/aws/config.yaml
@@ -260,53 +260,3 @@ spec:
     patches:
     - fromFieldPath: spec.id
       toFieldPath: metadata.name
-  - name: aws-p
-    base:
-      apiVersion: kubernetes.crossplane.io/v1alpha1
-      kind: Object
-      spec:
-        forProvider:
-          manifest:
-            apiVersion: pkg.crossplane.io/v1
-            kind: Provider
-            metadata:
-              name: crossplane-provider-aws
-            spec:
-              package: crossplane/provider-aws:v0.24.1
-    patches:
-    - fromFieldPath: spec.id
-      toFieldPath: metadata.name
-      transforms:
-      - type: string
-        string:
-          fmt: '%s-aws-p'
-    - fromFieldPath: spec.id
-      toFieldPath: spec.providerConfigRef.name
-  - name: aws-pc
-    base:
-      apiVersion: kubernetes.crossplane.io/v1alpha1
-      kind: Object
-      spec:
-        forProvider:
-          manifest:
-            apiVersion: aws.crossplane.io/v1beta1
-            kind: ProviderConfig
-            metadata:
-              name: default
-            spec:
-              credentials:
-                source: Secret
-                secretRef:
-                  namespace: crossplane-system
-                  name: aws-creds
-                  key: creds
-    patches:
-    - fromFieldPath: spec.id
-      toFieldPath: metadata.name
-      transforms:
-      - type: string
-        string:
-          fmt: '%s-aws-pc'
-    - fromFieldPath: spec.id
-      toFieldPath: spec.providerConfigRef.name
-