icecheng/freeleaps-ops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'fix: disable probes for notification service' (#106) from icecheng/feature into master

Browse Source 
Reviewed-on: https://gitea.freeleaps.mathmast.com/freeleaps/freeleaps-ops/pulls/106
This commit is contained in:
icecheng 2025-09-23 07:55:07 +00:00
commit a54f4cc7b8
2 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freeleaps/helm-pkg/3rd/rabbitmq/values.alpha.yaml
View File

@ -186,7 +186,7 @@ extraConfiguration: |-
disk_free_limit.absolute = 50MB disk_free_limit.absolute = 50MB
replicaCount: 1 replicaCount: 1
updateStrategy: updateStrategy:
type: RollingUpdate type: Recreate
podSecurityContext: podSecurityContext:
enabled: true enabled: true
fsGroupChangePolicy: Always fsGroupChangePolicy: Always

94
freeleaps/helm-pkg/notification/templates/notification/deployment.yaml
View File

@ -53,53 +53,53 @@ spec:
resources: resources:
{{- toYaml .Values.notification.resources | nindent 12 }} {{- toYaml .Values.notification.resources | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.notification.probes }} # {{- if .Values.notification.probes }}
{{- if and (.Values.notification.probes.liveness) (eq .Values.notification.probes.liveness.type "httpGet") }} # {{- if and (.Values.notification.probes.liveness) (eq .Values.notification.probes.liveness.type "httpGet") }}
livenessProbe: # livenessProbe:
httpGet: # httpGet:
path: {{ .Values.notification.probes.liveness.config.path }} # path: {{ .Values.notification.probes.liveness.config.path }}
port: {{ .Values.notification.probes.liveness.config.port }} # port: {{ .Values.notification.probes.liveness.config.port }}
{{- if .Values.notification.probes.liveness.config.initialDelaySeconds }} # {{- if .Values.notification.probes.liveness.config.initialDelaySeconds }}
initialDelaySeconds: {{ .Values.notification.probes.liveness.config.initialDelaySeconds }} # initialDelaySeconds: {{ .Values.notification.probes.liveness.config.initialDelaySeconds }}
{{- end }} # {{- end }}
{{- if .Values.notification.probes.liveness.config.periodSeconds }} # {{- if .Values.notification.probes.liveness.config.periodSeconds }}
periodSeconds: {{ .Values.notification.probes.liveness.config.periodSeconds }} # periodSeconds: {{ .Values.notification.probes.liveness.config.periodSeconds }}
{{- end }} # {{- end }}
{{- if .Values.notification.probes.liveness.config.timeoutSeconds }} # {{- if .Values.notification.probes.liveness.config.timeoutSeconds }}
timeoutSeconds: {{ .Values.notification.probes.liveness.config.timeoutSeconds }} # timeoutSeconds: {{ .Values.notification.probes.liveness.config.timeoutSeconds }}
{{- end }} # {{- end }}
{{- if .Values.notification.probes.liveness.config.successThreshold }} # {{- if .Values.notification.probes.liveness.config.successThreshold }}
successThreshold: {{ .Values.notification.probes.liveness.config.successThreshold }} # successThreshold: {{ .Values.notification.probes.liveness.config.successThreshold }}
{{- end }} # {{- end }}
{{- if .Values.notification.probes.liveness.config.failureThreshold }} # {{- if .Values.notification.probes.liveness.config.failureThreshold }}
failureThreshold: {{ .Values.notification.probes.liveness.config.failureThreshold }} # failureThreshold: {{ .Values.notification.probes.liveness.config.failureThreshold }}
{{- end }} # {{- end }}
{{- if .Values.notification.probes.liveness.config.terminationGracePeriodSeconds }} # {{- if .Values.notification.probes.liveness.config.terminationGracePeriodSeconds }}
terminationGracePeriodSeconds: {{ .Values.notification.probes.liveness.config.terminationGracePeriodSeconds }} # terminationGracePeriodSeconds: {{ .Values.notification.probes.liveness.config.terminationGracePeriodSeconds }}
{{- end }} # {{- end }}
{{- end }} # {{- end }}
{{- if and (.Values.notification.probes.readiness) (eq .Values.notification.probes.readiness.type "httpGet") }} # {{- if and (.Values.notification.probes.readiness) (eq .Values.notification.probes.readiness.type "httpGet") }}
readinessProbe: # readinessProbe:
httpGet: # httpGet:
path: {{ .Values.notification.probes.readiness.config.path }} # path: {{ .Values.notification.probes.readiness.config.path }}
port: {{ .Values.notification.probes.readiness.config.port }} # port: {{ .Values.notification.probes.readiness.config.port }}
{{- if .Values.notification.probes.readiness.config.initialDelaySeconds }} # {{- if .Values.notification.probes.readiness.config.initialDelaySeconds }}
initialDelaySeconds: {{ .Values.notification.probes.readiness.config.initialDelaySeconds }} # initialDelaySeconds: {{ .Values.notification.probes.readiness.config.initialDelaySeconds }}
{{- end }} # {{- end }}
{{- if .Values.notification.probes.readiness.config.periodSeconds }} # {{- if .Values.notification.probes.readiness.config.periodSeconds }}
periodSeconds: {{ .Values.notification.probes.readiness.config.periodSeconds }} # periodSeconds: {{ .Values.notification.probes.readiness.config.periodSeconds }}
{{- end }} # {{- end }}
{{- if .Values.notification.probes.readiness.config.timeoutSeconds }} # {{- if .Values.notification.probes.readiness.config.timeoutSeconds }}
timeoutSeconds: {{ .Values.notification.probes.readiness.config.timeoutSeconds }} # timeoutSeconds: {{ .Values.notification.probes.readiness.config.timeoutSeconds }}
{{- end }} # {{- end }}
{{- if .Values.notification.probes.readiness.config.successThreshold }} # {{- if .Values.notification.probes.readiness.config.successThreshold }}
successThreshold: {{ .Values.notification.probes.readiness.config.successThreshold }} # successThreshold: {{ .Values.notification.probes.readiness.config.successThreshold }}
{{- end }} # {{- end }}
{{- if .Values.notification.probes.readiness.config.failureThreshold }} # {{- if .Values.notification.probes.readiness.config.failureThreshold }}
failureThreshold: {{ .Values.notification.probes.readiness.config.failureThreshold }} # failureThreshold: {{ .Values.notification.probes.readiness.config.failureThreshold }}
{{- end }} # {{- end }}
{{- end }} # {{- end }}
{{- end}} # {{- end}}
env: env:
{{- range $key, $value := .Values.notification.configs }} {{- range $key, $value := .Values.notification.configs }}
{{- if not (or (eq $key "mongodbUri") (eq $key "rabbitmqPassword") (eq $key "secretKey") (eq $key "sendgridApiKey") (eq $key "twilioAccountSid") (eq $key "twilioAuthToken")) }} {{- if not (or (eq $key "mongodbUri") (eq $key "rabbitmqPassword") (eq $key "secretKey") (eq $key "sendgridApiKey") (eq $key "twilioAccountSid") (eq $key "twilioAuthToken")) }}