[IMP] cnpg affinity and init

Author: az-adhoc

charts/adhoc-odoo/v0.2.9/templates/cnpg_pg.yaml

@@ -190,6 +190,12 @@ spec:
     initdb:
       database: "odoo"
       owner: "odoo"
+      # encoding: 'UTF8'
+      # localeCollate: 'C'
+      localeCType: 'en_US.utf8'
+      # postInitSQL:
+      #   - CREATE ROLE example
+      #   - CREATE ROLE anotherexample
       secret:
         name: {{ include "adhoc-odoo.fullname" . }}-pg-app
     {{- end }}

charts/adhoc-odoo/v0.2.9/templates/deployment.yaml

@@ -113,34 +113,33 @@ spec:
               - weight: 100
                 podAffinityTerm:
                   labelSelector:
-                    matchExpressions:
-                      - key: "app.kubernetes.io/instance"
-                        operator: In
-                        values:
-                          - {{ .Release.Name }}
+                    matchLabels:
+                      app.kubernetes.io/instance: {{ .Release.Name }}
+                      adhoc.ar/app-name: "odoo"
                   topologyKey: "kubernetes.io/hostname"
               {{/* Try to distribute services of the same type among nodes */}}
               - weight: 50
                 podAffinityTerm:
                   labelSelector:
-                    matchExpressions:
-                      - key: "adhoc.ar/tier"
-                        operator: In
-                        values:
-                          - {{ .Values.adhoc.appType | lower }}
+                    matchLabels:
+                      adhoc.ar/tier: {{ .Values.adhoc.appType | lower }}
                   topologyKey: "kubernetes.io/hostname"
-              {{/* Try to distribute services of the same type among nodes
-              # Try to distribute the pods with the same service level among nodes
-              # - weight: 50
-              #   podAffinityTerm:
-              #     labelSelector:
-              #       matchExpressions:
-              #         - key: "adhoc.ar/service-level"
-              #           operator: In
-              #           values:
-              #             - {{ .Values.adhoc.serviceLevel }}
-              #     topologyKey: "kubernetes.io/hostname"
-              */}}
+              {{/* Try to distribute the pods with the same service level among nodes */}}
+              - weight: 50
+                podAffinityTerm:
+                  labelSelector:
+                    matchLabels:
+                      adhoc.ar/service-level: {{ .Values.adhoc.serviceLevel }}
+                  topologyKey: "kubernetes.io/hostname"
+          {{- if .Values.cloudNativePG.enabled }}
+          podAntiAffinity:
+            preferredDuringSchedulingIgnoredDuringExecution:
+              - weight: 100
+                podAffinityTerm:
+                  labelSelector:
+                    cnpg.io/cluster: {{ .Release.Name }}-pg
+                  topologyKey: "kubernetes.io/hostname"
+          {{- end }}
           {{- if .Values.nodeTag }}
           nodeAffinity:
             requiredDuringSchedulingIgnoredDuringExecution: