Merge branch 'main' into lagoon_type_check

uselagoon · Jan 3, 2023 · 2fe73a4 · 2fe73a4
2 parents 9cd8afa + 6c3f447
commit 2fe73a4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 20 deletions.
diff --git a/legacy/helmcharts/elasticsearch/templates/prebackuppod.yaml b/legacy/helmcharts/elasticsearch/templates/prebackuppod.yaml
@@ -18,16 +18,14 @@ spec:
     spec:
       affinity:
         podAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-            - podAffinityTerm:
-                labelSelector:
-                  matchExpressions:
-                    - key: lagoon.sh/service
-                      operator: In
-                      values:
-                        - {{ include "elasticsearch.fullname" . }}
-                topologyKey: kubernetes.io/hostname
-              weight: 100
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchExpressions:
+                  - key: lagoon.sh/service
+                    operator: In
+                    values:
+                      - {{ .Release.Name }}
+              topologyKey: kubernetes.io/hostname
       containers:
         - args:
             - sleep

diff --git a/legacy/helmcharts/opensearch/templates/prebackuppod.yaml b/legacy/helmcharts/opensearch/templates/prebackuppod.yaml
@@ -18,16 +18,14 @@ spec:
     spec:
       affinity:
         podAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-            - podAffinityTerm:
-                labelSelector:
-                  matchExpressions:
-                    - key: lagoon.sh/service
-                      operator: In
-                      values:
-                        - {{ include "opensearch.fullname" . }}
-                topologyKey: kubernetes.io/hostname
-              weight: 100
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchExpressions:
+                  - key: lagoon.sh/service
+                    operator: In
+                    values:
+                      - {{ .Release.Name }}
+              topologyKey: kubernetes.io/hostname
       containers:
         - args:
             - sleep