license configuration: fix license passing via k8s secret

- fix reference of license by correct secret key - fix flag name after rename
VictoriaMetrics · Dec 13, 2023 · e580441 · e580441
1 parent 71a98e1
commit e580441
Show file tree

Hide file tree

Showing 19 changed files with 20 additions and 19 deletions.
diff --git a/charts/victoria-metrics-agent/CHANGELOG.md b/charts/victoria-metrics-agent/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## Next release
 
-- TODO
+- Fix configuration of volume mount for license key referenced by using secret.
 
 ## 0.9.14
 

diff --git a/charts/victoria-metrics-agent/Chart.yaml b/charts/victoria-metrics-agent/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: victoria-metrics-agent
 description: Victoria Metrics Agent - collects metrics from various sources and stores them to VictoriaMetrics
-version: 0.9.14
+version: 0.9.15
 appVersion: v1.96.0
 sources:
   - https://github.com/VictoriaMetrics/helm-charts

diff --git a/charts/victoria-metrics-agent/templates/_helpers.tpl b/charts/victoria-metrics-agent/templates/_helpers.tpl
@@ -120,7 +120,7 @@ Return license flag if necessary.
 -license={{ .Values.license.key }}
 {{- end }}
 {{- if and .Values.license.secret.name .Values.license.secret.key -}}
--license-file=/etc/vm-license-key
+-licenseFile=/etc/vm-license-key/{{ .Values.license.secret.key }}
 {{- end -}}
 {{- end -}}
 

diff --git a/charts/victoria-metrics-alert/CHANGELOG.md b/charts/victoria-metrics-alert/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## Next release
 
-- TODO
+- Fix configuration of volume mount for license key referenced by using secret.
 
 ## 0.8.5
 

diff --git a/charts/victoria-metrics-alert/Chart.yaml b/charts/victoria-metrics-alert/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: victoria-metrics-alert
 description: Victoria Metrics Alert - executes a list of given MetricsQL expressions (rules) and sends alerts to Alert Manager.
-version: 0.8.5
+version: 0.8.6
 appVersion: v1.96.0
 sources:
   - https://github.com/VictoriaMetrics/helm-charts

diff --git a/charts/victoria-metrics-alert/templates/_helpers.tpl b/charts/victoria-metrics-alert/templates/_helpers.tpl
@@ -270,7 +270,7 @@ Return license flag if necessary.
 -license={{ .Values.license.key }}
 {{- end }}
 {{- if and .Values.license.secret.name .Values.license.secret.key -}}
--license-file=/etc/vm-license-key
+-licenseFile=/etc/vm-license-key/{{ .Values.license.secret.key }}
 {{- end -}}
 {{- end -}}
 

diff --git a/charts/victoria-metrics-auth/CHANGELOG.md b/charts/victoria-metrics-auth/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## Next release
 
-- TODO
+- Fix configuration of volume mount for license key referenced by using secret.
 
 ## 0.4.4
 

diff --git a/charts/victoria-metrics-auth/Chart.yaml b/charts/victoria-metrics-auth/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: v1.96.0
 description: Victoria Metrics Auth - is a simple auth proxy and router for VictoriaMetrics.
 name: victoria-metrics-auth
-version: 0.4.4
+version: 0.4.5
 sources:
   - https://github.com/VictoriaMetrics/helm-charts
 icon: https://avatars.githubusercontent.com/u/43720803?s=200&v=4

diff --git a/charts/victoria-metrics-auth/templates/_helpers.tpl b/charts/victoria-metrics-auth/templates/_helpers.tpl
@@ -104,7 +104,7 @@ Return license flag if necessary.
 -license={{ .Values.license.key }}
 {{- end }}
 {{- if and .Values.license.secret.name .Values.license.secret.key -}}
--license-file=/etc/vm-license-key
+-licenseFile=/etc/vm-license-key/{{ .Values.license.secret.key }}
 {{- end -}}
 {{- end -}}
 

diff --git a/charts/victoria-metrics-cluster/CHANGELOG.md b/charts/victoria-metrics-cluster/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## Next release
 
-- TODO
+- Fix configuration of volume mount for license key referenced by using secret. 
 
 ## 0.11.8
 

diff --git a/charts/victoria-metrics-cluster/Chart.yaml b/charts/victoria-metrics-cluster/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: v1.96.0
 description: Victoria Metrics Cluster version - high-performance, cost-effective and scalable TSDB, long-term remote storage for Prometheus
 name: victoria-metrics-cluster
-version: 0.11.8
+version: 0.11.9
 sources:
   - https://github.com/VictoriaMetrics/helm-charts
 icon: https://avatars.githubusercontent.com/u/43720803?s=200&v=4

diff --git a/charts/victoria-metrics-cluster/templates/_helpers.tpl b/charts/victoria-metrics-cluster/templates/_helpers.tpl
@@ -285,7 +285,7 @@ Return license flag if necessary.
 --license={{ .Values.license.key }}
 {{- end }}
 {{- if and .Values.license.secret.name .Values.license.secret.key -}}
---license-file=/etc/vm-license-key
+--licenseFile=/etc/vm-license-key/{{ .Values.license.secret.key }}
 {{- end -}}
 {{- end -}}
 

diff --git a/charts/victoria-metrics-cluster/templates/vmstorage-statefulset.yaml b/charts/victoria-metrics-cluster/templates/vmstorage-statefulset.yaml
@@ -133,7 +133,7 @@ spec:
             - --{{ $key }}={{ $value }}
             {{- end }}
             {{- with (include "chart.license.flag" .) }}
-              - {{ . }}
+            - {{ . }}
             {{- end }}
           {{- with .Values.vmstorage.vmbackupmanager.resources }}
           resources: {{ toYaml . | nindent 12 }}

diff --git a/charts/victoria-metrics-gateway/CHANGELOG.md b/charts/victoria-metrics-gateway/CHANGELOG.md
@@ -2,7 +2,8 @@
 
 ## Next release
 
-- TODO
+- Fix configuration of volume mount for license key referenced by using secret.
+- Fix `vmbackupmanager` flags configuration when providing license key via secret. 
 
 ## 0.1.53
 

diff --git a/charts/victoria-metrics-gateway/Chart.yaml b/charts/victoria-metrics-gateway/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Victoria Metrics Gateway - Auth & Rate-Limitting proxy for Victoria Metrics
 name: victoria-metrics-gateway
-version: 0.1.53
+version: 0.1.54
 appVersion: v1.96.0
 sources:
   - https://github.com/VictoriaMetrics/helm-charts

diff --git a/charts/victoria-metrics-gateway/templates/_helpers.tpl b/charts/victoria-metrics-gateway/templates/_helpers.tpl
@@ -71,7 +71,7 @@ Return license flag if necessary.
 -license={{ .Values.license.key }}
 {{- end }}
 {{- if and .Values.license.secret.name .Values.license.secret.key -}}
--license-file=/etc/vm-license-key
+-licenseFile=/etc/vm-license-key/{{ .Values.license.secret.key }}
 {{- end -}}
 {{- end -}}
 

diff --git a/charts/victoria-metrics-single/CHANGELOG.md b/charts/victoria-metrics-single/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## Next release
 
-- TODO
+- Fix configuration of volume mount for license key referenced by using secret.
 
 ## 0.9.13
 

diff --git a/charts/victoria-metrics-single/Chart.yaml b/charts/victoria-metrics-single/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: v1.96.0
 description: Victoria Metrics Single version - high-performance, cost-effective and scalable TSDB, long-term remote storage for Prometheus
 name: victoria-metrics-single
-version: 0.9.13
+version: 0.9.14
 sources:
   - https://github.com/VictoriaMetrics/helm-charts
 kubeVersion: ">=1.23.0-0"

diff --git a/charts/victoria-metrics-single/templates/_helpers.tpl b/charts/victoria-metrics-single/templates/_helpers.tpl
@@ -186,7 +186,7 @@ Return license flag if necessary.
 -license={{ .Values.license.key }}
 {{- end }}
 {{- if and .Values.license.secret.name .Values.license.secret.key -}}
--license-file=/etc/vm-license-key
+-licenseFile=/etc/vm-license-key/{{ .Values.license.secret.key }}
 {{- end -}}
 {{- end -}}
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     ## Next release
-    - TODO
+    - Fix configuration of volume mount for license key referenced by using secret.
     ## 0.9.14
@@ Expand Down @@