fix both internal and external registry host

Author: nicktrn

hosting/k8s/helm/templates/_helpers.tpl

@@ -238,9 +238,9 @@ Registry connection details
 */}}
 {{- define "trigger-v4.registry.host" -}}
 {{- if .Values.registry.deploy -}}
-{{ include "trigger-v4.fullname" . }}-registry:{{ .Values.registry.service.port }}
+{{ .Values.registry.host }}
 {{- else -}}
-{{ .Values.registry.external.host }}:{{ .Values.registry.external.port }}
+{{ .Values.registry.external.host }}
 {{- end -}}
 {{- end }}
 

hosting/k8s/helm/values.yaml

@@ -492,20 +492,34 @@ s3:
 
 # Docker Registry configuration
 registry:
-  # EXPERIMENTAL - requires TLS setup or additional cluster configuration. Configure `external` details instead.
+  # EXPERIMENTAL - requires ingress/TLS setup or additional cluster configuration. Configure `external` details instead.
   deploy: false
 
-  repositoryNamespace: "trigger" # Docker repository namespace for deployed images, will be part of the image ref
+  # This will be used when deploy: true
+  host: "registry.example.com"
+
+  # Docker repository namespace for deployed images, will be part of the image ref
+  repositoryNamespace: "trigger"
+
   image:
     registry: docker.io
     repository: registry
     tag: "2"
     pullPolicy: IfNotPresent
+
   auth:
     enabled: true
     username: "registry-user"
     password: "very-secure-indeed"
 
+  # External Registry connection (when deploy: false)
+  external:
+    host: "localhost:5001"
+    auth:
+      enabled: false
+      username: ""
+      password: ""
+
   podAnnotations: {}
 
   # podSecurityContext:
@@ -571,15 +585,6 @@ registry:
     failureThreshold: 60
     successThreshold: 1
 
-  # External Registry connection (when deploy: false)
-  external:
-    host: "localhost"
-    port: 5001
-    auth:
-      enabled: false
-      username: ""
-      password: ""
-
   # Extra environment variables for Registry
   extraEnvVars:
     []