Skip to content

Commit 4433781

Browse files
YuryHrytsukYuryHrytsuk
committed
update
1 parent b7f9b59 commit 4433781

File tree

10 files changed

+215
-131
lines changed

10 files changed

+215
-131
lines changed

‎charts/Makefile‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,6 @@ helmfile-diff: .check-helmfile-installed helmfile.yaml ## Shows the differences
5252
@set -a; source $(REPO_CONFIG_LOCATION); set +a; \
5353
$(HELMFILE) -f $(REPO_BASE_DIR)/charts/helmfile.yaml diff
5454

55-
.PHONY: helmfile-delete
56-
helmfile-delete: .check-helmfile-installed helmfile.yaml ## Deletes the helmfile configuration
57-
@set -a; source $(REPO_CONFIG_LOCATION); set +a; \
58-
$(HELMFILE) -f $(REPO_BASE_DIR)/charts/helmfile.yaml delete
59-
6055
.PHONY: up
6156
up: helmfile-apply ## Start the stack
6257

‎charts/victoria-metrics-k8s-stack/values.yaml.gotmpl‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
vmsingle:
22
# values documented here https://docs.victoriametrics.com/operator/api/#vmsingle
33
spec:
4-
replicaCount: 2
4+
replicaCount: 1
55
port: "8428" # must be string or field validation fails
66
useStrictSecurity: true
77

@@ -11,14 +11,14 @@ vmsingle:
1111
# runAsUser: 1000
1212
# privileged: false
1313

14-
securityContext: &restrictedSecurityContext
15-
enabled: true
16-
capabilities:
17-
drop: ["ALL"]
18-
readOnlyRootFilesystem: true
19-
allowPrivilegeEscalation: false
20-
seccompProfile:
21-
type: RuntimeDefault
14+
# securityContext: &restrictedSecurityContext
15+
# enabled: true
16+
# capabilities:
17+
# drop: ["ALL"]
18+
# readOnlyRootFilesystem: true
19+
# allowPrivilegeEscalation: false
20+
# seccompProfile:
21+
# type: RuntimeDefault
2222

2323
topologySpreadConstraints:
2424
- maxSkew: 1
@@ -30,6 +30,7 @@ vmsingle:
3030
app: server
3131
app.kubernetes.io/instance: victoria-metrics
3232
app.kubernetes.io/name: victoria-metrics-k8s-stack
33+
3334
# we manage operator and crds in separate chart
3435
# it is easier to delete victoria metrics charts
3536
# separately this way

‎charts/victoria-metrics-stack/Chart.lock‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
dependencies:
2-
- name: victoria-metrics-single
2+
- name: victoria-metrics-k8s-stack
33
repository: https://victoriametrics.github.io/helm-charts/
4-
version: 0.25.2
5-
- name: victoria-metrics-auth
6-
repository: https://victoriametrics.github.io/helm-charts/
7-
version: 0.19.7
8-
- name: victoria-metrics-agent
9-
repository: https://victoriametrics.github.io/helm-charts/
10-
version: 0.26.2
11-
digest: sha256:1b9f1ec96dee105d9ac83f78883e6ee5b8558fad9bac4e41b71d37a69dd5c745
12-
generated: "2025-10-29T15:55:10.919914456+01:00"
4+
version: 0.62.0
5+
digest: sha256:1bf510e968425917526abc435f4f69961cd0a940cc0f59af3a2a4f0107e9e549
6+
generated: "2025-11-01T10:25:28.465780639+01:00"

‎charts/victoria-metrics-stack/Chart.yaml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ version: 0.0.1
2424
appVersion: "1.128.0"
2525

2626
dependencies:
27-
- name: victoria-metrics-single
28-
version: 0.25.2
29-
repository: &victoria-metrics-repo "https://victoriametrics.github.io/helm-charts/"
27+
- name: victoria-metrics-k8s-stack
28+
version: 0.62.0
29+
repository: "https://victoriametrics.github.io/helm-charts/"
3030
condition: victoria-metrics-single.enabled
3131

32-
- name: victoria-metrics-auth
33-
version: 0.19.7
34-
repository: *victoria-metrics-repo
35-
condition: victoria-metrics-auth.enabled
32+
# - name: victoria-metrics-auth
33+
# version: 0.19.7
34+
# repository: *victoria-metrics-repo
35+
# condition: victoria-metrics-auth.enabled
3636

37-
- name: victoria-metrics-agent
38-
version: 0.26.2
39-
repository: *victoria-metrics-repo
40-
condition: victoria-metrics-agent.enabled
37+
# - name: victoria-metrics-agent
38+
# version: 0.26.2
39+
# repository: *victoria-metrics-repo
40+
# condition: victoria-metrics-agent.enabled

charts/victoria-metrics-stack/templates/networkpolicies/vm-agent.yaml renamed to charts/victoria-metrics-stack/networkpolicies/vm-agent.yaml

File renamed without changes.

charts/victoria-metrics-stack/templates/networkpolicies/vm-auth.yaml renamed to charts/victoria-metrics-stack/networkpolicies/vm-auth.yaml

File renamed without changes.

charts/victoria-metrics-stack/templates/networkpolicies/vm-server.yaml renamed to charts/victoria-metrics-stack/networkpolicies/vm-server.yaml

File renamed without changes.

‎charts/victoria-metrics-stack/templates/vmsingle.yaml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{{ range $i, $e := until ( .Values.vmsingle.instanceCount | int ) }}
2+
apiVersion: operator.victoriametrics.com/v1beta1
3+
kind: VMSingle
4+
metadata:
5+
name: vmsingle-{{ $i }}
6+
namespace: {{ $.Release.Namespace }}
7+
labels:
8+
app.kubernetes.io/name: vmsingle
9+
app.kubernetes.io/instance: vmsingle-{{ $i }}
10+
app.kubernetes.io/component: monitoring
11+
app.kubernetes.io/managed-by: Helm
12+
app.kubernetes.io/part-of: {{ $.Release.Name }}
13+
app.kubernetes.io/version: {{ $.Values.vmsingle.spec.image.tag }}
14+
helm.sh/chart: {{ $.Chart.Name }}-{{ $.Chart.Version }}
15+
spec: {{ toYaml $.Values.vmsingle.spec | nindent 2 }}
16+
---
17+
{{- end }}

‎charts/victoria-metrics-stack/values.old.yaml.gotmpl‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
victoria-metrics-single:
2+
enabled: false
3+
4+
server:
5+
replicaCount: 2
6+
7+
service:
8+
servicePort: 8428
9+
10+
mode: statefulSet
11+
12+
# avoid name to long (>63 char) error
13+
fullnameOverride: vm-server
14+
15+
podSecurityContext: &restrictedPodSecurityContext
16+
enabled: true
17+
runAsNonRoot: true
18+
runAsUser: 1000
19+
privileged: false
20+
21+
securityContext: &restrictedSecurityContext
22+
enabled: true
23+
capabilities:
24+
drop: ["ALL"]
25+
readOnlyRootFilesystem: true
26+
allowPrivilegeEscalation: false
27+
seccompProfile:
28+
type: RuntimeDefault
29+
30+
victoria-metrics-agent:
31+
enabled: false
32+
fullnameOverride: vm-agent
33+
34+
config:
35+
global:
36+
scrape_interval: 20s
37+
38+
service:
39+
enabled: true
40+
servicePort: 8429
41+
42+
remoteWrite:
43+
- url: "http://vm-server-0.vm-server.{{ .Release.Namespace }}.svc.cluster.local:8428/api/v1/write"
44+
- url: "http://vm-server-1.vm-server.{{ .Release.Namespace }}.svc.cluster.local:8428/api/v1/write"
45+
46+
podSecurityContext: *restrictedPodSecurityContext
47+
securityContext: *restrictedSecurityContext
48+
49+
resources:
50+
limits:
51+
cpu: 2
52+
memory: 1Gi
53+
requests:
54+
cpu: 0.5
55+
memory: 256Mi
56+
57+
victoria-metrics-auth:
58+
enabled: false
59+
fullnameOverride: vm-auth
60+
61+
service:
62+
servicePort: 8427
63+
64+
ingress:
65+
enabled: true
66+
annotations:
67+
namespace: {{ .Release.Namespace }}
68+
traefik.ingress.kubernetes.io/router.tls: "true"
69+
traefik.ingress.kubernetes.io/router.middlewares: >-
70+
traefik-metrics-path-append-slash@kubernetescrd,
71+
traefik-metrics-strip-prefix@kubernetescrd,
72+
traefik-traefik-basic-auth@kubernetescrd
73+
traefik.ingress.kubernetes.io/router.entrypoints: websecure
74+
hosts:
75+
- name: {{ requiredEnv "K8S_MONITORING_FQDN" }}
76+
path:
77+
- /metrics
78+
port: http
79+
80+
podSecurityContext: *restrictedPodSecurityContext
81+
securityContext: *restrictedSecurityContext
82+
83+
resources:
84+
limits:
85+
cpu: 0.5
86+
memory: 256Mi
87+
requests:
88+
cpu: 100m
89+
memory: 128Mi
90+
91+
config:
92+
unauthorized_user:
93+
url_prefix:
94+
- "http://vm-server-0.vm-server.{{ .Release.Namespace }}.svc.cluster.local:8428/"
95+
- "http://vm-server-1.vm-server.{{ .Release.Namespace }}.svc.cluster.local:8428/"
96+
load_balancing_policy: first_available

‎charts/victoria-metrics-stack/values.yaml.gotmpl‎

Lines changed: 77 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,77 @@
1-
victoria-metrics-single:
2-
enabled: true
3-
4-
server:
5-
replicaCount: 2
6-
7-
service:
8-
servicePort: 8428
9-
10-
mode: statefulSet
11-
12-
# avoid name to long (>63 char) error
13-
fullnameOverride: vm-server
14-
15-
podSecurityContext: &restrictedPodSecurityContext
16-
enabled: true
17-
runAsNonRoot: true
18-
runAsUser: 1000
19-
privileged: false
20-
21-
securityContext: &restrictedSecurityContext
22-
enabled: true
23-
capabilities:
24-
drop: ["ALL"]
25-
readOnlyRootFilesystem: true
26-
allowPrivilegeEscalation: false
27-
seccompProfile:
28-
type: RuntimeDefault
29-
30-
victoria-metrics-agent:
31-
enabled: true
32-
fullnameOverride: vm-agent
33-
34-
config:
35-
global:
36-
scrape_interval: 20s
37-
38-
service:
39-
enabled: true
40-
servicePort: 8429
41-
42-
remoteWrite:
43-
- url: "http://vm-server-0.vm-server.{{ .Release.Namespace }}.svc.cluster.local:8428/api/v1/write"
44-
- url: "http://vm-server-1.vm-server.{{ .Release.Namespace }}.svc.cluster.local:8428/api/v1/write"
45-
46-
podSecurityContext: *restrictedPodSecurityContext
47-
securityContext: *restrictedSecurityContext
48-
49-
resources:
50-
limits:
51-
cpu: 2
52-
memory: 1Gi
53-
requests:
54-
cpu: 0.5
55-
memory: 256Mi
56-
57-
victoria-metrics-auth:
58-
enabled: true
59-
fullnameOverride: vm-auth
60-
61-
service:
62-
servicePort: 8427
63-
64-
ingress:
65-
enabled: true
66-
annotations:
67-
namespace: {{ .Release.Namespace }}
68-
traefik.ingress.kubernetes.io/router.tls: "true"
69-
traefik.ingress.kubernetes.io/router.middlewares: >-
70-
traefik-metrics-path-append-slash@kubernetescrd,
71-
traefik-metrics-strip-prefix@kubernetescrd,
72-
traefik-traefik-basic-auth@kubernetescrd
73-
traefik.ingress.kubernetes.io/router.entrypoints: websecure
74-
hosts:
75-
- name: {{ requiredEnv "K8S_MONITORING_FQDN" }}
76-
path:
77-
- /metrics
78-
port: http
79-
80-
podSecurityContext: *restrictedPodSecurityContext
81-
securityContext: *restrictedSecurityContext
82-
83-
resources:
84-
limits:
85-
cpu: 0.5
86-
memory: 256Mi
87-
requests:
88-
cpu: 100m
89-
memory: 128Mi
90-
91-
config:
92-
unauthorized_user:
93-
url_prefix:
94-
- "http://vm-server-0.vm-server.{{ .Release.Namespace }}.svc.cluster.local:8428/"
95-
- "http://vm-server-1.vm-server.{{ .Release.Namespace }}.svc.cluster.local:8428/"
96-
load_balancing_policy: first_available
1+
vmsingle:
2+
instanceCount: 2 # number of separate / independent vmsingle servers`
3+
spec: # values documented here https://docs.victoriametrics.com/operator/api/#vmsingle
4+
image:
5+
tag: v1.128.0
6+
port: "8428" # must be string or field validation fails
7+
useStrictSecurity: true
8+
podMetadata:
9+
labels:
10+
app.kubernetes.io/name: vmsingle
11+
app.kubernetes.io/part-of: {{ .Release.Name }}
12+
13+
topologySpreadConstraints:
14+
- maxSkew: 1
15+
topologyKey: "kubernetes.io/hostname"
16+
whenUnsatisfiable: DoNotSchedule
17+
# hardcoded due to https://github.com/VictoriaMetrics/helm-charts/issues/2219
18+
labelSelector:
19+
matchLabels:
20+
app.kubernetes.io/name: vmsingle
21+
app.kubernetes.io/part-of: {{ .Release.Name }}
22+
23+
victoria-metrics-k8s-stack:
24+
vmsingle:
25+
enabled: false
26+
27+
# we manage operator and crds in separate chart
28+
# it is easier to delete victoria metrics charts
29+
# separately this way
30+
victoria-metrics-operator:
31+
enabled: false
32+
33+
alertmanager:
34+
enabled: false
35+
36+
vmagent:
37+
enabled: false
38+
39+
vmalert:
40+
enabled: false
41+
42+
grafana:
43+
enabled: false
44+
45+
prometheus-node-exporter:
46+
enabled: false
47+
48+
kube-state-metrics:
49+
enabled: false
50+
51+
kubelet:
52+
enabled: false
53+
54+
kubeApiServer:
55+
enabled: false
56+
57+
kubeControllerManager:
58+
enabled: false
59+
60+
coreDns:
61+
# -- Enabled CoreDNS metrics scraping
62+
enabled: false
63+
64+
kubeEtcd:
65+
enabled: false
66+
67+
kubeScheduler:
68+
# -- Enable KubeScheduler metrics scraping
69+
enabled: false
70+
71+
defaultDashboards:
72+
# -- Enable custom dashboards installation
73+
enabled: false
74+
75+
defaultRules:
76+
# -- Enable custom alerting rules installation
77+
create: false

0 commit comments

Comments
 (0)