Skip to content

Commit cb3dfac

Browse files
committed
feat(nsqd): add stateless nsqd cluster support
1 parent 5f2daf1 commit cb3dfac

25 files changed

Lines changed: 157 additions & 163 deletions

charts/monitor/charts/grafana/Chart.yaml

Lines changed: 0 additions & 7 deletions
This file was deleted.

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

Lines changed: 0 additions & 24 deletions
This file was deleted.

charts/monitor/charts/influxdb/Chart.yaml

Lines changed: 0 additions & 7 deletions
This file was deleted.

charts/monitor/charts/influxdb/templates/monitor-influxdb-creds-secret.yaml

Lines changed: 0 additions & 14 deletions
This file was deleted.

charts/monitor/charts/influxdb/templates/monitor-influxdb-pvc.yaml

Lines changed: 0 additions & 24 deletions
This file was deleted.

charts/monitor/charts/telegraf/Chart.yaml

Lines changed: 0 additions & 7 deletions
This file was deleted.

charts/monitor/charts/grafana/templates/monitor-grafana-certificate.yaml renamed to charts/monitor/templates/monitor-grafana-certificate.yaml

File renamed without changes.

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

Lines changed: 12 additions & 12 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.docker_tag }}
9+
component.drycc.cc/version: {{ .Values.monitor.grafana.docker_tag }}
1010
spec:
1111
replicas: 1
1212
strategy:
@@ -24,16 +24,16 @@ spec:
2424
spec:
2525
containers:
2626
- name: drycc-monitor-grafana
27-
image: {{.Values.docker_registry}}{{.Values.org}}/grafana:{{.Values.docker_tag}}
28-
imagePullPolicy: {{.Values.pull_policy}}
29-
{{- if or (.Values.limits_cpu) (.Values.limits_memory)}}
27+
image: {{.Values.monitor.grafana.docker_registry}}{{.Values.monitor.grafana.org}}/grafana:{{.Values.monitor.grafana.docker_tag}}
28+
imagePullPolicy: {{.Values.monitor.grafana.pull_policy}}
29+
{{- if or (.Values.monitor.grafana.limits_cpu) (.Values.monitor.grafana.limits_memory)}}
3030
resources:
3131
limits:
32-
{{- if (.Values.limits_cpu) }}
33-
cpu: {{.Values.limits_cpu}}
32+
{{- if (.Values.monitor.grafana.limits_cpu) }}
33+
cpu: {{.Values.monitor.grafana.limits_cpu}}
3434
{{- end}}
35-
{{- if (.Values.limits_memory) }}
36-
memory: {{.Values.limits_memory}}
35+
{{- if (.Values.monitor.grafana.limits_memory) }}
36+
memory: {{.Values.monitor.grafana.limits_memory}}
3737
{{- end}}
3838
{{- end}}
3939
env:
@@ -65,15 +65,15 @@ spec:
6565
- name: "BIND_PORT"
6666
value: "3500"
6767
- name: "DEFAULT_USER"
68-
value: {{.Values.user}}
68+
value: {{.Values.monitor.grafana.user}}
6969
- name: "DEFAULT_USER_PASSWORD"
70-
value: {{.Values.password}}
70+
value: {{.Values.monitor.grafana.password}}
7171
- name: "ALLOW_SIGN_UP"
72-
value: {{.Values.allow_sign_up | quote}}
72+
value: {{.Values.monitor.grafana.allow_sign_up | quote}}
7373
ports:
7474
- containerPort: 3500
7575
name: ui
76-
{{- if .Values.persistence.enabled }}
76+
{{- if .Values.monitor.grafana.persistence.enabled }}
7777
volumeMounts:
7878
- name: grafana-data
7979
mountPath: /var/lib/grafana

charts/monitor/charts/grafana/templates/monitor-grafana-ingress.yaml renamed to charts/monitor/templates/monitor-grafana-ingress.yaml

File renamed without changes.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{{- if .Values.monitor.grafana.persistence.enabled }}
2+
kind: PersistentVolumeClaim
3+
apiVersion: v1
4+
metadata:
5+
name: drycc-monitor-grafana
6+
labels:
7+
heritage: drycc
8+
spec:
9+
accessModes:
10+
- {{ .Values.monitor.grafana.persistence.accessMode | quote }}
11+
resources:
12+
requests:
13+
storage: {{ .Values.monitor.grafana.persistence.size | quote }}
14+
{{- if .Values.monitor.grafana.persistence.storageClass }}
15+
{{- if (eq "-" .Values.monitor.grafana.persistence.storageClass) }}
16+
storageClassName: ""
17+
{{- else }}
18+
storageClassName: "{{ .Values.monitor.grafana.persistence.storageClass }}"
19+
{{- end }}
20+
{{- end }}
21+
{{- if .Values.monitor.grafana.persistence.volumeName }}
22+
volumeName: "{{ .Values.monitor.grafana.persistence.volumeName }}"
23+
{{- end }}
24+
{{- end }}

0 commit comments

Comments
 (0)