Make nodePorts configurable (#75)

* Make nodePorts configurable * Update dependency versions for sd-ran * Fix broken sd-ran test
onosproject · Apr 25, 2020 · c638a1b · c638a1b
1 parent 039b134
commit c638a1b
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 18 deletions.
diff --git a/onos-gui/Chart.yaml b/onos-gui/Chart.yaml
@@ -3,7 +3,7 @@ name: onos-gui
 description: ONOS Graphical User Interface
 kubeVersion: ">=1.17.0"
 type: application
-version: 0.0.1
+version: 0.0.2
 appVersion: v0.6.0
 keywords:
   - onos

diff --git a/onos-gui/templates/service.yaml b/onos-gui/templates/service.yaml
@@ -1,4 +1,3 @@
----
 apiVersion: v1
 kind: Service
 metadata:
@@ -24,8 +23,8 @@ spec:
     - name: grpc-web-{{ $key }}
       port: {{ $value.proxy }}
     {{- end }}
-
 ---
+{{- if .Values.service.external.nodePort }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -47,5 +46,6 @@ spec:
   ports:
     - name: web
       port: 80
-      nodePort: 31180
-      protocol: TCP
+      nodePort: {{ .Values.service.external.nodePort }}
+      protocol: TCP
+{{- end }}
diff --git a/onos-gui/values.yaml b/onos-gui/values.yaml
@@ -20,6 +20,8 @@ service:
   ## Service name is user-configurable for maximum service discovery flexibility.
   name: onos-gui
   type: LoadBalancer
+  external:
+    nodePort: 31180
 
 ingress:
   enabled: true

diff --git a/onos-ric-ho/Chart.yaml b/onos-ric-ho/Chart.yaml
@@ -3,7 +3,7 @@ name: onos-ric-ho
 description: ONOS Radio Access Network Handover
 kubeVersion: ">=1.17.0"
 type: application
-version: 0.0.1
+version: 0.0.2
 appVersion: v0.6.0
 keywords:
   - onos

diff --git a/onos-ric-ho/templates/service.yaml b/onos-ric-ho/templates/service.yaml
@@ -20,8 +20,8 @@ spec:
   ports:
     - name: exporter
       port: 7001
-
 ---
+{{- if .Values.service.external.nodePort }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -43,5 +43,6 @@ spec:
   ports:
     - name: exporter
       port: 7001
-      nodePort: 31701
+      nodePort: {{ .Values.service.external.nodePort }}
       protocol: TCP
+{{- end }}
diff --git a/onos-ric-ho/values.yaml b/onos-ric-ho/values.yaml
@@ -20,6 +20,11 @@ enableMetrics: false
 
 store: {}
 
+service:
+  # TODO: External NodePort service should be disabled by default
+  external:
+    nodePort: 31701
+
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little

diff --git a/onos-ric-mlb/Chart.yaml b/onos-ric-mlb/Chart.yaml
@@ -3,7 +3,7 @@ name: onos-ric-mlb
 description: ONOS Radio Access Network Load Balancer
 kubeVersion: ">=1.17.0"
 type: application
-version: 0.0.1
+version: 0.0.2
 appVersion: v0.6.0
 keywords:
   - onos

diff --git a/onos-ric-mlb/templates/service.yaml b/onos-ric-mlb/templates/service.yaml
@@ -20,8 +20,8 @@ spec:
   ports:
     - name: exporter
       port: 7002
-
 ---
+{{- if .Values.service.external.nodePort }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -43,5 +43,6 @@ spec:
   ports:
     - name: exporter
       port: 7002
-      nodePort: 31702
+      nodePort: {{ .Values.service.external.nodePort }}
       protocol: TCP
+{{- end }}
diff --git a/onos-ric-mlb/values.yaml b/onos-ric-mlb/values.yaml
@@ -20,6 +20,11 @@ enableMetrics: false
 
 store: {}
 
+service:
+  # TODO: External NodePort service should be disabled by default
+  external:
+    nodePort: 31702
+
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little

diff --git a/onos-ric/templates/service.yaml b/onos-ric/templates/service.yaml
@@ -22,8 +22,8 @@ spec:
       port: 5150
     - name: exporter
       port: 7000
-
 ---
+{{- if .Values.service.external.nodePort }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -45,5 +45,6 @@ spec:
   ports:
     - name: exporter
       port: 7000
-      nodePort: 31700
+      nodePort: {{ .Values.service.external.nodePort }}
       protocol: TCP
+{{- end }}
diff --git a/onos-ric/values.yaml b/onos-ric/values.yaml
@@ -46,7 +46,9 @@ store:
     partitionsPerCluster: 1
 
 service:
-  type: ClusterIP
+  # TODO: External NodePort service should be disabled by default
+  external:
+    nodePort: 31700
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

diff --git a/sd-ran/Chart.yaml b/sd-ran/Chart.yaml
@@ -39,11 +39,11 @@ dependencies:
   - name: onos-ric-ho
     condition: import.onos-ric-ho.enabled
     repository: file://../onos-ric-ho
-    version: 0.0.1
+    version: 0.0.2
   - name: onos-ric-mlb
     condition: import.onos-ric-mlb.enabled
     repository: file://../onos-ric-mlb
-    version: 0.0.1
+    version: 0.0.2
   - name: onos-topo
     condition: import.onos-topo.enabled
     repository: file://../onos-topo
@@ -55,7 +55,7 @@ dependencies:
   - name: onos-gui
     condition: import.onos-gui.enabled
     repository: file://../onos-gui
-    version: 0.0.1
+    version: 0.0.2
   - name: ran-simulator
     condition: import.ran-simulator.enabled
     repository: file://../ran-simulator

diff --git a/sd-ran/tests/sd-ran.go b/sd-ran/tests/sd-ran.go
@@ -46,6 +46,9 @@ func (s *SDRANSuite) TestInstall(t *testing.T) {
 	sdran := helm.Chart("sd-ran").
 		Release("sd-ran").
 		Set("global.store.controller", "sd-ran-atomix-kubernetes-controller:5679").
-		Set("import.onos-gui.enabled", false)
+		Set("import.onos-gui.enabled", false).
+		Set("onos-ric.service.external.nodePort", 0).
+		Set("onos-ric-ho.service.external.nodePort", 0).
+		Set("onos-ric-mlb.service.external.nodePort", 0)
 	assert.NoError(t, sdran.Install(true))
 }