Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing Issues with RDS Compositions and Example. #191

Merged
merged 3 commits into from
Jun 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compositions/aws-provider/rds/postgres-aurora.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ spec:
matchControllerRef: true
enableHTTPEndpoint: false
engine: aurora-postgresql
engineVersion: "13.6"
engineVersion: "14.11"
finalDBSnapshotIdentifier: "to-be-patched"
masterUserPasswordSecretRef:
key: password
Expand Down
12 changes: 3 additions & 9 deletions compositions/aws-provider/rds/rds-postgres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ spec:
spec:
forProvider:
applyImmediately: true
autogeneratePassword: true
autogeneratePassword: false
backupRetentionPeriod: 3
dbSubnetGroupNameSelector:
matchControllerRef: true
Expand All @@ -111,10 +111,10 @@ spec:
masterUsername: root
masterUserPasswordSecretRef:
key: password
name: to-be-patched
name: postgres-root-user-password
namespace: crossplane-system
engine: postgres
engineVersion: "14.2"
engineVersion: "14.11"
skipFinalSnapshot: true
storageEncrypted: true
storageType: gp2
Expand All @@ -133,12 +133,6 @@ spec:
- type: string
string:
fmt: "%s-postgresql"
- fromFieldPath: "metadata.uid"
toFieldPath: "spec.forProvider.masterUserPasswordSecretRef.name"
transforms:
- type: string
string:
fmt: "%s-user"
- fromFieldPath: "spec.storageGB"
toFieldPath: "spec.forProvider.allocatedStorage"
- fromFieldPath: "spec.engineVersion"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ apiVersion: v1
kind: Secret
metadata:
name: postgres-root-user-password
namespace: default
namespace: crossplane-system
data:
password: bXlzZWNyZXRQYXNzd29yZDEh # mysecretPassword1!
---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,14 @@
# 1. RDS Postgres Instance with auto generated password
# 2. RDS subnet group
# 3. EC2 Security group

apiVersion: v1
kind: Secret
metadata:
name: postgres-root-user-password
namespace: crossplane-system
data:
password: bXlzZWNyZXRQYXNzd29yZDEh # mysecretPassword1!
---
apiVersion: awsblueprints.io/v1alpha1
kind: RelationalDatabase
metadata:
Expand Down
Loading