Skip to content

Commit 8e19d33

Browse files
duanhongyiduanhongyi
committed
chore(charts): add diagnostic mode
1 parent 2447453 commit 8e19d33

6 files changed

Lines changed: 68 additions & 2 deletions

‎charts/controller/templates/controller-api-deployment.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ spec:
4242
- name: drycc-controller
4343
image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/controller:{{.Values.imageTag}}
4444
imagePullPolicy: {{.Values.imagePullPolicy}}
45+
{{- if .Values.diagnosticMode.enabled }}
46+
command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 10 }}
47+
args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 10 }}
48+
{{- end }}
49+
{{- if not .Values.diagnosticMode.enabled }}
4550
startupProbe:
4651
tcpSocket:
4752
port: 8000
@@ -63,6 +68,7 @@ spec:
6368
initialDelaySeconds: 30
6469
timeoutSeconds: 10
6570
periodSeconds: 5
71+
{{- end }}
6672
ports:
6773
- containerPort: 8000
6874
name: http

‎charts/controller/templates/controller-celery-deloyment.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,15 @@ spec:
4343
- name: drycc-controller-celery-{{$key}}
4444
image: {{$.Values.imageRegistry}}/{{$.Values.imageOrg}}/controller:{{$.Values.imageTag}}
4545
imagePullPolicy: {{$.Values.imagePullPolicy}}
46+
{{- if .Values.diagnosticMode.enabled }}
47+
command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 10 }}
48+
args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 10 }}
49+
{{- else }}
4650
args:
4751
- /bin/bash
4852
- -c
4953
- celery -A api worker -Q {{$key}} --autoscale=32,1 --loglevel=WARNING
54+
{{- end }}
5055
{{- include "controller.limits" $ | indent 8 }}
5156
{{- include "controller.envs" $ | indent 8 }}
5257
{{- end }}

‎charts/controller/templates/controller-cronjob-daily.yaml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,40 +37,65 @@ spec:
3737
- image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/controller:{{.Values.imageTag}}
3838
imagePullPolicy: {{.Values.pull_policy}}
3939
name: drycc-controller-clearsocial
40+
{{- if .Values.diagnosticMode.enabled }}
41+
command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 14 }}
42+
args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 14 }}
43+
{{- else }}
4044
args:
4145
- /bin/bash
4246
- -c
4347
- python -u /workspace/manage.py clearsocial
48+
{{- end }}
4449
{{- include "controller.envs" . | indent 12 }}
4550
- image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/controller:{{.Values.imageTag}}
4651
imagePullPolicy: {{.Values.imagePullPolicy}}
4752
name: drycc-controller-load-db-state-to-k8s
53+
{{- if .Values.diagnosticMode.enabled }}
54+
command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 14 }}
55+
args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 14 }}
56+
{{- else }}
4857
args:
4958
- /bin/bash
5059
- -c
5160
- python /workspace/manage.py load_db_state_to_k8s
61+
{{- end }}
5262
{{- include "controller.envs" . | indent 12 }}
5363
- image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/controller:{{.Values.imageTag}}
5464
imagePullPolicy: {{.Values.pull_policy}}
5565
name: drycc-controller-measure-apps
66+
{{- if .Values.diagnosticMode.enabled }}
67+
command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 14 }}
68+
args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 14 }}
69+
{{- else }}
5670
args:
5771
- /bin/bash
5872
- -c
5973
- python -u /workspace/manage.py measure_apps
74+
{{- end }}
6075
{{- include "controller.envs" . | indent 12 }}
6176
- image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/controller:{{.Values.imageTag}}
6277
imagePullPolicy: {{.Values.pull_policy}}
6378
name: drycc-controller-measure-resources
79+
{{- if .Values.diagnosticMode.enabled }}
80+
command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 14 }}
81+
args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 14 }}
82+
{{- else }}
6483
args:
6584
- /bin/bash
6685
- -c
6786
- python -u /workspace/manage.py measure_resources
87+
{{- end }}
6888
{{- include "controller.envs" . | indent 12 }}
6989
- image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/controller:{{.Values.imageTag}}
7090
imagePullPolicy: {{.Values.pull_policy}}
7191
name: drycc-controller-measure-volumes
92+
{{- if .Values.diagnosticMode.enabled }}
93+
command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 14 }}
94+
args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 14 }}
95+
{{- else }}
7296
args:
7397
- /bin/bash
7498
- -c
7599
- python -u /workspace/manage.py measure_volumes
100+
{{- end }}
76101
{{- include "controller.envs" . | indent 12 }}

‎charts/controller/templates/controller-cronjob-hourly.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,26 @@ spec:
3737
- image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/controller:{{.Values.imageTag}}
3838
imagePullPolicy: {{.Values.pull_policy}}
3939
name: drycc-controller-measure-networks
40+
{{- if .Values.diagnosticMode.enabled }}
41+
command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 14 }}
42+
args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 14 }}
43+
{{- else }}
4044
args:
4145
- /bin/bash
4246
- -c
4347
- python -u /workspace/manage.py measure_networks
48+
{{- end }}
4449
{{- include "controller.envs" . | indent 12 }}
4550
- image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/controller:{{.Values.imageTag}}
4651
imagePullPolicy: {{.Values.pull_policy}}
4752
name: drycc-controller-measure-loadbalancer
53+
{{- if .Values.diagnosticMode.enabled }}
54+
command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 14 }}
55+
args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 14 }}
56+
{{- else }}
4857
args:
4958
- /bin/bash
5059
- -c
5160
- python -u /workspace/manage.py measure_loadbalancers
61+
{{- end }}
5262
{{- include "controller.envs" . | indent 12 }}

‎charts/controller/templates/controller-webhook-deloyment.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ spec:
3232
- name: drycc-controller
3333
image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/controller:{{.Values.imageTag}}
3434
imagePullPolicy: {{.Values.imagePullPolicy}}
35+
{{- if .Values.diagnosticMode.enabled }}
36+
command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 10 }}
37+
args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 10 }}
38+
{{- end }}
39+
{{- if not .Values.diagnosticMode.enabled }}
3540
livenessProbe:
3641
httpGet:
3742
path: /healthz
@@ -50,6 +55,7 @@ spec:
5055
ports:
5156
- containerPort: 8443
5257
name: https
58+
{{- end }}
5359
volumeMounts:
5460
- name: drycc-controller-webhook-cert
5561
mountPath: /etc/controller/webhook/cert

‎charts/controller/values.yaml‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,20 @@ imageOrg: "drycc"
22
imagePullPolicy: "Always"
33
imageTag: "canary"
44
imageRegistry: "registry.drycc.cc"
5-
appImagePullPolicy: "Always"
5+
## Enable diagnostic mode
6+
##
7+
diagnosticMode:
8+
## @param diagnosticMode.enabled Enable diagnostic mode (all probes will be disabled and the command will be overridden)
9+
##
10+
enabled: false
11+
## @param diagnosticMode.command Command to override all containers
12+
##
13+
command:
14+
- sleep
15+
## @param diagnosticMode.args Args to override all containers
16+
##
17+
args:
18+
- infinity
619
# A comma-separated list of URLs to send app release information to
720
# See https://www.drycc.cc/managing-workflow/deploy-hooks/
821
deployHookUrls: ""
@@ -16,7 +29,8 @@ timezone: "UTC"
1629
registrationMode: "admin_only"
1730
# Option to disable ssl verification to connect to k8s api server
1831
k8sApiVerifyTls: "true"
19-
32+
# Set app image pull policy
33+
appImagePullPolicy: "Always"
2034
# Set storageClassName. It is used for application.
2135
appStorageClass: "{{ .Values.storage.csi.storageClassName }}"
2236
# Set runtimeClassName. It is used for application.

0 commit comments

Comments
 (0)