cleanup postgres operator example

examples/postgres-operator/manifests/patch-svc-accounts.yaml

@@ -0,0 +1,6 @@
+# This will make zarf aware of this SA to do the imagepullsecret patching for it
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: postgres-pod
+  namespace: postgres-operator

examples/postgres-operator/manifests/postgres-operator.yaml

@@ -1,4 +1,3 @@
-      # repository: ??
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -14,11 +13,3 @@ data:
   WALG_DISABLE_S3_SSE: "true"
   USE_WALG_RESTORE: "false"
   AWS_S3_FORCE_PATH_STYLE: "true"
----
-apiVersion: v1
-kind: ServiceAccount
-metadata: 
-  name: zalando-postgres-operator
-  namespace: postgres-operator
-imagePullSecrets: 
-  - name: private-registry

examples/postgres-operator/values/minio-instance.yaml

@@ -10,7 +10,7 @@ tenants:
       ## size specifies the capacity per volume
       size: 1Gi
       ## storageClass specifies the storage class name to be used for this pool
-      storageClassName: local-path
+      storageClassName: "###ZARF_STORAGE_CLASS###"
       ## Used to specify a toleration for a pod
       tolerations: {}
       ## nodeSelector parameters for MinIO Pods. It specifies a map of key-value pairs. For the pod to be

examples/postgres-operator/values/minio-operator.yaml

@@ -10,3 +10,7 @@ operator:
     limits:
       cpu: 200m
       memory: 256Mi
+# @todo:  need to look at if this is neeeded for zarf with SA injection
+# tenants:
+#   imagePullSecret:
+#     name: zarf-registry

examples/postgres-operator/zarf.yaml

@@ -9,16 +9,13 @@ components:
   - name: baseline
     required: true
 
-    scripts:
-      retry: true
-      after:
-        - "kubectl patch serviceaccount default -p '{\"imagePullSecrets\": [{\"name\": \"private-registry\"}]}' -n postgres-operator"
-
     manifests:
       - name: postgres-example-config
         files:
+          - manifests/patch-svc-accounts.yaml
           - manifests/minio-instance.yaml
           - manifests/pgadmin.yaml
+          - manifests/postgres-cluster.yaml
           - manifests/postgres-operator.yaml
           - manifests/postgres-operator-ui.yaml
     charts:
@@ -55,7 +52,6 @@ components:
         valuesFiles:
           - values/minio-instance.yaml
 
-
     images:
       - registry.opensource.zalan.do/acid/postgres-operator:v1.7.0
       - registry.opensource.zalan.do/acid/spilo-13:2.1-p1