Skip to content

Commit

Permalink
fix(helm-charts): 修复livenessProbe successThreshold 值的问题 #1540
Browse files Browse the repository at this point in the history
  • Loading branch information
zhangzhw8 committed Oct 26, 2023
1 parent f9eb1c2 commit cbcef89
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .gtmproject.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ github:
repo_name: "blueking-dbm"

# 指定里程碑ID,
milestone_id: "6"
milestone_id: "7"

project:
# 主分支
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ spec:
initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds | default 5}}
periodSeconds: {{ .Values.livenessProbe.periodSeconds | default 30}}
timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds | default 5}}
successThreshold: {{ .Values.livenessProbe.successThreshold | default 6}}
successThreshold: {{ .Values.livenessProbe.successThreshold | default 1}}
failureThreshold: {{ .Values.livenessProbe.failureThreshold | default 1}}
readinessProbe:
httpGet:
Expand All @@ -63,7 +63,7 @@ spec:
initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds | default 5}}
periodSeconds: {{ .Values.readinessProbe.periodSeconds | default 30}}
timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds | default 5}}
successThreshold: {{ .Values.readinessProbe.successThreshold | default 6}}
successThreshold: {{ .Values.readinessProbe.successThreshold | default 1}}
failureThreshold: {{ .Values.readinessProbe.failureThreshold | default 1}}
envFrom:
{{- if .Values.extraEnvVarsCM }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ spec:
initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds | default 5}}
periodSeconds: {{ .Values.livenessProbe.periodSeconds | default 30}}
timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds | default 5}}
successThreshold: {{ .Values.livenessProbe.successThreshold | default 6}}
successThreshold: {{ .Values.livenessProbe.successThreshold | default 1}}
failureThreshold: {{ .Values.livenessProbe.failureThreshold | default 1}}
readinessProbe:
httpGet:
Expand All @@ -60,7 +60,7 @@ spec:
initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds | default 5}}
periodSeconds: {{ .Values.readinessProbe.periodSeconds | default 30}}
timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds | default 5}}
successThreshold: {{ .Values.readinessProbe.successThreshold | default 6}}
successThreshold: {{ .Values.readinessProbe.successThreshold | default 1}}
failureThreshold: {{ .Values.readinessProbe.failureThreshold | default 1}}
volumeMounts:
-
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ spec:
initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds | default 5}}
periodSeconds: {{ .Values.livenessProbe.periodSeconds | default 30}}
timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds | default 5}}
successThreshold: {{ .Values.livenessProbe.successThreshold | default 6}}
successThreshold: {{ .Values.livenessProbe.successThreshold | default 1}}
failureThreshold: {{ .Values.livenessProbe.failureThreshold | default 1}}
readinessProbe:
httpGet:
Expand All @@ -63,7 +63,7 @@ spec:
initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds | default 5}}
periodSeconds: {{ .Values.readinessProbe.periodSeconds | default 30}}
timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds | default 5}}
successThreshold: {{ .Values.readinessProbe.successThreshold | default 6}}
successThreshold: {{ .Values.readinessProbe.successThreshold | default 1}}
failureThreshold: {{ .Values.readinessProbe.failureThreshold | default 1}}
envFrom:
{{- if .Values.extraEnvVarsCM }}
Expand Down
4 changes: 2 additions & 2 deletions helm-charts/bk-dbm/charts/dbconfig/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ spec:
initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds | default 5}}
periodSeconds: {{ .Values.livenessProbe.periodSeconds | default 30}}
timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds | default 5}}
successThreshold: {{ .Values.livenessProbe.successThreshold | default 6}}
successThreshold: {{ .Values.livenessProbe.successThreshold | default 1}}
failureThreshold: {{ .Values.livenessProbe.failureThreshold | default 1}}
readinessProbe:
httpGet:
Expand All @@ -66,7 +66,7 @@ spec:
initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds | default 5}}
periodSeconds: {{ .Values.readinessProbe.periodSeconds | default 30}}
timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds | default 5}}
successThreshold: {{ .Values.readinessProbe.successThreshold | default 6}}
successThreshold: {{ .Values.readinessProbe.successThreshold | default 1}}
failureThreshold: {{ .Values.readinessProbe.failureThreshold | default 1}}
resources:
{{- toYaml .Values.resources | nindent 12 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ spec:
initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds | default 5}}
periodSeconds: {{ .Values.livenessProbe.periodSeconds | default 30}}
timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds | default 5}}
successThreshold: {{ .Values.livenessProbe.successThreshold | default 6}}
successThreshold: {{ .Values.livenessProbe.successThreshold | default 1}}
failureThreshold: {{ .Values.livenessProbe.failureThreshold | default 1}}
readinessProbe:
httpGet:
Expand All @@ -62,7 +62,7 @@ spec:
initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds | default 5}}
periodSeconds: {{ .Values.readinessProbe.periodSeconds | default 30}}
timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds | default 5}}
successThreshold: {{ .Values.readinessProbe.successThreshold | default 6}}
successThreshold: {{ .Values.readinessProbe.successThreshold | default 1}}
failureThreshold: {{ .Values.readinessProbe.failureThreshold | default 1}}
{{- include "dbm.container_env" . | nindent 10 }}
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ spec:
initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds | default 5}}
periodSeconds: {{ .Values.livenessProbe.periodSeconds | default 30}}
timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds | default 5}}
successThreshold: {{ .Values.livenessProbe.successThreshold | default 6}}
successThreshold: {{ .Values.livenessProbe.successThreshold | default 1}}
failureThreshold: {{ .Values.livenessProbe.failureThreshold | default 1}}
readinessProbe:
httpGet:
Expand All @@ -51,7 +51,7 @@ spec:
initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds | default 5}}
periodSeconds: {{ .Values.readinessProbe.periodSeconds | default 30}}
timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds | default 5}}
successThreshold: {{ .Values.readinessProbe.successThreshold | default 6}}
successThreshold: {{ .Values.readinessProbe.successThreshold | default 1}}
failureThreshold: {{ .Values.readinessProbe.failureThreshold | default 1}}
env:
{{- include "dbm.envs" . | trim | nindent 12 }}
Expand Down
4 changes: 2 additions & 2 deletions helm-charts/bk-dbm/charts/dbpriv/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ spec:
initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds | default 5}}
periodSeconds: {{ .Values.livenessProbe.periodSeconds | default 30}}
timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds | default 5}}
successThreshold: {{ .Values.livenessProbe.successThreshold | default 6}}
successThreshold: {{ .Values.livenessProbe.successThreshold | default 1}}
failureThreshold: {{ .Values.livenessProbe.failureThreshold | default 1}}
readinessProbe:
httpGet:
Expand All @@ -62,7 +62,7 @@ spec:
initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds | default 5}}
periodSeconds: {{ .Values.readinessProbe.periodSeconds | default 30}}
timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds | default 5}}
successThreshold: {{ .Values.readinessProbe.successThreshold | default 6}}
successThreshold: {{ .Values.readinessProbe.successThreshold | default 1}}
failureThreshold: {{ .Values.readinessProbe.failureThreshold | default 1}}
resources:
{{- toYaml .Values.resources | nindent 12 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ spec:
initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds | default 5}}
periodSeconds: {{ .Values.livenessProbe.periodSeconds | default 30}}
timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds | default 5}}
successThreshold: {{ .Values.livenessProbe.successThreshold | default 6}}
successThreshold: {{ .Values.livenessProbe.successThreshold | default 1}}
failureThreshold: {{ .Values.livenessProbe.failureThreshold | default 1}}
readinessProbe:
httpGet:
Expand All @@ -53,7 +53,7 @@ spec:
initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds | default 5}}
periodSeconds: {{ .Values.readinessProbe.periodSeconds | default 30}}
timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds | default 5}}
successThreshold: {{ .Values.readinessProbe.successThreshold | default 6}}
successThreshold: {{ .Values.readinessProbe.successThreshold | default 1}}
failureThreshold: {{ .Values.readinessProbe.failureThreshold | default 1}}
resources:
{{- toYaml .Values.resources | nindent 12 }}
Expand Down

0 comments on commit cbcef89

Please sign in to comment.