Fixing Issues with RDS Compositions and Example. (#191)

* Fixing Enginer Versions * Fixing Enginer Versions * Fixing Enginer Versions
awslabs · Jun 4, 2024 · 34d0121 · 34d0121
1 parent d268857
commit 34d0121
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/compositions/aws-provider/rds/postgres-aurora.yaml b/compositions/aws-provider/rds/postgres-aurora.yaml
@@ -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

diff --git a/compositions/aws-provider/rds/rds-postgres.yaml b/compositions/aws-provider/rds/rds-postgres.yaml
@@ -102,7 +102,7 @@ spec:
         spec:
           forProvider:
             applyImmediately: true
-            autogeneratePassword: true
+            autogeneratePassword: false
             backupRetentionPeriod: 3
             dbSubnetGroupNameSelector:
               matchControllerRef: true
@@ -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
@@ -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"

diff --git a/examples/aws-provider/composite-resources/rds/aurora-postgres.yaml b/examples/aws-provider/composite-resources/rds/aurora-postgres.yaml
@@ -16,7 +16,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: postgres-root-user-password
-  namespace: default
+  namespace: crossplane-system
 data:
   password: bXlzZWNyZXRQYXNzd29yZDEh # mysecretPassword1!
 ---

diff --git a/examples/aws-provider/composite-resources/rds/postgres.yaml b/examples/aws-provider/composite-resources/rds/postgres.yaml
@@ -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: