From 77033c4a5e52e7731671cbb8e5ca146e7df0f1c0 Mon Sep 17 00:00:00 2001
From: Christopher Pitstick <cpitstick@lat.ai>
Date: Tue, 25 Jun 2024 18:22:29 -0400
Subject: [PATCH] Add webhook port and bind port to deployment.

- Bindport no longer has a colon in it, introduced where needed.
- Webhook port added to deployment.

Needed for clarity when hostNetwork is true.
---
 chart/open-feature-operator/values.yaml             | 4 ++--
 config/overlays/helm/controller_manager_config.yaml | 2 +-
 config/overlays/helm/manager.yaml                   | 9 ++++++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/chart/open-feature-operator/values.yaml b/chart/open-feature-operator/values.yaml
index 95b66e874..9c7cbb818 100644
--- a/chart/open-feature-operator/values.yaml
+++ b/chart/open-feature-operator/values.yaml
@@ -147,11 +147,11 @@ managerConfig:
     health:
       ## @param managerConfig.controllerManagerConfigYaml.health.healthProbeBindAddress Sets the bind address for health probes.
       healthProbeBindAddress: :8081
-    metrics:
+    metrics: 
       ## @param managerConfig.controllerManagerConfigYaml.metrics.bindAddress Sets the bind address for metrics (combined with bindPort).
       bindAddress: 127.0.0.1
       ## @param managerConfig.controllerManagerConfigYaml.metrics.bindPort Sets the bind port for metrics.
-      bindPort: :8080
+      bindPort: 8080
     webhook:
       ## @param managerConfig.controllerManagerConfigYaml.webhook.port Sets the bind address for webhook.
       port: 9443
diff --git a/config/overlays/helm/controller_manager_config.yaml b/config/overlays/helm/controller_manager_config.yaml
index d22dfac5c..e3e870b3a 100644
--- a/config/overlays/helm/controller_manager_config.yaml
+++ b/config/overlays/helm/controller_manager_config.yaml
@@ -3,6 +3,6 @@ kind: ControllerManagerConfig
 health:
   healthProbeBindAddress: "{{ .Values.managerConfig.controllerManagerConfigYaml.health.healthProbeBindAddress }}"
 metrics:
-  bindAddress: "{{ .Values.managerConfig.controllerManagerConfigYaml.metrics.bindAddress }}{{ .Values.managerConfig.controllerManagerConfigYaml.metrics.bindPort }}"
+  bindAddress: "{{ .Values.managerConfig.controllerManagerConfigYaml.metrics.bindAddress }}:{{ .Values.managerConfig.controllerManagerConfigYaml.metrics.bindPort }}"
 webhook:
   port: 0{{ .Values.managerConfig.controllerManagerConfigYaml.webhook.port }}
diff --git a/config/overlays/helm/manager.yaml b/config/overlays/helm/manager.yaml
index f3d8dc52f..18ba51009 100644
--- a/config/overlays/helm/manager.yaml
+++ b/config/overlays/helm/manager.yaml
@@ -19,6 +19,13 @@ spec:
             requests:
               cpu: "{{ .Values.controllerManager.manager.resources.requests.cpu }}"
               memory: "{{ .Values.controllerManager.manager.resources.requests.memory }}"
+          ports:
+            - containerPort: "___{{ .Values.managerConfig.controllerManagerConfigYaml.webhook.port }} ___"
+              name: webhook-server
+              protocol: TCP
+            - containerPort: "___{{ .Values.managerConfig.controllerManagerConfigYaml.metrics.bindPort }}___"
+              name: metrics-server
+              protocol: TCP
           env:
             - name: SIDECAR_MANAGEMENT_PORT
               value: "{{ .Values.sidecarConfiguration.managementPort }}"
@@ -93,7 +100,7 @@ spec:
             - --sidecar-cpu-request={{ .Values.sidecarConfiguration.resources.requests.cpu }}
             - --sidecar-ram-request={{ .Values.sidecarConfiguration.resources.requests.memory }}
             - --image-pull-secrets={{ range .Values.imagePullSecrets }}{{ .name }},{{- end }}
-            - --metrics-bind-address={{ .Values.managerConfig.controllerManagerConfigYaml.metrics.bindPort }}
+            - --metrics-bind-address=:{{ .Values.managerConfig.controllerManagerConfigYaml.metrics.bindPort }}
         - name: kube-rbac-proxy
           image: "{{ .Values.controllerManager.kubeRbacProxy.image.repository }}:{{ .Values.controllerManager.kubeRbacProxy.image.tag }}"
           resources: