Standardize config.

e2e-test-app/db-init-job.yaml

@@ -28,7 +28,7 @@ spec:
           readOnlyRootFilesystem: false
         env:
         - name: PGHOST
-          value: {{ .dbHost }}
+          value: {{ .db.host }}
         - name: PGUSER
           value: postgres
         - name: PGPASSWORD
@@ -37,9 +37,9 @@ spec:
               name: e2e-test-app-secrets
               key: postgres.password
         - name: DB_NAME
-          value: {{ .dbName }}
+          value: {{ .db.name }}
         - name: DB_USER
-          value: {{ .dbUser }}
+          value: {{ .db.user }}
         - name: DB_PASSWORD
           valueFrom:
             secretKeyRef:

e2e-test-app/manifest.yaml

@@ -1,23 +1,23 @@
 name: e2e-test-app
 is: e2e-test-app
 description: End-to-end test application for automated integration testing. Includes PVC and PostgreSQL dependency to exercise all backup strategies.
-version: 1.0.0
+version: 1.0.0-1
 requires:
   - name: postgres
 defaultConfig:
   namespace: e2e-test-app
   domain: e2e-test-app.{{ .cloud.domain }}
-  externalDnsDomain: "{{ .cloud.domain }}"
+  externalDnsDomain: '{{ .cloud.domain }}'
   tlsSecretName: wildcard-wild-cloud-tls
   storage: 1Gi
-  dbHost: "{{ .apps.postgres.host }}"
-  dbPort: "{{ .apps.postgres.port }}"
-  dbName: e2e_test_app
-  dbUser: e2e_test_app
-  timezone: UTC
+  db:
+    host: '{{ .apps.postgres.host }}'
+    port: '{{ .apps.postgres.port }}'
+    name: e2e_test_app
+    user: e2e_test_app
 defaultSecrets:
   - key: dbPassword
   - key: dbUrl
-    default: "postgres://{{ .app.dbUser }}:{{ .secrets.dbPassword }}@{{ .app.dbHost }}:{{ .app.dbPort }}/{{ .app.dbName }}?sslmode=disable"
+    default: "postgres://{{ .app.db.user }}:{{ .secrets.dbPassword }}@{{ .app.db.host }}:{{ .app.db.port }}/{{ .app.db.name }}?sslmode=disable"
 requiredSecrets:
   - postgres.password