resolve conflicts

manifests/complete-postgres-manifest.yaml

@@ -31,28 +31,28 @@ spec:
     size: 1Gi
 #    storageClass: my-sc
   additionalVolumes:
-    - name: data
-      mountPath: /home/postgres/pgdata/partitions
-      targetContainers:
-        - postgres
-      volumeSource:
-        PersistentVolumeClaim:
-          claimName: pvc-postgresql-data-partitions
-          readyOnly: false
-    - name: conf
-      mountPath: /etc/telegraf
-      subPath: telegraf.conf
-      targetContainers:
-        - telegraf-sidecar
-      volumeSource:
-        configMap:
-          name: my-config-map
     - name: empty
       mountPath: /opt/empty
       targetContainers:
         - all
       volumeSource:
         emptyDir: {}
+#    - name: data
+#      mountPath: /home/postgres/pgdata/partitions
+#      targetContainers:
+#        - postgres
+#      volumeSource:
+#        PersistentVolumeClaim:
+#          claimName: pvc-postgresql-data-partitions
+#          readyOnly: false
+#    - name: conf
+#      mountPath: /etc/telegraf
+#      subPath: telegraf.conf
+#      targetContainers:
+#        - telegraf-sidecar
+#      volumeSource:
+#        configMap:
+#          name: my-config-map
 
   enableShmVolume: true
 #  spiloFSGroup: 103

manifests/operatorconfiguration.crd.yaml

@@ -62,6 +62,12 @@ spec:
               type: object
               additionalProperties:
                 type: string
+            sidecars:
+              type: array
+              nullable: true
+              items:
+                type: object
+                additionalProperties: true
             workers:
               type: integer
               minimum: 1

manifests/postgresql-operator-default-configuration.yaml

@@ -14,8 +14,11 @@ configuration:
   resync_period: 30m
   repair_period: 5m
   # set_memory_request_to_limit: false
-  # sidecar_docker_images:
-  #   example: "exampleimage:exampletag"
+  # sidecars:
+  # - image: image:123
+  #   name: global-sidecar-1
+  #   ports:
+  #   - containerPort: 80
   workers: 4
   users:
     replication_username: standby