X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fsdc%2Ftemplates%2Fall-services.yaml;h=1f0a9a720c70425a0e2907a74f48dafbe0dd53e7;hb=e04b2feb855e5ab20e28c867d2bd7f89f6b8c425;hp=25ca65e0da1bfb91e9aade3316f1fd6817aa7d9f;hpb=b9cc2f9c1dffd66d9029162367f2adff2a37db38;p=oom.git

diff --git a/kubernetes/sdc/templates/all-services.yaml b/kubernetes/sdc/templates/all-services.yaml
index 25ca65e0da..1f0a9a720c 100644
--- a/kubernetes/sdc/templates/all-services.yaml
+++ b/kubernetes/sdc/templates/all-services.yaml
@@ -1,10 +1,25 @@
+# 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.disableSdcSdcEs }}
 apiVersion: v1
 kind: Service
 metadata:
   labels:
     app: sdc-es
   name: sdc-es
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   ports:
   - name: sdc-es-port-9200
@@ -14,6 +29,8 @@ spec:
   selector:
     app: sdc-es
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableSdcSdcCs }}
 ---
 apiVersion: v1
 kind: Service
@@ -21,7 +38,7 @@ metadata:
   labels:
     app: sdc-cs
   name: sdc-cs
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   ports:
   - name: sdc-cs-port-9042
@@ -31,6 +48,8 @@ spec:
   selector:
     app: sdc-cs
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableSdcSdcKb }}
 ---
 apiVersion: v1
 kind: Service
@@ -38,7 +57,7 @@ metadata:
   labels:
     app: sdc-kb
   name: sdc-kb
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   ports:
   - name: sdc-kb-port-5601
@@ -46,6 +65,8 @@ spec:
   selector:
     app: sdc-kb
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableSdcSdcBe }}
 ---
 apiVersion: v1
 kind: Service
@@ -53,18 +74,40 @@ metadata:
   labels:
     app: sdc-be
   name: sdc-be
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}"
+  annotations:
+    msb.onap.org/service-info: '[
+      {
+          "serviceName": "sdc",
+          "version": "v1",
+          "url": "/sdc/v1",
+          "protocol": "REST",
+          "port": "8080",
+          "visualRange":"1"
+      },
+      {
+          "serviceName": "sdc-deprecated",
+          "version": "v1",
+          "url": "/sdc/v1",
+          "protocol": "REST",
+          "port": "8080",
+          "visualRange":"1",
+          "path":"/sdc/v1"
+      }
+      ]'
 spec:
   ports:
   - name: sdc-be-port-8443
-    nodePort: 30204
+    nodePort: {{ .Values.nodePortPrefix }}04
     port: 8443
   - name: sdc-be-port-8080
-    nodePort: 30205
+    nodePort: {{ .Values.nodePortPrefix }}05
     port: 8080
   selector:
     app: sdc-be
   type: NodePort
+#{{ end }}
+#{{ if not .Values.disableSdcSdcFe }}
 ---
 apiVersion: v1
 kind: Service
@@ -72,15 +115,27 @@ metadata:
   labels:
     app: sdc-fe
   name: sdc-fe
-  namespace: {{ .Values.NS }}
+  namespace: "{{ .Values.nsPrefix }}"
+  annotations:
+    msb.onap.org/service-info: '[
+      {
+          "serviceName": "sdc-gui",
+          "version": "v1",
+          "url": "/sdc1",
+          "protocol": "UI",
+          "port": "8181",
+          "visualRange":"0|1"
+      }
+      ]'
 spec:
   ports:
   - name: sdc-fe-port-9443
-    nodePort: 30207
+    nodePort: {{ .Values.nodePortPrefix }}07
     port: 9443
   - name: sdc-fe-port-8181
-    nodePort: 30206
+    nodePort: {{ .Values.nodePortPrefix }}06
     port: 8181
   selector:
     app: sdc-fe
   type: NodePort
+#{{ end }}
\ No newline at end of file