From 820d8e6ce643bb6ef1eb763be4e5157d72807280 Mon Sep 17 00:00:00 2001
From: Bjoern Teipel <bjoern.teipel@rackspace.com>
Date: Tue, 17 Mar 2020 07:52:22 -0500
Subject: [PATCH] Adding new registry_port option (#5779)

New override are added to allow installation of the registry
on different ports than ``5000``. The default port is unchanged
from previous versions
---
 roles/kubernetes-apps/registry/defaults/main.yml              | 1 +
 .../registry/templates/registry-proxy-ds.yml.j2               | 4 ++--
 .../registry/templates/registry-proxy-psp.yml.j2              | 4 ++--
 roles/kubernetes-apps/registry/templates/registry-rs.yml.j2   | 4 ++--
 roles/kubernetes-apps/registry/templates/registry-svc.yml.j2  | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/roles/kubernetes-apps/registry/defaults/main.yml b/roles/kubernetes-apps/registry/defaults/main.yml
index aa52347bc..6c7900d52 100644
--- a/roles/kubernetes-apps/registry/defaults/main.yml
+++ b/roles/kubernetes-apps/registry/defaults/main.yml
@@ -2,3 +2,4 @@
 registry_namespace: "kube-system"
 registry_storage_class: ""
 registry_disk_size: "10Gi"
+registry_port: 5000
diff --git a/roles/kubernetes-apps/registry/templates/registry-proxy-ds.yml.j2 b/roles/kubernetes-apps/registry/templates/registry-proxy-ds.yml.j2
index 8b7740a60..b3947eb18 100644
--- a/roles/kubernetes-apps/registry/templates/registry-proxy-ds.yml.j2
+++ b/roles/kubernetes-apps/registry/templates/registry-proxy-ds.yml.j2
@@ -31,8 +31,8 @@ spec:
             - name: REGISTRY_HOST
               value: registry.{{ registry_namespace }}.svc.{{ cluster_name }}
             - name: REGISTRY_PORT
-              value: "5000"
+              value: "{{ registry_port }}"
           ports:
             - name: registry
               containerPort: 80
-              hostPort: 5000
+              hostPort: {{ registry_port }}
diff --git a/roles/kubernetes-apps/registry/templates/registry-proxy-psp.yml.j2 b/roles/kubernetes-apps/registry/templates/registry-proxy-psp.yml.j2
index c7375336a..9b12be220 100644
--- a/roles/kubernetes-apps/registry/templates/registry-proxy-psp.yml.j2
+++ b/roles/kubernetes-apps/registry/templates/registry-proxy-psp.yml.j2
@@ -36,8 +36,8 @@ spec:
     - 'persistentVolumeClaim'
   hostNetwork: true
   hostPorts:
-  - min: 5000
-    max: 5000
+  - min: {{ registry_port }}
+    max: {{ registry_port }}
   hostIPC: false
   hostPID: false
   runAsUser:
diff --git a/roles/kubernetes-apps/registry/templates/registry-rs.yml.j2 b/roles/kubernetes-apps/registry/templates/registry-rs.yml.j2
index c4b6040a9..827f60a1f 100644
--- a/roles/kubernetes-apps/registry/templates/registry-rs.yml.j2
+++ b/roles/kubernetes-apps/registry/templates/registry-rs.yml.j2
@@ -30,14 +30,14 @@ spec:
           imagePullPolicy: {{ k8s_image_pull_policy }}
           env:
             - name: REGISTRY_HTTP_ADDR
-              value: :5000
+              value: :{{ registry_port }}
             - name: REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY
               value: /var/lib/registry
           volumeMounts:
             - name: registry-pvc
               mountPath: /var/lib/registry
           ports:
-            - containerPort: 5000
+            - containerPort: {{ registry_port }}
               name: registry
               protocol: TCP
       volumes:
diff --git a/roles/kubernetes-apps/registry/templates/registry-svc.yml.j2 b/roles/kubernetes-apps/registry/templates/registry-svc.yml.j2
index 58d101d29..4e1b52fa4 100644
--- a/roles/kubernetes-apps/registry/templates/registry-svc.yml.j2
+++ b/roles/kubernetes-apps/registry/templates/registry-svc.yml.j2
@@ -14,5 +14,5 @@ spec:
     k8s-app: registry
   ports:
     - name: registry
-      port: 5000
+      port: {{ registry_port }}
       protocol: TCP