Skip to content

Commit 986cf71

Browse files
vfarcicvfarcic
committed
Random
1 parent c2c22e5 commit 986cf71

17 files changed

Lines changed: 250 additions & 153 deletions

File tree

‎crossplane-config/config-k8s.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ kind: Configuration
55
metadata:
66
name: crossplane-k8s
77
spec:
8-
package: xpkg.upbound.io/devops-toolkit/dot-kubernetes:v0.4.32
8+
package: xpkg.upbound.io/devops-toolkit/dot-kubernetes:v0.4.35

‎crossplane-config/config-sql.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ kind: Configuration
55
metadata:
66
name: crossplane-sql
77
spec:
8-
package: xpkg.upbound.io/devops-toolkit/dot-sql:v0.4.2
8+
package: xpkg.upbound.io/devops-toolkit/dot-sql:v0.4.3

‎examples/app/backend-azure-postgresql.yaml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
apiVersion: devopstoolkitseries.com/v1alpha1
3+
kind: AppClaim
4+
metadata:
5+
name: silly-demo
6+
spec:
7+
id: silly-demo
8+
compositionSelector:
9+
matchLabels:
10+
type: backend-db
11+
location: local
12+
parameters:
13+
namespace: production
14+
image: vfarcic/sql-demo:0.1.10
15+
port: 8080
16+
host: silly-demo.20.81.12.26.nip.io
17+
---
18+
apiVersion: devopstoolkitseries.com/v1alpha1
19+
kind: SQLClaim
20+
metadata:
21+
name: silly-demo
22+
spec:
23+
id: silly-demo
24+
compositionSelector:
25+
matchLabels:
26+
provider: azure
27+
db: postgresql
28+
parameters:
29+
version: "13"
30+
size: small
31+
namespace: production
32+
writeConnectionSecretToRef:
33+
name: silly-demo

‎examples/app/backend-prod.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ spec:
1414
namespace: production
1515
image: vfarcic/silly-demo:1.0.8
1616
port: 8080
17-
host: silly-demo.34.139.13.104.nip.io
17+
host: silly-demo.20.81.12.26.nip.io

‎packages/k8s/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## Publish To Upbound
22

33
```bash
4-
export VERSION=v0.4.32
4+
export VERSION=v0.4.35
55

66
# Replace `[...]` with the Upbound Cloud account
77
export UP_ACCOUNT=[...]

‎packages/k8s/aks.yaml‎

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ spec:
415415
metadata:
416416
name: crossplane-sql
417417
spec:
418-
package: xpkg.upbound.io/devops-toolkit/dot-sql:v0.4.2
418+
package: xpkg.upbound.io/devops-toolkit/dot-sql:v0.4.3
419419
patches:
420420
- fromFieldPath: spec.id
421421
toFieldPath: metadata.name
@@ -425,3 +425,52 @@ spec:
425425
fmt: '%s-config-sql'
426426
- fromFieldPath: spec.id
427427
toFieldPath: spec.providerConfigRef.name
428+
- name: jet-azure-p
429+
base:
430+
apiVersion: kubernetes.crossplane.io/v1alpha1
431+
kind: Object
432+
spec:
433+
forProvider:
434+
manifest:
435+
apiVersion: pkg.crossplane.io/v1
436+
kind: Provider
437+
metadata:
438+
name: crossplane-provider-jet-azure
439+
spec:
440+
package: crossplane/provider-jet-azure:v0.12.0
441+
patches:
442+
- fromFieldPath: spec.id
443+
toFieldPath: metadata.name
444+
transforms:
445+
- type: string
446+
string:
447+
fmt: '%s-jet-azure-p'
448+
- fromFieldPath: spec.id
449+
toFieldPath: spec.providerConfigRef.name
450+
- name: jet-azure-pc
451+
base:
452+
apiVersion: kubernetes.crossplane.io/v1alpha1
453+
kind: Object
454+
spec:
455+
forProvider:
456+
manifest:
457+
apiVersion: azure.jet.crossplane.io/v1alpha1
458+
kind: ProviderConfig
459+
metadata:
460+
name: default
461+
spec:
462+
credentials:
463+
source: Secret
464+
secretRef:
465+
namespace: crossplane-system
466+
name: azure-creds
467+
key: creds
468+
patches:
469+
- fromFieldPath: spec.id
470+
toFieldPath: metadata.name
471+
transforms:
472+
- type: string
473+
string:
474+
fmt: '%s-jet-azure-pc'
475+
- fromFieldPath: spec.id
476+
toFieldPath: spec.providerConfigRef.name

‎packages/k8s/eks.yaml‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -448,55 +448,6 @@ spec:
448448
patches:
449449
- fromFieldPath: spec.id
450450
toFieldPath: metadata.name
451-
- name: aws-p
452-
base:
453-
apiVersion: kubernetes.crossplane.io/v1alpha1
454-
kind: Object
455-
spec:
456-
forProvider:
457-
manifest:
458-
apiVersion: pkg.crossplane.io/v1
459-
kind: Provider
460-
metadata:
461-
name: crossplane-provider-aws
462-
spec:
463-
package: crossplane/provider-aws:v0.24.1
464-
patches:
465-
- fromFieldPath: spec.id
466-
toFieldPath: metadata.name
467-
transforms:
468-
- type: string
469-
string:
470-
fmt: '%s-aws-p'
471-
- fromFieldPath: spec.id
472-
toFieldPath: spec.providerConfigRef.name
473-
- name: aws-pc
474-
base:
475-
apiVersion: kubernetes.crossplane.io/v1alpha1
476-
kind: Object
477-
spec:
478-
forProvider:
479-
manifest:
480-
apiVersion: aws.crossplane.io/v1beta1
481-
kind: ProviderConfig
482-
metadata:
483-
name: default
484-
spec:
485-
credentials:
486-
source: Secret
487-
secretRef:
488-
namespace: crossplane-system
489-
name: aws-creds
490-
key: creds
491-
patches:
492-
- fromFieldPath: spec.id
493-
toFieldPath: metadata.name
494-
transforms:
495-
- type: string
496-
string:
497-
fmt: '%s-aws-pc'
498-
- fromFieldPath: spec.id
499-
toFieldPath: spec.providerConfigRef.name
500451
- name: helm
501452
base:
502453
apiVersion: helm.crossplane.io/v1beta1
@@ -828,7 +779,7 @@ spec:
828779
metadata:
829780
name: crossplane-sql
830781
spec:
831-
package: xpkg.upbound.io/devops-toolkit/dot-sql:v0.4.2
782+
package: xpkg.upbound.io/devops-toolkit/dot-sql:v0.4.3
832783
patches:
833784
- fromFieldPath: spec.id
834785
toFieldPath: metadata.name
@@ -838,3 +789,52 @@ spec:
838789
fmt: '%s-config-sql'
839790
- fromFieldPath: spec.id
840791
toFieldPath: spec.providerConfigRef.name
792+
- name: aws-p
793+
base:
794+
apiVersion: kubernetes.crossplane.io/v1alpha1
795+
kind: Object
796+
spec:
797+
forProvider:
798+
manifest:
799+
apiVersion: pkg.crossplane.io/v1
800+
kind: Provider
801+
metadata:
802+
name: crossplane-provider-aws
803+
spec:
804+
package: crossplane/provider-aws:v0.24.1
805+
patches:
806+
- fromFieldPath: spec.id
807+
toFieldPath: metadata.name
808+
transforms:
809+
- type: string
810+
string:
811+
fmt: '%s-aws-p'
812+
- fromFieldPath: spec.id
813+
toFieldPath: spec.providerConfigRef.name
814+
- name: aws-pc
815+
base:
816+
apiVersion: kubernetes.crossplane.io/v1alpha1
817+
kind: Object
818+
spec:
819+
forProvider:
820+
manifest:
821+
apiVersion: aws.crossplane.io/v1beta1
822+
kind: ProviderConfig
823+
metadata:
824+
name: default
825+
spec:
826+
credentials:
827+
source: Secret
828+
secretRef:
829+
namespace: crossplane-system
830+
name: aws-creds
831+
key: creds
832+
patches:
833+
- fromFieldPath: spec.id
834+
toFieldPath: metadata.name
835+
transforms:
836+
- type: string
837+
string:
838+
fmt: '%s-aws-pc'
839+
- fromFieldPath: spec.id
840+
toFieldPath: spec.providerConfigRef.name

‎packages/k8s/gke.yaml‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -96,28 +96,6 @@ spec:
9696
- type: MatchString
9797
fieldPath: status.atProvider.status
9898
matchString: RUNNING
99-
- name: gcp-p
100-
base:
101-
apiVersion: kubernetes.crossplane.io/v1alpha1
102-
kind: Object
103-
spec:
104-
forProvider:
105-
manifest:
106-
apiVersion: pkg.crossplane.io/v1
107-
kind: Provider
108-
metadata:
109-
name: crossplane-provider-gcp
110-
spec:
111-
package: crossplane/provider-gcp:v0.21.0
112-
patches:
113-
- fromFieldPath: spec.id
114-
toFieldPath: metadata.name
115-
transforms:
116-
- type: string
117-
string:
118-
fmt: '%s-gcp-p'
119-
- fromFieldPath: spec.id
120-
toFieldPath: spec.providerConfigRef.name
12199
- name: helm
122100
base:
123101
apiVersion: helm.crossplane.io/v1beta1
@@ -463,7 +441,7 @@ spec:
463441
metadata:
464442
name: crossplane-sql
465443
spec:
466-
package: xpkg.upbound.io/devops-toolkit/dot-sql:v0.4.2
444+
package: xpkg.upbound.io/devops-toolkit/dot-sql:v0.4.3
467445
patches:
468446
- fromFieldPath: spec.id
469447
toFieldPath: metadata.name
@@ -473,3 +451,25 @@ spec:
473451
fmt: '%s-config-sql'
474452
- fromFieldPath: spec.id
475453
toFieldPath: spec.providerConfigRef.name
454+
- name: gcp-p
455+
base:
456+
apiVersion: kubernetes.crossplane.io/v1alpha1
457+
kind: Object
458+
spec:
459+
forProvider:
460+
manifest:
461+
apiVersion: pkg.crossplane.io/v1
462+
kind: Provider
463+
metadata:
464+
name: crossplane-provider-gcp
465+
spec:
466+
package: crossplane/provider-gcp:v0.21.0
467+
patches:
468+
- fromFieldPath: spec.id
469+
toFieldPath: metadata.name
470+
transforms:
471+
- type: string
472+
string:
473+
fmt: '%s-gcp-p'
474+
- fromFieldPath: spec.id
475+
toFieldPath: spec.providerConfigRef.name

‎packages/sql/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## Publish To Upbound
22

33
```bash
4-
export VERSION=v0.4.2
4+
export VERSION=v0.4.3
55

66
# Replace `[...]` with the Upbound Cloud account
77
export UP_ACCOUNT=[...]

‎packages/sql/azure.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,17 @@ spec:
4646
key: password
4747
publicNetworkAccessEnabled: true
4848
sslMinimalTlsVersionEnforced: TLS1_2
49+
writeConnectionSecretToRef:
50+
namespace: crossplane-system
4951
patches:
5052
- fromFieldPath: spec.id
5153
toFieldPath: metadata.name
54+
- fromFieldPath: metadata.uid
55+
toFieldPath: spec.writeConnectionSecretToRef.name
56+
transforms:
57+
- type: string
58+
string:
59+
fmt: "%s-sql"
5260
- fromFieldPath: spec.parameters.version
5361
toFieldPath: spec.forProvider.version
5462
- fromFieldPath: spec.parameters.size
@@ -67,3 +75,8 @@ spec:
6775
- type: string
6876
string:
6977
fmt: '%s-creds'
78+
connectionDetails:
79+
- fromConnectionSecretKey: username
80+
- fromConnectionSecretKey: password
81+
- fromConnectionSecretKey: endpoint
82+
- fromConnectionSecretKey: port

0 commit comments

Comments
 (0)