From 9a6e9b5357e6a3e58ad143b058b7881a4a5b6f44 Mon Sep 17 00:00:00 2001
From: Alexis de Talhouët <adetalhouet89@gmail.com>
Date: Tue, 18 Sep 2018 10:32:39 -0400
Subject: Do not use nodePortPrefix for external app
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I77d085ca89d51e3a1ba102d7666ee419701c39e4
Issue-ID: CCSDK-366
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
---
 kubernetes/contrib/charts/netbox/charts/netbox-app/values.yaml        | 4 ++--
 .../contrib/charts/netbox/charts/netbox-nginx/templates/service.yaml  | 2 +-
 kubernetes/contrib/charts/netbox/charts/netbox-nginx/values.yaml      | 4 ++--
 kubernetes/contrib/charts/netbox/charts/netbox-postgres/values.yaml   | 2 +-
 kubernetes/contrib/charts/netbox/values.yaml                          | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'kubernetes/contrib/charts')

diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/values.yaml b/kubernetes/contrib/charts/netbox/charts/netbox-app/values.yaml
index a1e330a260..a60bbb4f7a 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-app/values.yaml
+++ b/kubernetes/contrib/charts/netbox/charts/netbox-app/values.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 global: # global defaults
-  nodePortPrefix: 302
+  nodePortPrefixExt: 304
   persistence: {}
 
 config:
@@ -112,4 +112,4 @@ readiness:
   initialDelaySeconds: 10
   periodSeconds: 10
 
-resources: {}
\ No newline at end of file
+resources: {}
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/templates/service.yaml b/kubernetes/contrib/charts/netbox/charts/netbox-nginx/templates/service.yaml
index 90fca379b4..3490306ded 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/templates/service.yaml
+++ b/kubernetes/contrib/charts/netbox/charts/netbox-nginx/templates/service.yaml
@@ -29,7 +29,7 @@ spec:
   ports:
     {{if eq .Values.service.type "NodePort" -}}
     - port: {{ .Values.service.internalPort }}
-      nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
+      nodePort: {{ .Values.global.nodePortPrefixExt | default .Values.nodePortPrefixExt }}{{ .Values.service.nodePort }}
     {{- else -}}
     - port: {{ .Values.service.externalPort }}
       targetPort: {{ .Values.service.internalPort }}
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/values.yaml b/kubernetes/contrib/charts/netbox/charts/netbox-nginx/values.yaml
index e1845c8cb8..14fedc881a 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/values.yaml
+++ b/kubernetes/contrib/charts/netbox/charts/netbox-nginx/values.yaml
@@ -17,7 +17,7 @@
 # Declare variables to be passed into your templates.
 
 global: # global defaults
-  nodePortPrefix: 304
+  nodePortPrefixExt: 304
   persistence: {}
   pullPolicy: Always
 
@@ -81,4 +81,4 @@ service:
   internalPort: 8080
   nodePort: 20
 
-resources: {}
\ No newline at end of file
+resources: {}
diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/values.yaml b/kubernetes/contrib/charts/netbox/charts/netbox-postgres/values.yaml
index 39ff3edfaf..e662567e31 100755
--- a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/values.yaml
+++ b/kubernetes/contrib/charts/netbox/charts/netbox-postgres/values.yaml
@@ -17,7 +17,7 @@
 # Declare variables to be passed into your templates.
 
 global: # global defaults
-  nodePortPrefix: 302
+  nodePortPrefixExt: 304
   persistence: {}
 
 # application image
diff --git a/kubernetes/contrib/charts/netbox/values.yaml b/kubernetes/contrib/charts/netbox/values.yaml
index 6665064383..2dfb36b1e5 100755
--- a/kubernetes/contrib/charts/netbox/values.yaml
+++ b/kubernetes/contrib/charts/netbox/values.yaml
@@ -16,7 +16,7 @@
 # Global configuration defaults.
 #################################################################
 global:
-  nodePortPrefix: 302
+  nodePortPrefixExt: 304
   commonConfigPrefix: netbox
   readinessRepository: oomk8s
   readinessImage: readiness-check:2.0.0
-- 
cgit 1.2.3-korg