Merge pull request #27 from ytsarev/expose-db-version

Expose database version in XRD
upbound · Feb 16, 2024 · 8a0b7a6 · 8a0b7a6
2 parents 3737568 + a67ac6f
commit 8a0b7a6
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/apis/definition.yaml b/apis/definition.yaml
@@ -45,6 +45,10 @@ spec:
                       default: default
                     storageGB:
                       type: integer
+                      description: Database size
+                    version:
+                      type: string
+                      description: Database version
                     passwordSecretRef:
                       type: object
                       description: "A reference to the Secret object containing database password"
@@ -71,5 +75,6 @@ spec:
                   required:
                     - storageGB
                     - passwordSecretRef
+                    - version
               required:
                 - parameters
diff --git a/apis/mariadb/composition.yaml b/apis/mariadb/composition.yaml
@@ -45,8 +45,6 @@ spec:
                   skuName: GP_Gen5_2
                   sslEnforcementEnabled: false
                   sslMinimalTlsVersionEnforced: TLSEnforcementDisabled
-                  storageMb: 5120
-                  version: "10.3"
             connectionDetails:
               - type: FromFieldPath
                 fromFieldPath: status.atProvider.fqdn
@@ -106,6 +104,9 @@ spec:
               - type: FromCompositeFieldPath
                 fromFieldPath: spec.parameters.passwordSecretRef.key
                 toFieldPath: spec.forProvider.administratorLoginPasswordSecretRef.key
+              - type: FromCompositeFieldPath
+                fromFieldPath: spec.parameters.version
+                toFieldPath: spec.forProvider.version
 
           - name: vnetrule
             base:

diff --git a/apis/postgresql/composition.yaml b/apis/postgresql/composition.yaml
@@ -48,8 +48,6 @@ spec:
                   skuName: GP_Gen5_2
                   sslEnforcementEnabled: false
                   sslMinimalTlsVersionEnforced: TLSEnforcementDisabled
-                  storageMb: 5120
-                  version: "11"
             connectionDetails:
               - type: FromFieldPath
                 fromFieldPath: status.atProvider.fqdn
@@ -109,6 +107,9 @@ spec:
               - type: FromCompositeFieldPath
                 fromFieldPath: spec.parameters.passwordSecretRef.key
                 toFieldPath: spec.forProvider.administratorLoginPasswordSecretRef.key
+              - type: FromCompositeFieldPath
+                fromFieldPath: spec.parameters.version
+                toFieldPath: spec.forProvider.version
 
           - name: vnetrule
             base:

diff --git a/examples/mariadb-claim.yaml b/examples/mariadb-claim.yaml
@@ -10,6 +10,7 @@ spec:
   parameters:
     region: westus
     storageGB: 5 #Minimum value is 5
+    version: "10.3"
     passwordSecretRef:
       namespace: default
       name: psqlsecret

diff --git a/examples/postgres-claim.yaml b/examples/postgres-claim.yaml
@@ -10,6 +10,7 @@ spec:
   parameters:
     region: westus
     storageGB: 5 #Minimum value is 5
+    version: "11"
     passwordSecretRef:
       namespace: default
       name: psqlsecret