Skip to content

Commit da81009

Browse files
committed
[monitoring] add vpa for users k8s clusters
Signed-off-by: kklinch0 <[email protected]>
1 parent 8f575c4 commit da81009

6 files changed

Lines changed: 122 additions & 4 deletions

File tree

‎packages/apps/kubernetes/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ type: application
1616
# This is the chart version. This version number should be incremented each time you make changes
1717
# to the chart and its templates, including the app version.
1818
# Versions are expected to follow Semantic Versioning (https://semver.org/)
19-
version: 0.17.1
19+
version: 0.18.0
2020

2121
# This is the version number of the application being deployed. This version number should be
2222
# incremented each time you make changes to the application. Versions are not expected to

‎packages/apps/kubernetes/templates/helmreleases/monitoring-agents.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ spec:
3838
- name: {{ .Release.Name }}
3939
namespace: {{ .Release.Namespace }}
4040
{{- end }}
41-
- name: {{ .Release.Name }}-cilium
42-
namespace: {{ .Release.Namespace }}
4341
- name: {{ .Release.Name }}-cozy-victoria-metrics-operator
4442
namespace: {{ .Release.Namespace }}
43+
- name: {{ .Release.Name }}-vertical-pod-autoscaler-crds
44+
namespace: {{ .Release.Namespace }}
4545
values:
4646
vmagent:
4747
externalLabels:
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{{- if .Values.addons.monitoringAgents.enabled }}
2+
apiVersion: helm.toolkit.fluxcd.io/v2
3+
kind: HelmRelease
4+
metadata:
5+
name: {{ .Release.Name }}-vertical-pod-autoscaler-crds
6+
labels:
7+
cozystack.io/repository: system
8+
coztstack.io/target-cluster-name: {{ .Release.Name }}
9+
spec:
10+
interval: 5m
11+
releaseName: vertical-pod-autoscaler-crds
12+
chart:
13+
spec:
14+
chart: cozy-vertical-pod-autoscaler-crds
15+
reconcileStrategy: Revision
16+
sourceRef:
17+
kind: HelmRepository
18+
name: cozystack-system
19+
namespace: cozy-system
20+
kubeConfig:
21+
secretRef:
22+
name: {{ .Release.Name }}-admin-kubeconfig
23+
key: super-admin.svc
24+
targetNamespace: cozy-vertical-pod-autoscaler-crds
25+
storageNamespace: cozy-vertical-pod-autoscaler-crds
26+
install:
27+
createNamespace: true
28+
remediation:
29+
retries: -1
30+
upgrade:
31+
remediation:
32+
retries: -1
33+
34+
dependsOn:
35+
{{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }}
36+
- name: {{ .Release.Name }}
37+
namespace: {{ .Release.Namespace }}
38+
{{- end }}
39+
- name: {{ .Release.Name }}-cilium
40+
namespace: {{ .Release.Namespace }}
41+
{{- end }}
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
{{- $myNS := lookup "v1" "Namespace" "" .Release.Namespace }}
2+
{{- $targetTenant := index $myNS.metadata.annotations "namespace.cozystack.io/monitoring" }}
3+
{{- if .Values.addons.monitoringAgents.enabled }}
4+
apiVersion: helm.toolkit.fluxcd.io/v2
5+
kind: HelmRelease
6+
metadata:
7+
name: {{ .Release.Name }}-vertical-pod-autoscaler
8+
labels:
9+
cozystack.io/repository: system
10+
coztstack.io/target-cluster-name: {{ .Release.Name }}
11+
spec:
12+
interval: 5m
13+
releaseName: vertical-pod-autoscaler
14+
chart:
15+
spec:
16+
chart: cozy-vertical-pod-autoscaler
17+
reconcileStrategy: Revision
18+
sourceRef:
19+
kind: HelmRepository
20+
name: cozystack-system
21+
namespace: cozy-system
22+
kubeConfig:
23+
secretRef:
24+
name: {{ .Release.Name }}-admin-kubeconfig
25+
key: super-admin.svc
26+
targetNamespace: cozy-vertical-pod-autoscaler
27+
storageNamespace: cozy-vertical-pod-autoscaler
28+
install:
29+
createNamespace: true
30+
remediation:
31+
retries: -1
32+
upgrade:
33+
remediation:
34+
retries: -1
35+
values:
36+
vertical-pod-autoscaler:
37+
recommender:
38+
extraArgs:
39+
container-name-label: container
40+
container-namespace-label: namespace
41+
container-pod-name-label: pod
42+
storage: prometheus
43+
memory-saver: true
44+
pod-label-prefix: label_
45+
metric-for-pod-labels: kube_pod_labels{job="kube-state-metrics", tenant="{{ .Release.Namespace }}", cluster="{{ .Release.Name }}"}[8d]
46+
pod-name-label: pod
47+
pod-namespace-label: namespace
48+
prometheus-address: http://vmselect-shortterm.{{ $targetTenant }}.svc.cozy.local:8481/select/0/prometheus/
49+
prometheus-cadvisor-job-name: cadvisor
50+
resources:
51+
limits:
52+
memory: 1600Mi
53+
requests:
54+
cpu: 100m
55+
memory: 1600Mi
56+
{{- if .Values.addons.verticalPodAutoscaler.valuesOverride }}
57+
valuesFrom:
58+
- kind: Secret
59+
name: {{ .Release.Name }}-vertical-pod-autoscaler-values-override
60+
valuesKey: values
61+
{{- end }}
62+
dependsOn:
63+
{{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }}
64+
- name: {{ .Release.Name }}
65+
namespace: {{ .Release.Namespace }}
66+
{{- end }}
67+
- name: {{ .Release.Name }}-monitoring-agents
68+
namespace: {{ .Release.Namespace }}
69+
{{- end }}

‎packages/apps/kubernetes/values.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,13 @@ addons:
7070
enabled: false
7171
valuesOverride: {}
7272

73+
## VerticalPodAutoscaler
74+
##
75+
verticalPodAutoscaler:
76+
## @param addons.verticalPodAutoscaler.valuesOverride Custom values to override
77+
##
78+
valuesOverride: {}
79+
7380
## @section Kamaji control plane
7481
##
7582
kamajiControlPlane:

‎packages/apps/versions_map‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ kubernetes 0.15.1 160e4e2a
5757
kubernetes 0.15.2 8267072d
5858
kubernetes 0.16.0 077045b0
5959
kubernetes 0.17.0 1fbbfcd0
60-
kubernetes 0.17.1 HEAD
60+
kubernetes 0.17.1 fd240701
61+
kubernetes 0.18.0 HEAD
6162
mysql 0.1.0 263e47be
6263
mysql 0.2.0 c24a103f
6364
mysql 0.3.0 53f2365e

0 commit comments

Comments
 (0)