From d606cebf9b03e3663ba15b069743786b26554a0c Mon Sep 17 00:00:00 2001
From: alangilmor <130001107+alangilmor@users.noreply.github.com>
Date: Thu, 9 May 2024 03:24:32 -0400
Subject: [PATCH] fix: `hydra-maester.adminService.port` empty value is passed
 into child chart, causes error. (#675)

---
 helm/charts/hydra-maester/templates/deployment.yaml | 2 +-
 helm/charts/hydra/values.yaml                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/helm/charts/hydra-maester/templates/deployment.yaml b/helm/charts/hydra-maester/templates/deployment.yaml
index 33857e42d0..c313f2e101 100644
--- a/helm/charts/hydra-maester/templates/deployment.yaml
+++ b/helm/charts/hydra-maester/templates/deployment.yaml
@@ -57,7 +57,7 @@ spec:
           args:
             - --metrics-addr=127.0.0.1:8080
             - --hydra-url={{ required "scheme is required" .Values.adminService.scheme }}://{{ .Values.adminService.name | default ( include "hydra-maester.adminService" . ) }}
-            - --hydra-port={{ .Values.adminService.port }}
+            - --hydra-port={{ required "port must be set and non-empty" .Values.adminService.port }}
             {{- with .Values.adminService.endpoint }}
             - --endpoint={{ . }}
             {{- end }}
diff --git a/helm/charts/hydra/values.yaml b/helm/charts/hydra/values.yaml
index 00ef606c09..ecbbd125c8 100644
--- a/helm/charts/hydra/values.yaml
+++ b/helm/charts/hydra/values.yaml
@@ -464,7 +464,7 @@ hydra-maester:
     # -- The service name value may need to be set if you use `fullnameOverride` for the parent chart
     name: ""
     # -- You only need to set this port if you change the value for `service.admin.port` in the parent chart
-    port:
+    # port:
 
 ## -- Sidecar watcher configuration
 watcher: