Expose 6653 port on each node through NodePort to allow OF Master/Standby connection

.gitignore

@@ -1,2 +1,4 @@
 .idea/
 build/release
+build/_output
+.DS_Store

onos-classic/Chart.yaml

@@ -1,7 +1,7 @@
 ---
 apiVersion: v1
 name: onos-classic
-version: 0.1.7
+version: 0.1.8
 kubeVersion: ">=1.10.0"
 appVersion: 2.2.4
 description: ONOS cluster

onos-classic/templates/nodeports.yaml

@@ -1,45 +1,51 @@
 ---
-{{- if .Values.onosOfPort }}
+  {{- if .Values.onosApiPort }}
 apiVersion: v1
 kind: Service
 metadata:
-  name: onos-of
+  name: onos-api
 spec:
   type: NodePort
   ports:
-  - name: onos-of
-    port: 6653
-    nodePort: {{ .Values.onosOfPort }}
+    - name: onos-api
+      port: 8181
+      nodePort: {{ .Values.onosApiPort }}
   selector:
     app: {{ template "fullname" . }}
-{{- end}}
+  {{- end}}
 ---
-{{- if .Values.onosApiPort }}
+  {{- if .Values.onosSshPort }}
 apiVersion: v1
 kind: Service
 metadata:
-  name: onos-api
+  name: onos-ssh
 spec:
   type: NodePort
   ports:
-  - name: onos-api
-    port: 8181
-    nodePort: {{ .Values.onosApiPort }}
+    - name: onos-ssh
+      port: 8101
+      nodePort: {{ .Values.onosSshPort }}
   selector:
     app: {{ template "fullname" . }}
-{{- end}}
+  {{- end}}
+
+# workaround for . not working, see
+# https://github.com/helm/helm/issues/1311
+{{- if .Values.individualOpenFlowNodePorts }}
+{{- $root := . -}}
+{{ range $k, $index := until (atoi (quote .Values.replicas) | default 3) }}
 ---
-{{- if .Values.onosSshPort }}
 apiVersion: v1
 kind: Service
 metadata:
-  name: onos-ssh
+  name: onos-of-{{ $index }}
 spec:
   type: NodePort
   ports:
-  - name: onos-ssh
-    port: 8101
-    nodePort: {{ .Values.onosSshPort }}
+    - name: onos-of-{{ $index }}
+      port: 6653
+      nodePort: {{ add $index 31653 }}
   selector:
-    app: {{ template "fullname" . }}
+      statefulset.kubernetes.io/pod-name: onos-onos-classic-{{ $index }}
+{{ end }}
 {{- end}}

onos-classic/templates/service.yaml

@@ -9,18 +9,19 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
   annotations:
-      service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
+    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
 spec:
   {{- with .Values.ports }}
   ports:
   {{- range . }}
-    - name: {{ .name }}
-      port: {{ .port }}
-      protocol: {{ .protocol | default "TCP" | quote }}
+  - 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
   selector:
     app: {{ template "fullname" . }}
+

onos-classic/values.yaml

@@ -28,6 +28,8 @@ resources:
     cpu: 0.5
     memory: 512Mi
 
+individualOpenFlowNodePorts: false
+
 ports:
   - name: openflow
     port: 6653