operator: configurable webhook port (#1507)

* operator: configurable webhook port * fixed cleanup hook * fixed typo
VictoriaMetrics · Sep 19, 2024 · c389e65 · c389e65
1 parent 03edda2
commit c389e65
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/charts/victoria-metrics-operator/CHANGELOG.md b/charts/victoria-metrics-operator/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 - Moved crds to a shared chart and import them as a dependency
 - replaced `crd.enabled` property to `crds.plain`. Instead of disabling CRDs it selects if CRDs should be rendered from template or as plain CRDs
+- 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
 

diff --git a/charts/victoria-metrics-operator/Chart.lock b/charts/victoria-metrics-operator/Chart.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: victoria-metrics-common
   repository: https://victoriametrics.github.io/helm-charts
-  version: 0.0.11
+  version: 0.0.13
 - name: crds
   repository: ""
   version: 0.0.*
-digest: sha256:14667a2da4b0843956aa57c97b737fbefc3bd24f0376f81b2c2b7e84919e5214
-generated: "2024-09-12T13:21:35.804808+03:00"
+digest: sha256:6d82d9a15a778259efa73e4798f46d461877cea5a8f382b7bf7eb4164fccfc1b
+generated: "2024-09-17T00:20:51.436479+03:00"
diff --git a/charts/victoria-metrics-operator/templates/_helpers.tpl b/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 }}
 
 {{/*

diff --git a/charts/victoria-metrics-operator/templates/service.yaml b/charts/victoria-metrics-operator/templates/service.yaml
@@ -36,10 +36,10 @@ spec:
   {{- end }}
   ports:
     - name: http
-      port: 8080
+      port: {{ .Values.service.servicePort }}
       targetPort: http
       protocol: TCP
     - name: webhook
-      port: 9443
+      port: {{ .Values.service.webhookPort }}
       targetPort: webhook
   selector: {{ include "vm-operator.selectorLabels" . | nindent 4 }}
diff --git a/charts/victoria-metrics-operator/templates/webhook.yaml b/charts/victoria-metrics-operator/templates/webhook.yaml
@@ -20,7 +20,7 @@ webhooks:
         namespace: {{ include "vm.namespace" $ }}
         name: {{ include "vm-operator.fullname" $ }}
         path: /validate-operator-victoriametrics-com-v1beta1-{{ $name }}
-        port: 9443
+        port: {{ .Values.service.webhookPort }}
       {{- if not $.Values.admissionWebhooks.certManager.enabled }}
       caBundle: {{ $tls.caCert }}
       {{- end }}

diff --git a/charts/victoria-metrics-operator/values.yaml b/charts/victoria-metrics-operator/values.yaml
@@ -110,6 +110,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: