From 2d1fe37f877d38f8d889bfbaf2a2a294443b1ffe Mon Sep 17 00:00:00 2001 From: Elamaran Shanmugam Date: Wed, 8 May 2024 12:47:02 -0400 Subject: [PATCH 1/3] Fixing Enginer Versions --- compositions/aws-provider/rds/postgres-aurora.yaml | 2 +- compositions/aws-provider/rds/rds-postgres.yaml | 12 +++--------- .../composite-resources/rds/aurora-postgres.yaml | 2 +- .../composite-resources/rds/postgres.yaml | 9 ++++++++- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/compositions/aws-provider/rds/postgres-aurora.yaml b/compositions/aws-provider/rds/postgres-aurora.yaml index bde9b612..a52c33ed 100644 --- 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 index 74c1cbd6..a6829dad 100644 --- 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 index b4033120..24e398e5 100644 --- 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 index a5581cb3..a2fe72b5 100644 --- 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: From 705d5ee4ce85492c16f21d0c2d0f338e023df45e Mon Sep 17 00:00:00 2001 From: Elamaran Shanmugam Date: Wed, 8 May 2024 12:47:34 -0400 Subject: [PATCH 2/3] Fixing Enginer Versions --- compositions/aws-provider/rds/postgres-aurora.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compositions/aws-provider/rds/postgres-aurora.yaml b/compositions/aws-provider/rds/postgres-aurora.yaml index a52c33ed..1f022d3e 100644 --- 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: "14.11" + engineVersion: "14.10" finalDBSnapshotIdentifier: "to-be-patched" masterUserPasswordSecretRef: key: password From 8f7838516a0a1fa9fb83271e4c492b36908af827 Mon Sep 17 00:00:00 2001 From: Elamaran Shanmugam Date: Wed, 8 May 2024 12:47:41 -0400 Subject: [PATCH 3/3] Fixing Enginer Versions --- compositions/aws-provider/rds/postgres-aurora.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compositions/aws-provider/rds/postgres-aurora.yaml b/compositions/aws-provider/rds/postgres-aurora.yaml index 1f022d3e..a52c33ed 100644 --- 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: "14.10" + engineVersion: "14.11" finalDBSnapshotIdentifier: "to-be-patched" masterUserPasswordSecretRef: key: password