X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fsdnc%2Ftemplates%2Fall-services.yaml;h=14d7b01a5958fb7a122739a5407831cf1c2db9ee;hb=e04b2feb855e5ab20e28c867d2bd7f89f6b8c425;hp=37c88ed5159ce9d016497a505e760bf8428b90aa;hpb=06a49cd534c1298d91d7e7257f9257f7d20f6ef2;p=oom.git

diff --git a/kubernetes/sdnc/templates/all-services.yaml b/kubernetes/sdnc/templates/all-services.yaml
index 37c88ed515..14d7b01a59 100644
--- a/kubernetes/sdnc/templates/all-services.yaml
+++ b/kubernetes/sdnc/templates/all-services.yaml
@@ -1,9 +1,23 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 #{{ if not .Values.disableSdncSdncDbhost }}
 apiVersion: v1
 kind: Service
 metadata:
   name: dbhost
-  namespace: "{{ .Values.nsPrefix }}-sdnc"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: sdnc-dbhost
 spec:
@@ -13,11 +27,27 @@ spec:
     app: sdnc-dbhost
   clusterIP: None
 ---
+# Client service for connecting to any MySQL instance for reads.
+# Only master: sdnc-dbhost-0 accepts the write request.
+apiVersion: v1
+kind: Service
+metadata:
+  name: dbhost-read
+  namespace: "{{ .Values.nsPrefix }}"
+  labels:
+    app: sdnc-dbhost
+spec:
+  ports:
+  - name: sdnc-dbhost
+    port: 3306
+  selector:
+    app: sdnc-dbhost
+---
 apiVersion: v1
 kind: Service
 metadata:
   name: sdnctldb01
-  namespace: "{{ .Values.nsPrefix }}-sdnc"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: sdnc-dbhost
 spec:
@@ -26,13 +56,12 @@ spec:
   selector:
     app: sdnc-dbhost
   clusterIP: None
-#{{ end }}
 ---
 apiVersion: v1
 kind: Service
 metadata:
   name: sdnctldb02
-  namespace: "{{ .Values.nsPrefix }}-sdnc"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: sdnc-dbhost
 spec:
@@ -41,13 +70,14 @@ spec:
   selector:
     app: sdnc-dbhost
   clusterIP: None
-#{{ if not .Values.disableSdncSdncDgbuilder }}
+#{{ end }}
+#{{ if not .Values.disableSdncSdnc }}
 ---
 apiVersion: v1
 kind: Service
 metadata:
   name: sdnc-dgbuilder
-  namespace: "{{ .Values.nsPrefix }}-sdnc"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: sdnc-dgbuilder
 spec:
@@ -59,14 +89,12 @@ spec:
   type: NodePort
   selector:
     app: sdnc-dgbuilder
-#{{ end }}
-#{{ if not .Values.disableSdncSdnc }}
 ---
 apiVersion: v1
 kind: Service
 metadata:
   name: sdnhost
-  namespace: "{{ .Values.nsPrefix }}-sdnc"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: sdnc
   annotations:
@@ -90,9 +118,35 @@ spec:
   - name: "sdnc-port-8101"
     port: 8201
     targetPort: 8101
+    nodePort: {{ .Values.nodePortPrefix }}08
+  - name: "sdnc-jolokia-port-8080"
+    port: 8280
+    targetPort: 8080
+    nodePort: {{ .Values.nodePortPrefix }}46
   type: NodePort
   selector:
     app: sdnc
+---
+kind: Service
+apiVersion: v1
+metadata:
+  name: nfs-provisioner
+  namespace: "{{ .Values.nsPrefix }}"
+  labels:
+    app: nfs-provisioner
+spec:
+  ports:
+    - name: nfs
+      port: 2049
+    - name: mountd
+      port: 20048
+    - name: rpcbind
+      port: 111
+    - name: rpcbind-udp
+      port: 111
+      protocol: UDP
+  selector:
+    app: nfs-provisioner
 #{{ end }}
 #{{ if not .Values.disableSdncSdncPortal }}
 ---
@@ -100,7 +154,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: sdnc-portal
-  namespace: "{{ .Values.nsPrefix }}-sdnc"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
     app: sdnc-portal
   annotations:
@@ -122,4 +176,25 @@ spec:
   type: NodePort
   selector:
     app: sdnc-portal
-#{{ end }}
\ No newline at end of file
+#{{ end }}
+#{{ if .Values.enableODLCluster }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: sdnhost-cluster
+  namespace: "{{ .Values.nsPrefix }}"
+  labels:
+    app: sdnc
+  annotations:
+    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
+spec:
+  ports:
+   - name: "sdnc-cluster-port"
+     port: 2550
+  clusterIP: None
+  selector:
+    app: sdnc
+  sessionAffinity: None
+  type: ClusterIP
+#{{ end }}