Skip to content

Commit 6ff49f8

Browse files
committed
chore(charts): add diagnostic mode
1 parent 07c470d commit 6ff49f8

3 files changed

Lines changed: 35 additions & 15 deletions

File tree

charts/monitor/templates/monitor-grafana-deployment.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
labels:
77
heritage: drycc
88
annotations:
9-
component.drycc.cc/version: {{ .Values.grafana.imageTag }}
9+
component.drycc.cc/version: {{ .Values.imageTag }}
1010
spec:
1111
replicas: 1
1212
strategy:
@@ -32,8 +32,12 @@ spec:
3232
runAsUser: 1001
3333
containers:
3434
- name: drycc-monitor-grafana
35-
image: {{.Values.grafana.imageRegistry}}/{{.Values.grafana.imageOrg}}/grafana:{{.Values.grafana.imageTag}}
36-
imagePullPolicy: {{.Values.grafana.imagePullPolicy}}
35+
image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/grafana:{{.Values.imageTag}}
36+
imagePullPolicy: {{.Values.imagePullPolicy}}
37+
{{- if .Values.diagnosticMode.enabled }}
38+
command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 10 }}
39+
args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 10 }}
40+
{{- end }}
3741
{{- if or (.Values.grafana.limitsCpu) (.Values.grafana.limitsMemory)}}
3842
resources:
3943
limits:

charts/monitor/templates/monitor-telegraf-daemon.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
labels:
66
heritage: drycc
77
annotations:
8-
component.drycc.cc/version: {{ .Values.telegraf.imageTag }}
8+
component.drycc.cc/version: {{ .Values.imageTag }}
99
spec:
1010
selector:
1111
matchLabels:
@@ -26,7 +26,7 @@ spec:
2626
serviceAccount: drycc-monitor-telegraf
2727
initContainers:
2828
- name: drycc-monitor-telegraf-init
29-
image: {{.Values.telegraf.imageRegistry}}/{{.Values.telegraf.imageOrg}}/python-dev:latest
29+
image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/python-dev:latest
3030
imagePullPolicy: {{.Values.imagePullPolicy}}
3131
args:
3232
- netcat
@@ -36,8 +36,12 @@ spec:
3636
{{- include "telegraf.envs" . | indent 8 }}
3737
containers:
3838
- name: drycc-monitor-telegraf
39-
image: {{.Values.telegraf.imageRegistry}}/{{.Values.telegraf.imageOrg}}/telegraf:{{.Values.telegraf.imageTag}}
40-
imagePullPolicy: {{.Values.telegraf.imagePullPolicy}}
39+
image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/telegraf:{{.Values.imageTag}}
40+
imagePullPolicy: {{.Values.imagePullPolicy}}
41+
{{- if .Values.diagnosticMode.enabled }}
42+
command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 10 }}
43+
args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 10 }}
44+
{{- end }}
4145
{{- if or (.Values.telegraf.limitsCpu) (.Values.telegraf.limitsMemory)}}
4246
resources:
4347
limits:

charts/monitor/values.yaml

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,24 @@
1+
imageOrg: "drycc"
2+
imagePullPolicy: "Always"
3+
imageTag: "canary"
4+
imageRegistry: "registry.drycc.cc"
5+
6+
## Enable diagnostic mode
7+
##
8+
diagnosticMode:
9+
## @param diagnosticMode.enabled Enable diagnostic mode (all probes will be disabled and the command will be overridden)
10+
##
11+
enabled: false
12+
## @param diagnosticMode.command Command to override all containers
13+
##
14+
command:
15+
- sleep
16+
## @param diagnosticMode.args Args to override all containers
17+
##
18+
args:
19+
- infinity
20+
121
grafana:
2-
imageOrg: "drycc"
3-
imagePullPolicy: "Always"
4-
imageTag: "canary"
5-
imageRegistry: "registry.drycc.cc"
622
# limitsCpu: "100m"
723
# limitsMemory: "50Mi"
824
nodeAffinityPreset:
@@ -41,10 +57,6 @@ grafana:
4157
passportSecret: ""
4258

4359
telegraf:
44-
imageOrg: "drycc"
45-
imagePullPolicy: "Always"
46-
imageTag: "canary"
47-
imageRegistry: "registry.drycc.cc"
4860
# limitsCpu: "100m"
4961
# limitsMemory: "50Mi"
5062
postgresqlConnection: ""

0 commit comments

Comments
 (0)