Merge pull request #307 from vshn/fix/postgresql_credentials

Remove secret observation
vshn · Jan 24, 2024 · 1b38ce6 · 1b38ce6
2 parents ba9e892 + cd13fa5
commit 1b38ce6
Show file tree

Hide file tree

Showing 33 changed files with 32 additions and 455 deletions.
diff --git a/component/class/defaults.yml b/component/class/defaults.yml
@@ -42,7 +42,7 @@ parameters:
       appcat:
         registry: ghcr.io
         repository: vshn/appcat
-        tag: v4.49.1
+        tag: v4.51.0
       apiserver:
         registry: ghcr.io
         repository: vshn/appcat-apiserver

diff --git a/component/component/vshn_postgres.jsonnet b/component/component/vshn_postgres.jsonnet
@@ -423,90 +423,6 @@ local sgCluster = {
   ],
 };
 
-local secret = {
-  name: 'connection',
-  base: comp.KubeObject('v1', 'Secret') +
-        {
-          spec+: {
-            forProvider+: {
-              manifest+: {
-                metadata: {},
-                stringData: {
-                  POSTGRESQL_USER: defaultUser,
-                  POSTGRESQL_PORT: defaultPort,
-                  POSTGRESQL_DB: defaultDB,
-                  POSTGRESQL_HOST: '',
-                },
-              },
-            },
-            references: [
-              {
-                patchesFrom: {
-                  apiVersion: 'v1',
-                  kind: 'Secret',
-                  namespace: '',
-                  name: '',
-                  fieldPath: 'data.superuser-password',
-                },
-                toFieldPath: 'data.POSTGRESQL_PASSWORD',
-              },
-              {
-                patchesFrom: {
-                  apiVersion: 'v1',
-                  kind: 'Secret',
-                  name: certificateSecretName,
-                  namespace: '',
-                  fieldPath: 'data[ca.crt]',
-                },
-                toFieldPath: 'data[ca.crt]',
-              },
-              {
-                patchesFrom: {
-                  apiVersion: 'v1',
-                  kind: 'Secret',
-                  name: certificateSecretName,
-                  namespace: '',
-                  fieldPath: 'data[tls.crt]',
-                },
-                toFieldPath: 'data[tls.crt]',
-              },
-              {
-                patchesFrom: {
-                  apiVersion: 'v1',
-                  kind: 'Secret',
-                  name: certificateSecretName,
-                  namespace: '',
-                  fieldPath: 'data[tls.key]',
-                },
-                toFieldPath: 'data[tls.key]',
-              },
-            ],
-            // Make crossplane aware of the connection secret we are creating in this object
-            writeConnectionSecretToRef: {
-              name: '',
-              namespace: '',
-            },
-          },
-        },
-  connectionDetails: comp.conn.AllFromSecretKeys(connectionSecretKeys),
-  patches: [
-    comp.ToCompositeFieldPath('status.conditions', 'status.secretConditions'),
-    comp.FromCompositeFieldPathWithTransformSuffix('metadata.labels[crossplane.io/composite]', 'metadata.name', 'connection'),
-    comp.FromCompositeFieldPathWithTransformPrefix('metadata.labels[crossplane.io/composite]', 'spec.forProvider.manifest.metadata.namespace', 'vshn-postgresql'),
-    comp.FromCompositeFieldPathWithTransformSuffix('metadata.labels[crossplane.io/claim-name]', 'spec.forProvider.manifest.metadata.name', 'connection'),
-
-    comp.CombineCompositeFromTwoFieldPaths('metadata.labels[crossplane.io/composite]', 'metadata.labels[crossplane.io/composite]', 'spec.forProvider.manifest.stringData.POSTGRESQL_HOST', '%s.vshn-postgresql-%s.svc.cluster.local'),
-    comp.FromCompositeFieldPathWithTransformPrefix('metadata.labels[crossplane.io/composite]', 'spec.references[0].patchesFrom.namespace', 'vshn-postgresql'),
-    comp.FromCompositeFieldPath('metadata.labels[crossplane.io/composite]', 'spec.references[0].patchesFrom.name'),
-    comp.FromCompositeFieldPathWithTransformPrefix('metadata.labels[crossplane.io/composite]', 'spec.writeConnectionSecretToRef.namespace', 'vshn-postgresql'),
-    comp.FromCompositeFieldPathWithTransformSuffix('metadata.labels[crossplane.io/claim-name]', 'spec.writeConnectionSecretToRef.name', 'connection'),
-
-    comp.FromCompositeFieldPathWithTransformPrefix('metadata.labels[crossplane.io/composite]', 'spec.references[1].patchesFrom.namespace', 'vshn-postgresql'),
-    comp.FromCompositeFieldPathWithTransformPrefix('metadata.labels[crossplane.io/composite]', 'spec.references[2].patchesFrom.namespace', 'vshn-postgresql'),
-    comp.FromCompositeFieldPathWithTransformPrefix('metadata.labels[crossplane.io/composite]', 'spec.references[3].patchesFrom.namespace', 'vshn-postgresql'),
-  ],
-};
-
 local xobjectBucket = {
   name: 'pg-bucket',
   base: {
@@ -904,7 +820,6 @@ local composition(restore=false) =
                            sgPostgresConfig,
                            sgCluster +
                            if restore then clusterRestoreConfig else {},
-                           secret,
                            xobjectBucket,
                            sgObjectStorage,
                            podMonitor,

diff --git a/component/tests/golden/apiserver/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/apiserver/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.49.1-func
+  package: ghcr.io/vshn/appcat:v4.51.0-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/...ent/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml b/...ent/tests/golden/cloudscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.49.1-func
+  package: ghcr.io/vshn/appcat:v4.51.0-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
@@ -30,7 +30,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_TRACK_OC_MAINTENANCE_STATUS
           value: "false"
-        image: ghcr.io/vshn/appcat:v4.49.1
+        image: ghcr.io/vshn/appcat:v4.51.0
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/...t/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/10_function_appcat.yaml b/...t/tests/golden/cloudscale-metrics-collector-managed/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.49.1-func
+  package: ghcr.io/vshn/appcat:v4.51.0-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
@@ -30,7 +30,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_TRACK_OC_MAINTENANCE_STATUS
           value: "false"
-        image: ghcr.io/vshn/appcat:v4.49.1
+        image: ghcr.io/vshn/appcat:v4.51.0
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/component/tests/golden/cloudscale/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/cloudscale/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.49.1-func
+  package: ghcr.io/vshn/appcat:v4.51.0-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/component/tests/golden/controllers/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/controllers/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.49.1-func
+  package: ghcr.io/vshn/appcat:v4.51.0-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/component/tests/golden/controllers/appcat/appcat/controllers/appcat/30_deployment.yaml b/component/tests/golden/controllers/appcat/appcat/controllers/appcat/30_deployment.yaml
@@ -23,7 +23,7 @@ spec:
           env:
             - name: PLANS_NAMESPACE
               value: syn-appcat
-          image: ghcr.io/vshn/appcat:v4.49.1
+          image: ghcr.io/vshn/appcat:v4.51.0
           livenessProbe:
             httpGet:
               path: /healthz

diff --git a/component/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/defaults/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.49.1-func
+  package: ghcr.io/vshn/appcat:v4.51.0-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
@@ -30,7 +30,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_TRACK_OC_MAINTENANCE_STATUS
           value: "false"
-        image: ghcr.io/vshn/appcat:v4.49.1
+        image: ghcr.io/vshn/appcat:v4.51.0
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/...onent/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml b/...onent/tests/golden/exoscale-metrics-collector-cloud/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.49.1-func
+  package: ghcr.io/vshn/appcat:v4.51.0-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
@@ -30,7 +30,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_TRACK_OC_MAINTENANCE_STATUS
           value: "false"
-        image: ghcr.io/vshn/appcat:v4.49.1
+        image: ghcr.io/vshn/appcat:v4.51.0
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/...ent/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/10_function_appcat.yaml b/...ent/tests/golden/exoscale-metrics-collector-managed/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.49.1-func
+  package: ghcr.io/vshn/appcat:v4.51.0-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
@@ -30,7 +30,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_TRACK_OC_MAINTENANCE_STATUS
           value: "false"
-        image: ghcr.io/vshn/appcat:v4.49.1
+        image: ghcr.io/vshn/appcat:v4.51.0
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/component/tests/golden/exoscale/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/exoscale/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.49.1-func
+  package: ghcr.io/vshn/appcat:v4.51.0-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/component/tests/golden/minio/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/minio/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.49.1-func
+  package: ghcr.io/vshn/appcat:v4.51.0-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/component/tests/golden/minio/appcat/appcat/21_composition_vshn_minio.yaml b/component/tests/golden/minio/appcat/appcat/21_composition_vshn_minio.yaml
@@ -28,7 +28,7 @@ spec:
         data:
           controlNamespace: syn-appcat-control
           defaultPlan: standard-1
-          imageTag: v4.49.1
+          imageTag: v4.51.0
           maintenanceSA: helm-based-service-maintenance
           minioChartRepository: https://charts.min.io
           minioChartVersion: 5.0.13

diff --git a/component/tests/golden/minio/appcat/appcat/controllers/appcat/30_deployment.yaml b/component/tests/golden/minio/appcat/appcat/controllers/appcat/30_deployment.yaml
@@ -23,7 +23,7 @@ spec:
           env:
             - name: PLANS_NAMESPACE
               value: syn-appcat
-          image: ghcr.io/vshn/appcat:v4.49.1
+          image: ghcr.io/vshn/appcat:v4.51.0
           livenessProbe:
             httpGet:
               path: /healthz

diff --git a/component/tests/golden/minio/appcat/appcat/sla_reporter/01_cronjob.yaml b/component/tests/golden/minio/appcat/appcat/sla_reporter/01_cronjob.yaml
@@ -30,7 +30,7 @@ spec:
               envFrom:
                 - secretRef:
                     name: appcat-sla-reports-creds
-              image: ghcr.io/vshn/appcat:v4.49.1
+              image: ghcr.io/vshn/appcat:v4.51.0
               name: sla-reporter
               resources:
                 limits:

diff --git a/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
@@ -30,7 +30,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_TRACK_OC_MAINTENANCE_STATUS
           value: "false"
-        image: ghcr.io/vshn/appcat:v4.49.1
+        image: ghcr.io/vshn/appcat:v4.51.0
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/component/tests/golden/openshift/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/openshift/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.49.1-func
+  package: ghcr.io/vshn/appcat:v4.51.0-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml b/.../appcat/appcat/sli_exporter/apps_v1_deployment_appcat-sliexporter-controller-manager.yaml
@@ -30,7 +30,7 @@ spec:
           value: "false"
         - name: APPCAT_SLI_TRACK_OC_MAINTENANCE_STATUS
           value: "false"
-        image: ghcr.io/vshn/appcat:v4.49.1
+        image: ghcr.io/vshn/appcat:v4.51.0
         livenessProbe:
           httpGet:
             path: /healthz

diff --git a/component/tests/golden/vshn/appcat/appcat/10_function_appcat.yaml b/component/tests/golden/vshn/appcat/appcat/10_function_appcat.yaml
@@ -3,6 +3,6 @@ kind: Function
 metadata:
   name: function-appcat
 spec:
-  package: ghcr.io/vshn/appcat:v4.49.1-func
+  package: ghcr.io/vshn/appcat:v4.51.0-func
   runtimeConfigRef:
     name: function-appcat
diff --git a/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml b/component/tests/golden/vshn/appcat/appcat/21_composition_vshn_mariadb.yaml
@@ -31,7 +31,7 @@ spec:
           chartRepository: https://charts.bitnami.com/bitnami
           chartVersion: 10.1.3
           controlNamespace: syn-appcat-control
-          imageTag: v4.49.1
+          imageTag: v4.51.0
           isOpenshift: 'false'
           maintenanceSA: helm-based-service-maintenance
           plans: '{"standard-1": {"size": {"cpu": "250m", "disk": "16Gi", "enabled":