Skip to content

Commit dd99695

Browse files
duanhongyiduanhongyi
committed
chore(charts): all test ok
1 parent ea05628 commit dd99695

12 files changed

Lines changed: 531 additions & 39 deletions

‎charts/victoriametrics/templates/victoriametrics/vmagent/vmagent-clusterrole.yaml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
apiVersion: rbac.authorization.k8s.io/v1
2+
kind: ClusterRole
3+
metadata:
4+
name: {{ printf "%s:drycc-victoriametrics-vmagent" .Release.Namespace | quote }}
5+
labels:
6+
app: drycc-victoriametrics
7+
heritage: drycc
8+
component: drycc-victoriametrics-vmagent
9+
rules:
10+
- apiGroups:
11+
- ""
12+
resources:
13+
- nodes
14+
- nodes/proxy
15+
- nodes/metrics
16+
- services
17+
- endpoints
18+
- pods
19+
- ingresses
20+
- configmaps
21+
verbs:
22+
- get
23+
- list
24+
- watch
25+
- apiGroups:
26+
- "extensions"
27+
- "networking.k8s.io"
28+
resources:
29+
- ingresses/status
30+
- ingresses
31+
verbs:
32+
- get
33+
- list
34+
- watch
35+
- nonResourceURLs:
36+
- "/metrics"
37+
verbs:
38+
- get

‎charts/victoriametrics/templates/victoriametrics/vmagent/vmagent-clusterrolebinding.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
apiVersion: rbac.authorization.k8s.io/v1
2+
kind: ClusterRoleBinding
3+
metadata:
4+
name: {{ printf "%s:drycc-victoriametrics-vmagent" .Release.Namespace | quote }}
5+
labels:
6+
app: drycc-victoriametrics
7+
heritage: drycc
8+
component: drycc-victoriametrics-vmagent
9+
roleRef:
10+
apiGroup: rbac.authorization.k8s.io
11+
kind: ClusterRole
12+
name: {{ printf "%s:drycc-victoriametrics-vmagent" .Release.Namespace | quote }}
13+
subjects:
14+
- kind: ServiceAccount
15+
name: drycc-victoriametrics-vmagent
16+
namespace: {{ .Release.Namespace }}

‎charts/victoriametrics/templates/victoriametrics/vmagent/vmagent-configmap.yaml‎

Lines changed: 370 additions & 0 deletions
Large diffs are not rendered by default.

‎charts/victoriametrics/templates/victoriametrics/vmagent/vmagent-service-account.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
apiVersion: v1
2+
kind: ServiceAccount
3+
metadata:
4+
name: drycc-victoriametrics-vmagent
5+
labels:
6+
heritage: drycc

‎charts/victoriametrics/templates/victoriametrics/vmagent/vmagent-statefulset.yaml‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,16 @@ spec:
2626
podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.vmagent.podAffinityPreset.type "component" "" "extraMatchLabels" .Values.vmagent.podAffinityPreset.extraMatchLabels "topologyKey" "" "context" $) | nindent 10 }}
2727
podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.vmagent.podAntiAffinityPreset.type "component" "" "extraMatchLabels" .Values.vmagent.podAntiAffinityPreset.extraMatchLabels "topologyKey" "" "context" $) | nindent 10 }}
2828
nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.vmagent.nodeAffinityPreset.type "key" .Values.vmagent.nodeAffinityPreset.key "values" .Values.vmagent.nodeAffinityPreset.values ) | nindent 10 }}
29+
serviceAccount: drycc-victoriametrics-vmagent
30+
initContainers:
31+
- name: drycc-victoriametrics-vmstorage-init
32+
image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/python-dev:latest
33+
imagePullPolicy: {{.Values.imagePullPolicy}}
34+
args:
35+
- netcat
36+
- -v
37+
- -a
38+
- {{ printf "drycc-victoriametrics-vminsert.%s.svc.%s:8480" $.Release.Namespace $.Values.global.clusterDomain }}
2939
containers:
3040
- name: drycc-victoriametrics-vmagent
3141
image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/victoriametrics:{{.Values.imageTag}}
@@ -39,6 +49,7 @@ spec:
3949
- --remoteWrite.url={{ printf "http://drycc-victoriametrics-vminsert.%s.svc.%s:8480/insert/0/prometheus/api/v1/write" $.Release.Namespace $.Values.global.clusterDomain }}
4050
- --remoteWrite.tmpDataPath=/data
4151
- --httpListenAddr=:8429
52+
- --promscrape.config=/opt/drycc/victoriametrics/config/prometheus.yaml
4253
- --promscrape.cluster.membersCount={{.Values.vmagent.replicas}}
4354
- --promscrape.cluster.memberNum=$(SHARD_NUM)
4455
{{- if .Values.vmagent.extraArgs }}
@@ -55,7 +66,7 @@ spec:
5566
- name: SHARD_NUM
5667
valueFrom:
5768
fieldRef:
58-
fieldPath: metadata.annotations['apps.kubernetes.io/pod-index']
69+
fieldPath: metadata.labels['apps.kubernetes.io/pod-index']
5970
livenessProbe:
6071
tcpSocket:
6172
port: 8429
@@ -70,6 +81,12 @@ spec:
7081
volumeMounts:
7182
- name: empty-dir
7283
mountPath: /data
84+
- name: victoriametrics-vmagent-config
85+
readOnly: true
86+
mountPath: /opt/drycc/victoriametrics/config
7387
volumes:
7488
- name: empty-dir
7589
emptyDir: {}
90+
- name: victoriametrics-vmagent-config
91+
configMap:
92+
name: victoriametrics-vmagent-config

‎charts/victoriametrics/templates/victoriametrics/vminsert/vminsert-deployment.yaml‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
{{- $replicas := .Values.vmstorage.replicas | int -}}
2+
{{- $endpoints := list -}}
3+
{{- range $i := until $replicas -}}
4+
{{- $endpoint := printf "drycc-victoriametrics-vmstorage-%d.drycc-victoriametrics-vmstorage.%s.svc.%s:8400" $i $.Release.Namespace $.Values.global.clusterDomain -}}
5+
{{- $endpoints = append $endpoints $endpoint -}}
6+
{{- end -}}
7+
{{- $storageNodes := join "," $endpoints -}}
18
apiVersion: apps/v1
29
kind: Deployment
310
metadata:
@@ -22,6 +29,15 @@ spec:
2229
podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.vminsert.podAffinityPreset.type "component" "" "extraMatchLabels" .Values.vminsert.podAffinityPreset.extraMatchLabels "topologyKey" "" "context" $) | nindent 10 }}
2330
podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.vminsert.podAntiAffinityPreset.type "component" "" "extraMatchLabels" .Values.vminsert.podAntiAffinityPreset.extraMatchLabels "topologyKey" "" "context" $) | nindent 10 }}
2431
nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.vminsert.nodeAffinityPreset.type "key" .Values.vminsert.nodeAffinityPreset.key "values" .Values.vminsert.nodeAffinityPreset.values ) | nindent 10 }}
32+
initContainers:
33+
- name: drycc-victoriametrics-vminsert-init
34+
image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/python-dev:latest
35+
imagePullPolicy: {{.Values.imagePullPolicy}}
36+
args:
37+
- netcat
38+
- -v
39+
- -a
40+
- {{ $storageNodes }}
2541
containers:
2642
- name: drycc-victoriametrics-vminsert
2743
image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/victoriametrics:{{.Values.imageTag}}
@@ -31,8 +47,9 @@ spec:
3147
args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 10 }}
3248
{{- else }}
3349
args:
50+
- vminsert
3451
- --httpListenAddr=:8480
35-
- --storageNode={{ range $i := until (.Values.vmstorage.replicas | int) }}{{ if $i }},{{ end }}drycc-victoriametrics-vmstorage-{{$i}}.drycc-victoriametrics-vmstorage.{{$.Release.Namespace}}.svc.{{$.Values.global.clusterDomain}}:8400{{ end }}
52+
- --storageNode={{ $storageNodes }}
3653
{{- if .Values.vminsert.extraArgs }}
3754
{{- include "common.tplvalues.render" (dict "value" .Values.vminsert.extraArgs "context" $) | nindent 8 }}
3855
{{- end }}

‎charts/victoriametrics/templates/victoriametrics/vminsert/vminsert-svc.yaml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,15 @@ metadata:
66
prometheus.io/scrape: "true"
77
prometheus.io/port: "8480"
88
prometheus.io/path: "/metrics"
9+
labels:
10+
app: drycc-victoriametrics
11+
heritage: drycc
12+
component: drycc-victoriametrics-vminsert
913
spec:
10-
type: ClusterIP
14+
clusterIP: None
1115
selector:
12-
app: drycc-victoriametrics-vminsert
16+
app: drycc-victoriametrics
17+
component: drycc-victoriametrics-vminsert
1318
ports:
1419
- name: http
1520
port: 8480

‎charts/victoriametrics/templates/victoriametrics/vmselect/vmselect-deployment.yaml‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
{{- $replicas := .Values.vmstorage.replicas | int -}}
2+
{{- $endpoints := list -}}
3+
{{- range $i := until $replicas -}}
4+
{{- $endpoint := printf "drycc-victoriametrics-vmstorage-%d.drycc-victoriametrics-vmstorage.%s.svc.%s:8401" $i $.Release.Namespace $.Values.global.clusterDomain -}}
5+
{{- $endpoints = append $endpoints $endpoint -}}
6+
{{- end -}}
7+
{{- $storageNodes := join "," $endpoints -}}
18
apiVersion: apps/v1
29
kind: Deployment
310
metadata:
@@ -22,6 +29,15 @@ spec:
2229
podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.vmselect.podAffinityPreset.type "component" "" "extraMatchLabels" .Values.vmselect.podAffinityPreset.extraMatchLabels "topologyKey" "" "context" $) | nindent 10 }}
2330
podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.vmselect.podAntiAffinityPreset.type "component" "" "extraMatchLabels" .Values.vmselect.podAntiAffinityPreset.extraMatchLabels "topologyKey" "" "context" $) | nindent 10 }}
2431
nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.vmselect.nodeAffinityPreset.type "key" .Values.vmselect.nodeAffinityPreset.key "values" .Values.vmselect.nodeAffinityPreset.values ) | nindent 10 }}
32+
initContainers:
33+
- name: drycc-victoriametrics-vmselect-init
34+
image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/python-dev:latest
35+
imagePullPolicy: {{.Values.imagePullPolicy}}
36+
args:
37+
- netcat
38+
- -v
39+
- -a
40+
- {{ $storageNodes }}
2541
containers:
2642
- name: drycc-victoriametrics-vmselect
2743
image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/victoriametrics:{{.Values.imageTag}}
@@ -32,7 +48,7 @@ spec:
3248
{{- else }}
3349
args:
3450
- vmselect
35-
- --storageNode={{ range $i := until (.Values.vmstorage.replicas | int) }}{{ if $i }},{{ end }}drycc-victoriametrics-vmstorage-{{$i}}.drycc-victoriametrics-vmstorage.{{$.Release.Namespace}}.svc.{{$.Values.global.clusterDomain}}:8401{{ end }}
51+
- --storageNode={{ $storageNodes }}
3652
- --httpListenAddr=:8481
3753
- --cacheDataPath=/cache
3854
{{- if .Values.vmselect.extraArgs }}

‎charts/victoriametrics/templates/victoriametrics/vmselect/vmselect-svc.yaml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@ kind: Service
33
metadata:
44
name: drycc-victoriametrics-vmselect
55
labels:
6-
app: drycc-victoriametrics-vmselect
6+
app: drycc-victoriametrics
77
heritage: drycc
8+
component: drycc-victoriametrics-vmselect
89
spec:
10+
clusterIP: None
911
ports:
1012
- port: 8481
1113
name: http
1214
targetPort: 8481
1315
selector:
14-
app: drycc-victoriametrics-vmselect
16+
app: drycc-victoriametrics
17+
component: drycc-victoriametrics-vmselect

‎charts/victoriametrics/templates/victoriametrics/vmstorage/vmstorage-statefulset.yaml‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ metadata:
77
heritage: drycc
88
component: drycc-victoriametrics-vmstorage
99
spec:
10+
serviceName: drycc-victoriametrics-vmstorage
1011
replicas: {{ .Values.vmstorage.replicas }}
1112
selector:
1213
matchLabels:
@@ -33,12 +34,12 @@ spec:
3334
args:
3435
- vmstorage
3536
- --httpListenAddr=:8482
36-
- --storageDataPath=/data/storage
3737
{{- if .Values.vmstorage.temporary.enabled }}
3838
- --temporaryDataPath=/data/temporary
3939
{{- end }}
40-
- --vminsertAddr=8400
41-
- --vmselectAddr=8401
40+
- --storageDataPath=/data/storage
41+
- --vminsertAddr=:8400
42+
- --vmselectAddr=:8401
4243
{{- if .Values.vmstorage.extraArgs }}
4344
{{- include "common.tplvalues.render" (dict "value" .Values.vmstorage.extraArgs "context" $) | nindent 8 }}
4445
{{- end }}
@@ -62,49 +63,49 @@ spec:
6263
httpGet:
6364
path: /health
6465
port: 8482
65-
{{- if or .Values.vmstorage.storage.enabled .Values.vmstorage.temporary.enabled }}
66+
{{- if or .Values.vmstorage.temporary.enabled .Values.vmstorage.persistence.enabled }}
6667
volumeMounts:
67-
{{- if .Values.vmstorage.storage.enabled }}
68-
- name: victoriametrics-vmstorage-storage
69-
mountPath: /data/storage
70-
{{- end }}
7168
{{- if .Values.vmstorage.temporary.enabled }}
7269
- name: victoriametrics-vmstorage-temporary
7370
mountPath: /data/temporary
7471
{{- end }}
72+
{{- if .Values.vmstorage.persistence.enabled }}
73+
- name: victoriametrics-vmstorage-storage
74+
mountPath: /data/storage
75+
{{- end }}
7576
{{- end }}
76-
{{- if or .Values.vmstorage.storage.enabled .Values.vmstorage.temporary.enabled }}
77+
{{- if or .Values.vmstorage.temporary.enabled .Values.vmstorage.persistence.enabled }}
7778
volumeClaimTemplates:
78-
{{- if .Values.vmstorage.storage.enabled }}
79+
{{- if .Values.vmstorage.temporary.enabled }}
7980
- metadata:
80-
name: victoriametrics-vmstorage-storage
81+
name: victoriametrics-vmstorage-temporary
8182
spec:
8283
accessModes: [ "ReadWriteOnce" ]
83-
{{- if .Values.vmstorage.storage.storageClass }}
84-
{{- if (eq "-" .Values.vmstorage.storage.storageClass) }}
84+
{{- if .Values.vmstorage.temporary.storageClass }}
85+
{{- if (eq "-" .Values.vmstorage.temporary.storageClass) }}
8586
storageClassName: ""
8687
{{- else }}
87-
storageClassName: "{{ .Values.vmstorage.storage.storageClass }}"
88+
storageClassName: "{{ .Values.vmstorage.temporary.storageClass }}"
8889
{{- end }}
8990
{{- end }}
9091
resources:
9192
requests:
92-
storage: {{ .Values.vmstorage.storage.size | quote }}
93+
storage: {{ .Values.vmstorage.temporary.size | quote }}
9394
{{- end }}
94-
{{- if .Values.vmstorage.temporary.enabled }}
95+
{{- if .Values.vmstorage.persistence.enabled }}
9596
- metadata:
96-
name: victoriametrics-vmstorage-temporary
97+
name: victoriametrics-vmstorage-storage
9798
spec:
9899
accessModes: [ "ReadWriteOnce" ]
99-
{{- if .Values.vmstorage.temporary.storageClass }}
100-
{{- if (eq "-" .Values.vmstorage.temporary.storageClass) }}
100+
{{- if .Values.vmstorage.persistence.storageClass }}
101+
{{- if (eq "-" .Values.vmstorage.persistence.storageClass) }}
101102
storageClassName: ""
102103
{{- else }}
103-
storageClassName: "{{ .Values.vmstorage.temporary.storageClass }}"
104+
storageClassName: "{{ .Values.vmstorage.persistence.storageClass }}"
104105
{{- end }}
105106
{{- end }}
106107
resources:
107108
requests:
108-
storage: {{ .Values.vmstorage.temporary.size | quote }}
109+
storage: {{ .Values.vmstorage.persistence.size | quote }}
109110
{{- end }}
110111
{{- end }}

0 commit comments

Comments
 (0)