Allow setting affinity for replicated deployment (#227)

replicatedhq · Dec 17, 2024 · d6434c6 · d6434c6
1 parent 05fb840
commit d6434c6
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 0 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -162,6 +162,26 @@ jobs:
           fi
 
 
+          cat << EOF > test-values.yaml 
+          affinity:
+            nodeAffinity:
+              requiredDuringSchedulingIgnoredDuringExecution:
+                nodeSelectorTerms:
+                - matchExpressions:
+                  - key: production/node-pool
+                    operator: In
+                    values:
+                    - replicated-sdk
+          EOF
+
+          output=$(helm template oci://ttl.sh/automated-${{ github.run_id }}/replicated --version 0.0.0 --values test-values.yaml)
+
+          if ! echo $output | grep -q 'affinity:'; then
+            printf "user-set affinity should exist:\n\n%s\n\n" "$output"
+            exit 1
+          fi
+
+
           cat << EOF > test-values.yaml
           statusInformers: []
           EOF

diff --git a/chart/templates/replicated-deployment.yaml b/chart/templates/replicated-deployment.yaml
@@ -41,6 +41,10 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- if $podSecurityContext.enabled }}
       securityContext: {{- omit $podSecurityContext "enabled" | toYaml | nindent 8 }}
       {{- end }}

diff --git a/chart/values.yaml.tmpl b/chart/values.yaml.tmpl
@@ -77,3 +77,5 @@ replicatedID: ""
 appID: ""
 
 tolerations: []
+
+affinity: ~
Original file line number	Diff line number	Diff line change
Expand Up		@@ -77,3 +77,5 @@ replicatedID: ""
		appID: ""

		tolerations: []

		affinity: ~