fix: support some missing configs on console, vault and grafana compo…

…nents (#1193) * fix: support some missting configs Signed-off-by: ericsyh <[email protected]> * update Signed-off-by: ericsyh <[email protected]> * apply on sn-platform Signed-off-by: ericsyh <[email protected]> * support vault init jobs Signed-off-by: ericsyh <[email protected]> * fix lint Signed-off-by: ericsyh <[email protected]> --------- Signed-off-by: ericsyh <[email protected]> (cherry picked from commit f82fc0a)
streamnative · Dec 20, 2024 · 918cb84 · 918cb84
1 parent 4586368
commit 918cb84
Show file tree

Hide file tree

Showing 10 changed files with 77 additions and 2 deletions.
diff --git a/charts/sn-platform-slim/templates/grafana/grafana-deployment.yaml b/charts/sn-platform-slim/templates/grafana/grafana-deployment.yaml
@@ -65,6 +65,8 @@ spec:
       tolerations:
 {{ toYaml .Values.grafana.tolerations | indent 8 }}
     {{- end }}
+      affinity:
+        {{- include "pulsar.antiAffinityRules" (dict "Values" .Values "thisAffinity" .Values.grafana.affinity "Component" .Values.grafana.component "Release" .Release "Chart" .Chart) | indent 8 }}
       terminationGracePeriodSeconds: {{ .Values.grafana.gracePeriod }}
       containers:
       - name: "{{ template "pulsar.fullname" . }}-{{ .Values.grafana.component }}"

diff --git a/charts/sn-platform-slim/templates/streamnative-console/streamnative-console-initialize.yaml b/charts/sn-platform-slim/templates/streamnative-console/streamnative-console-initialize.yaml
@@ -36,6 +36,14 @@ spec:
       {{- if .Values.global.imagePullSecrets }}
       imagePullSecrets: {{- toYaml .Values.global.imagePullSecrets | nindent 8 }}
       {{- end }}
+      {{- if .Values.streamnative_console.nodeSelector }}
+      nodeSelector: {{- toYaml .Values.streamnative_console.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.streamnative_console.tolerations }}
+      tolerations: {{- toYaml .Values.streamnative_console.tolerations | nindent 8 }}
+      {{- end }}
+      affinity:
+        {{- include "pulsar.antiAffinityRules" (dict "Values" .Values "thisAffinity" .Values.streamnative_console.affinity "Component" .Values.streamnative_console.component "Release" .Release "Chart" .Chart) | indent 8 }}
       {{- if not .Values.istio.enabled }}
       initContainers:
         # This init container will wait for broker to be ready before

diff --git a/charts/sn-platform-slim/templates/streamnative-console/streamnative-console-statefulset.yaml b/charts/sn-platform-slim/templates/streamnative-console/streamnative-console-statefulset.yaml
@@ -67,6 +67,8 @@ spec:
       tolerations:
 {{ toYaml .Values.streamnative_console.tolerations | indent 8 }}
     {{- end }}
+      affinity:
+        {{- include "pulsar.antiAffinityRules" (dict "Values" .Values "thisAffinity" .Values.streamnative_console.affinity "Component" .Values.streamnative_console.component "Release" .Release "Chart" .Chart) | indent 8 }}
       terminationGracePeriodSeconds: {{ .Values.streamnative_console.gracePeriod }}
       {{- if not .Values.istio.enabled }}
       initContainers:

diff --git a/charts/sn-platform-slim/values.yaml b/charts/sn-platform-slim/values.yaml
@@ -1725,14 +1725,14 @@ prometheus:
     requests:
       memory: 256Mi
       cpu: 0.1
-  # Definition of the serviceAccount used to run brokers.
   affinity:
     anti_affinity: true
     zone_anti_affinity: true
     # Set the anti affinity type. Valid values:
     # requiredDuringSchedulingIgnoredDuringExecution - rules must be met for pod to be scheduled (hard) requires at least one node per replica
     # preferredDuringSchedulingIgnoredDuringExecution - scheduler will try to enforce but not guranentee
     type: preferredDuringSchedulingIgnoredDuringExecution
+  # Definition of the serviceAccount used to run brokers.
   serviceAccount:
     # Specifies whether to use a service account to run this component
     use: true
@@ -1885,6 +1885,13 @@ grafana:
     requests:
       memory: 250Mi
       cpu: 0.1
+  affinity:
+    anti_affinity: true
+    zone_anti_affinity: true
+    # Set the anti affinity type. Valid values:
+    # requiredDuringSchedulingIgnoredDuringExecution - rules must be met for pod to be scheduled (hard) requires at least one node per replica
+    # preferredDuringSchedulingIgnoredDuringExecution - scheduler will try to enforce but not guranentee
+    type: preferredDuringSchedulingIgnoredDuringExecution
   volumes:
     # use a persistent volume or emptyDir
     persistence: true
@@ -2040,6 +2047,13 @@ streamnative_console:
     limits: {}
       # memory: "1Gi"
       # cpu: "0.4"
+  affinity:
+    anti_affinity: true
+    zone_anti_affinity: true
+    # Set the anti affinity type. Valid values:
+    # requiredDuringSchedulingIgnoredDuringExecution - rules must be met for pod to be scheduled (hard) requires at least one node per replica
+    # preferredDuringSchedulingIgnoredDuringExecution - scheduler will try to enforce but not guranentee
+    type: preferredDuringSchedulingIgnoredDuringExecution
   volumes:
     # use a persistent volume or emptyDir
     persistence: true

diff --git a/charts/sn-platform/templates/grafana/grafana-statefulset.yaml b/charts/sn-platform/templates/grafana/grafana-statefulset.yaml
@@ -63,6 +63,8 @@ spec:
       tolerations:
 {{ toYaml .Values.grafana.tolerations | indent 8 }}
     {{- end }}
+      affinity:
+        {{- include "pulsar.antiAffinityRules" (dict "Values" .Values "thisAffinity" .Values.grafana.affinity "Component" .Values.grafana.component "Release" .Release "Chart" .Chart) | indent 8 }}
       terminationGracePeriodSeconds: {{ .Values.grafana.gracePeriod }}
       {{- if .Values.grafana.volumes.securityContext }}
       securityContext:

diff --git a/charts/sn-platform/templates/streamnative-console/streamnative-console-initialize.yaml b/charts/sn-platform/templates/streamnative-console/streamnative-console-initialize.yaml
@@ -36,6 +36,14 @@ spec:
       {{- if .Values.global.imagePullSecrets }}
       imagePullSecrets: {{- toYaml .Values.global.imagePullSecrets | nindent 8 }}
       {{- end }}
+      {{- if .Values.streamnative_console.nodeSelector }}
+      nodeSelector: {{- toYaml .Values.streamnative_console.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.streamnative_console.tolerations }}
+      tolerations: {{- toYaml .Values.streamnative_console.tolerations | nindent 8 }}
+      {{- end }}
+      affinity:
+        {{- include "pulsar.antiAffinityRules" (dict "Values" .Values "thisAffinity" .Values.streamnative_console.affinity "Component" .Values.streamnative_console.component "Release" .Release "Chart" .Chart) | indent 8 }}
       {{- if not .Values.istio.enabled }}
       initContainers:
         # This init container will wait for broker to be ready before

diff --git a/charts/sn-platform/templates/streamnative-console/streamnative-console-statefulset.yaml b/charts/sn-platform/templates/streamnative-console/streamnative-console-statefulset.yaml
@@ -67,6 +67,8 @@ spec:
       tolerations:
 {{ toYaml .Values.streamnative_console.tolerations | indent 8 }}
     {{- end }}
+      affinity:
+        {{- include "pulsar.antiAffinityRules" (dict "Values" .Values "thisAffinity" .Values.streamnative_console.affinity "Component" .Values.streamnative_console.component "Release" .Release "Chart" .Chart) | indent 8 }}
       terminationGracePeriodSeconds: {{ .Values.streamnative_console.gracePeriod }}
       {{- if not .Values.istio.enabled }}
       initContainers:

diff --git a/charts/sn-platform/templates/vault/vault-initialize-public-key.yaml b/charts/sn-platform/templates/vault/vault-initialize-public-key.yaml
@@ -41,6 +41,19 @@ spec:
 {{- end }}
     spec:
       serviceAccountName: {{ template "pulsar.vault.serviceAccount" . }}
+      {{- if .Values.global.imagePullSecrets }}
+      imagePullSecrets: {{- toYaml .Values.global.imagePullSecrets | nindent 8 }}
+      {{- end }}
+      {{- if .Values.vault.tolerations }}
+      tolerations:
+      {{ toYaml .Values.vault.tolerations | indent 8 }}
+      {{- end }}
+      {{- if .Values.vault.nodeSelector }}
+      nodeSelector:
+      {{ toYaml .Values.vault.nodeSelector | indent 8 }}
+      {{- end }}
+      affinity:
+        {{- include "pulsar.antiAffinityRules" (dict "Values" .Values "thisAffinity" .Values.vault.affinity "Component" .Values.vault.component "Release" .Release "Chart" .Chart) | indent 8 }}
       containers:
       - name: "{{ template "pulsar.fullname" . }}-{{ .Values.vault.component }}-init"
         image: "{{ .Values.images.vault_init.repository }}:{{ .Values.images.vault_init.tag }}"

diff --git a/charts/sn-platform/templates/vault/vault-initialize.yaml b/charts/sn-platform/templates/vault/vault-initialize.yaml
@@ -44,6 +44,16 @@ spec:
       {{- if .Values.global.imagePullSecrets }}
       imagePullSecrets: {{- toYaml .Values.global.imagePullSecrets | nindent 8 }}
       {{- end }}
+      {{- if .Values.vault.tolerations }}
+      tolerations:
+      {{ toYaml .Values.vault.tolerations | indent 8 }}
+      {{- end }}
+      {{- if .Values.vault.nodeSelector }}
+      nodeSelector:
+      {{ toYaml .Values.vault.nodeSelector | indent 8 }}
+      {{- end }}
+      affinity:
+        {{- include "pulsar.antiAffinityRules" (dict "Values" .Values "thisAffinity" .Values.vault.affinity "Component" .Values.vault.component "Release" .Release "Chart" .Chart) | indent 8 }}
       containers:
       - name: "{{ template "pulsar.fullname" . }}-{{ .Values.vault.component }}-init"
         image: "{{ .Values.images.vault_init.repository }}:{{ .Values.images.vault_init.tag }}"

diff --git a/charts/sn-platform/values.yaml b/charts/sn-platform/values.yaml
@@ -1806,14 +1806,14 @@ prometheus:
     requests:
       memory: 256Mi
       cpu: 0.1
-  # Definition of the serviceAccount used to run brokers.
   affinity:
     anti_affinity: true
     zone_anti_affinity: true
     # Set the anti affinity type. Valid values:
     # requiredDuringSchedulingIgnoredDuringExecution - rules must be met for pod to be scheduled (hard) requires at least one node per replica
     # preferredDuringSchedulingIgnoredDuringExecution - scheduler will try to enforce but not guranentee
     type: preferredDuringSchedulingIgnoredDuringExecution
+  # Definition of the serviceAccount used to run brokers.
   serviceAccount:
     # Specifies whether to use a service account to run this component
     use: true
@@ -1966,6 +1966,13 @@ grafana:
   labels: {}
   annotations: {}
   tolerations: []
+  affinity:
+    anti_affinity: true
+    zone_anti_affinity: true
+    # Set the anti affinity type. Valid values:
+    # requiredDuringSchedulingIgnoredDuringExecution - rules must be met for pod to be scheduled (hard) requires at least one node per replica
+    # preferredDuringSchedulingIgnoredDuringExecution - scheduler will try to enforce but not guranentee
+    type: preferredDuringSchedulingIgnoredDuringExecution
   gracePeriod: 0
   port: 3000
   resources:
@@ -2119,6 +2126,13 @@ streamnative_console:
   podLabels: {}
   podAnnotations: {}
   tolerations: []
+  affinity:
+    anti_affinity: true
+    zone_anti_affinity: true
+    # Set the anti affinity type. Valid values:
+    # requiredDuringSchedulingIgnoredDuringExecution - rules must be met for pod to be scheduled (hard) requires at least one node per replica
+    # preferredDuringSchedulingIgnoredDuringExecution - scheduler will try to enforce but not guranentee
+    type: preferredDuringSchedulingIgnoredDuringExecution
   gracePeriod: 0
   # Resources requests/limits for both init containers and app containers
   # See https://kubernetes.io/docs/concepts/workloads/pods/init-containers/#resources