From 2a25bedf36e2c464c3f7ac64b893c629cf512d47 Mon Sep 17 00:00:00 2001
From: bzub <bzub@users.noreply.github.com>
Date: Thu, 20 Dec 2018 16:58:17 -0600
Subject: [PATCH] [stable/docker-registry] Use static container/daemon port
 (#10114)

* Use static container/daemon port

This commit ensures the container/daemon port is constant (5000),
while the service port is configurable with the service.port value.

Fixes #10113

Signed-off-by: bzub <bzubrod@gmail.com>

* bump version

Signed-off-by: David J. M. Karlsen <david@davidkarlsen.com>
---
 stable/docker-registry/Chart.yaml                | 2 +-
 stable/docker-registry/templates/NOTES.txt       | 2 +-
 stable/docker-registry/templates/deployment.yaml | 6 +++---
 stable/docker-registry/templates/service.yaml    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/stable/docker-registry/Chart.yaml b/stable/docker-registry/Chart.yaml
index 86016f5f53..1202b629cb 100644
--- a/stable/docker-registry/Chart.yaml
+++ b/stable/docker-registry/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart for Docker Registry
 name: docker-registry
-version: 1.6.2
+version: 1.6.3
 appVersion: 2.6.2
 home: https://hub.docker.com/_/registry/
 icon: https://hub.docker.com/public/images/logos/mini-logo.svg
diff --git a/stable/docker-registry/templates/NOTES.txt b/stable/docker-registry/templates/NOTES.txt
index 5ae3f77239..16bcf538d3 100644
--- a/stable/docker-registry/templates/NOTES.txt
+++ b/stable/docker-registry/templates/NOTES.txt
@@ -15,5 +15,5 @@
 {{- else if contains "ClusterIP" .Values.service.type }}
   export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "docker-registry.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
   echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl port-forward $POD_NAME 8080:{{ .Values.service.port }}
+  kubectl port-forward $POD_NAME 8080:5000
 {{- end }}
diff --git a/stable/docker-registry/templates/deployment.yaml b/stable/docker-registry/templates/deployment.yaml
index 669a6a4ac0..163b0d6da5 100644
--- a/stable/docker-registry/templates/deployment.yaml
+++ b/stable/docker-registry/templates/deployment.yaml
@@ -46,21 +46,21 @@ spec:
           - serve
           - /etc/docker/registry/config.yml
           ports:
-            - containerPort: {{ .Values.service.port }}
+            - containerPort: 5000
           livenessProbe:
             httpGet:
 {{- if .Values.tlsSecretName }}
               scheme: HTTPS
 {{- end }}
               path: /
-              port: {{ .Values.service.port }}
+              port: 5000
           readinessProbe:
             httpGet:
 {{- if .Values.tlsSecretName }}
               scheme: HTTPS
 {{- end }}
               path: /
-              port: {{ .Values.service.port }}
+              port: 5000
           resources:
 {{ toYaml .Values.resources | indent 12 }}
           env:
diff --git a/stable/docker-registry/templates/service.yaml b/stable/docker-registry/templates/service.yaml
index 3f12f46993..1414020805 100644
--- a/stable/docker-registry/templates/service.yaml
+++ b/stable/docker-registry/templates/service.yaml
@@ -20,7 +20,7 @@ spec:
     - port: {{ .Values.service.port }}
       protocol: TCP
       name: {{ .Values.service.name }}
-      targetPort: {{ .Values.service.port }}
+      targetPort: 5000
 {{- if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePort))) }}
       nodePort: {{ .Values.service.nodePort }}
 {{- end }}