Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: support some missing configs on console, vault and grafana components #1193

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix: support some missing configs on console, vault and grafana components #1193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
26e8188
fix: support some missting configs
ericsyh Nov 26, 2024
50cccb6
update
ericsyh Nov 26, 2024
d559dee
apply on sn-platform
ericsyh Nov 26, 2024
53402f7
support vault init jobs
ericsyh Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions charts/sn-platform-slim/templates/grafana/grafana-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,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 }}"
Expand Down
8 changes: 8 additions & 0 deletions charts/sn-platform-slim/templates/streamnative-console/streamnative-console-initialize.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,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
Expand Down
2 changes: 2 additions & 0 deletions charts/sn-platform-slim/templates/streamnative-console/streamnative-console-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,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:
Expand Down
16 changes: 15 additions & 1 deletion charts/sn-platform-slim/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1703,14 +1703,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
Expand Down Expand Up @@ -1863,6 +1863,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
Expand Down Expand Up @@ -2018,6 +2025,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
Expand Down
2 changes: 2 additions & 0 deletions charts/sn-platform/templates/grafana/grafana-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,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:
Expand Down
9 changes: 9 additions & 0 deletions charts/sn-platform/templates/streamnative-console/streamnative-console-initialize.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,15 @@ 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 }}
{{- if not .Values.istio.enabled }}
initContainers:
# This init container will wait for broker to be ready before
Expand Down
2 changes: 2 additions & 0 deletions charts/sn-platform/templates/streamnative-console/streamnative-console-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,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:
Expand Down
13 changes: 13 additions & 0 deletions charts/sn-platform/templates/vault/vault-initialize-public-key.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,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 }}"
Expand Down
10 changes: 10 additions & 0 deletions charts/sn-platform/templates/vault/vault-initialize.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,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 }}"
Expand Down
16 changes: 15 additions & 1 deletion charts/sn-platform/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1784,14 +1784,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
Expand Down Expand Up @@ -1944,6 +1944,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:
Expand Down Expand Up @@ -2097,6 +2104,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
Expand Down
Loading