Template service/container ports (#130)

* Template service/container ports - Removed unused ports in TOST * Update the required version
onosproject · Jul 13, 2020 · f98803e · f98803e
1 parent dfb8482
commit f98803e
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 23 deletions.
diff --git a/onos-classic/Chart.yaml b/onos-classic/Chart.yaml
@@ -1,7 +1,7 @@
 ---
 apiVersion: v1
 name: onos-classic
-version: 0.1.1
+version: 0.1.2
 kubeVersion: ">=1.10.0"
 appVersion: 2.2.2
 description: ONOS cluster

diff --git a/onos-classic/templates/service.yaml b/onos-classic/templates/service.yaml
@@ -11,17 +11,14 @@ metadata:
   annotations:
       service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
 spec:
+  {{- with .Values.ports }}
   ports:
-  - name: openflow
-    port: 6653
-  - name: ovsdb
-    port: 6640
-  - name: east-west
-    port: 9876
-  - name: cli
-    port: 8101
-  - name: ui
-    port: 8181
+  {{- range . }}
+    - name: {{ .name }}
+      port: {{ .port }}
+      protocol: {{ .protocol | default "TCP" | quote }}
+  {{- end }}
+  {{- end }}
   # ONOS and Atomix need to be able to talk to each other for ONOS to become ready
   publishNotReadyAddresses: true
   clusterIP: None

diff --git a/onos-classic/templates/statefulset.yaml b/onos-classic/templates/statefulset.yaml
@@ -73,17 +73,13 @@ spec:
             value: -Xmx{{ .Values.heap }}
           - name: ONOS_APPS
             value: {{ .Values.apps | quote }}
+        {{- with .Values.ports }}
         ports:
-          - name: openflow
-            containerPort: 6653
-          - name: ovsdb
-            containerPort: 6640
-          - name: east-west
-            containerPort: 9876
-          - name: cli
-            containerPort: 8101
-          - name: ui
-            containerPort: 8181
+        {{- range . }}
+          - name: {{ .name }}
+            containerPort: {{ .port }}
+        {{- end }}
+        {{- end }}
         readinessProbe:
           exec:
             command:

diff --git a/onos-classic/values.yaml b/onos-classic/values.yaml
@@ -27,3 +27,15 @@ resources:
   requests:
     cpu: 0.5
     memory: 512Mi
+
+ports:
+  - name: openflow
+    port: 6653
+  - name: ovsdb
+    port: 6640
+  - name: east-west
+    port: 9876
+  - name: cli
+    port: 8101
+  - name: ui
+    port: 8181
diff --git a/onos-tost/Chart.yaml b/onos-tost/Chart.yaml
@@ -1,7 +1,7 @@
 ---
 apiVersion: v1
 name: onos-tost
-version: 0.1.2
+version: 0.1.3
 kubeVersion: ">=1.10.0"
 appVersion: 2.2.3
 description: ONOS TOST

diff --git a/onos-tost/requirements.yaml b/onos-tost/requirements.yaml
@@ -1,5 +1,5 @@
 ---
 dependencies:
 - name: onos-classic
-  version: 0.1.1
+  version: 0.1.2
   repository: https://charts.onosproject.org
diff --git a/onos-tost/values.yaml b/onos-tost/values.yaml
@@ -3,6 +3,15 @@ onos-classic:
     repository: "onosproject/tost-onos"
     tag: "1.0.0-b1"
   replicas: 3
+  ports:
+    - name: up4
+      port: 51001
+    - name: east-west
+      port: 9876
+    - name: cli
+      port: 8101
+    - name: ui
+      port: 8181
   apps:
   - org.onosproject.drivers
   - org.onosproject.lldpprovider