operator: configurable webhook port

charts/victoria-metrics-operator/CHANGELOG.md

@@ -2,7 +2,8 @@
 
 ## Next release
 
-- TODO
+- Made webhook port configurable. See [this issue](https://github.com/VictoriaMetrics/helm-charts/issues/1506)
+- Changed crd cleanup hook delete policy to prevent `resource already exists` error.
 
 ## 0.34.8
 

charts/victoria-metrics-operator/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: victoria-metrics-common
   repository: https://victoriametrics.github.io/helm-charts
-  version: 0.0.9
-digest: sha256:dd59b050d7d15c0fc50f7910f64b45a744bcfc155f2414a8ae300addad5cdbc5
-generated: "2024-09-03T11:58:40.092985+03:00"
+  version: 0.0.13
+digest: sha256:6d82d9a15a778259efa73e4798f46d461877cea5a8f382b7bf7eb4164fccfc1b
+generated: "2024-09-17T00:20:51.436479+03:00"

charts/victoria-metrics-operator/templates/_helpers.tpl

@@ -11,7 +11,7 @@ Expand the name of the chart.
 {{- define "vm-operator.cleanup.annotations" -}}
 "helm.sh/hook": pre-delete
 "helm.sh/hook-weight": "{{ .hookWeight }}"
-"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+"helm.sh/hook-delete-policy": before-hook-creation
 {{- end }}
 
 {{/*

charts/victoria-metrics-operator/templates/service.yaml

@@ -36,10 +36,9 @@ spec:
   {{- end }}
   ports:
     - name: http
-      port: 8080
+      port: {{ .Values.service.servicePort }}
       targetPort: http
       protocol: TCP
-    - name: webhook
-      port: 9443
+    - name: {{ .Values.service.webhookPort }}
       targetPort: webhook
   selector: {{ include "vm-operator.selectorLabels" . | nindent 4 }}

charts/victoria-metrics-operator/values.yaml

@@ -109,6 +109,8 @@ service:
   externalTrafficPolicy: ""
   ipFamilyPolicy: ""
   ipFamilies: []
+  servicePort: 8080
+  webhookPort: 9443
 
 # -- See `kubectl explain poddisruptionbudget.spec` for more or check [these docs](https://kubernetes.io/docs/tasks/run-application/configure-pdb/)
 podDisruptionBudget: