Merge pull request #138 from kangshung/feature/affinity

Add affinity support for NiFi
cetic · May 28, 2021 · e179ede · e179ede
2 parents 2e40d72 + f38d88f
commit e179ede
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/Chart.yaml b/Chart.yaml
@@ -1,7 +1,7 @@
 ---
 apiVersion: v2
 name: nifi
-version: 0.7.1
+version: 0.7.2
 appVersion: 1.12.1
 description: Apache NiFi is a software project from the Apache Software Foundation designed to automate the flow of data between software systems.
 keywords:

diff --git a/README.md b/README.md
@@ -188,6 +188,8 @@ The following table lists the configurable parameters of the nifi chart and the
 | `resources`                                                                 | Pod resource requests and limits for logs                                                                          | `{}`                            |
 | **logResources**                                                            |
 | `logresources.`                                                             | Pod resource requests and limits                                                                                   | `{}`                            |
+| **affinity**                                                                |
+| `affinity`                                                                  | Pod affinity scheduling rules                                                                                      | `{}`                            |
 | **nodeSelector**                                                            |
 | `nodeSelector`                                                              | Node labels for pod assignment                                                                                     | `{}`                            |
 | **terminationGracePeriodSeconds**                                           |

diff --git a/templates/statefulset.yaml b/templates/statefulset.yaml
@@ -36,7 +36,7 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
 {{- end }}
       serviceAccountName: {{ include "apache-nifi.serviceAccountName" . }}
-      {{- if eq .Values.sts.AntiAffinity "hard"}}
+      {{- if eq .Values.sts.AntiAffinity "hard" }}
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
@@ -47,7 +47,7 @@ spec:
                     values:
                     - {{ include "apache-nifi.name" . | quote }}
               topologyKey: "kubernetes.io/hostname"
-      {{- else if eq .Values.sts.AntiAffinity "soft"}}
+      {{- else if eq .Values.sts.AntiAffinity "soft" }}
       affinity:
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
@@ -60,7 +60,11 @@ spec:
                         values:
                          - {{ include "apache-nifi.name" . | quote }}
                  topologyKey: "kubernetes.io/hostname"
-      {{- end}}
+      {{- end }}
+{{- if and .Values.affinity (and (ne .Values.sts.AntiAffinity "hard") (ne .Values.sts.AntiAffinity "soft")) }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}
+{{- end }}
 {{- if .Values.terminationGracePeriodSeconds }}
       terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
 {{- end }}

diff --git a/values.yaml b/values.yaml
@@ -239,6 +239,10 @@ logresources:
     cpu: 50m
     memory: 50Mi
 
+## Enables setting your own affinity. Mutually exclusive with sts.AntiAffinity
+## You need to set the value of sts.AntiAffinity other than "soft" and "hard"
+affinity: {}
+
 nodeSelector: {}
 
 tolerations: []