Merge "Move Kong to infra deployment"

[it/dep.git] / ric-platform / 55-Ext-Services / helm / extsvcplt / templates / services-aux.yaml

diff --git a/ric-platform/55-Ext-Services/helm/extsvcplt/templates/services-aux.yaml b/ric-platform/55-Ext-Services/helm/extsvcplt/templates/services-aux.yaml
index 13313e4..5987322 100644 (file)
--- a/ric-platform/55-Ext-Services/helm/extsvcplt/templates/services-aux.yaml
+++ b/ric-platform/55-Ext-Services/helm/extsvcplt/templates/services-aux.yaml
@@ -14,47 +14,22 @@
 #   See the License for the specific language governing permissions and        #
 #   limitations under the License.                                             #
 ################################################################################
-
-kind: "Service"
-apiVersion: "v1"
-metadata:
-  name: {{ include "common.ingressurl.ricaux" . }}
-  namespace: {{ include "common.namespace" . }}
-spec:
-  ports:
-    - name: {{ include "common.ingressurl.ricaux" . }}-http-ingress-port
-      protocol: "TCP"
-      port: 80
-    - name: {{ include "common.ingressurl.ricaux" . }}-https-ingress-port
-      protocol: "TCP"
-      port: 443
----
-kind: "Endpoints"
-apiVersion: "v1"
-metadata:
-  # match with the selector-less service
-  name: {{ include "common.ingressurl.ricaux" . }}
-  namespace: {{ include "common.namespace" . }}
-subsets: 
-  - addresses:
-      - ip: "{{ .Values.extsvcplt.auxip }}"
-    ports:
-      - port: {{ include "common.ingresshttpport.ricaux" . }}
-        name: {{ include "common.ingressurl.ricaux" . }}-http-ingress-port
-      - port: {{ include "common.ingresshttpsport.ricaux" . }}
-        name: {{ include "common.ingressurl.ricaux" . }}-https-ingress-port
+{{ $platformNameSpace := include "common.namespace.platform" . }}
+{{ $xAppNameSpace := include "common.namespace.xapp" . }}
+{{ $nameSpaceList := list $platformNameSpace $xAppNameSpace }}
+{{- range $nameSpaceList }}
 ---
 kind: "Service"
 apiVersion: "v1"
 metadata:
-  name: {{ include "common.ingressurl.ricinfra" . }}
-  namespace: {{ include "common.namespace" . }}
+  name: {{ include "common.ingressurl.aux" $ }}
+  namespace: {{ . }}
 spec:
   ports:
-    - name: {{ include "common.ingressurl.ricinfra" . }}-http-ingress-port
+    - name: {{ include "common.ingressurl.aux" $ }}-http-ingress-port
       protocol: "TCP"
       port: 80
-    - name: {{ include "common.ingressurl.ricinfra" . }}-https-ingress-port
+    - name: {{ include "common.ingressurl.aux" $ }}-https-ingress-port
       protocol: "TCP"
       port: 443
 ---
@@ -62,13 +37,14 @@ kind: "Endpoints"
 apiVersion: "v1"
 metadata:
   # match with the selector-less service
-  name: {{ include "common.ingressurl.ricinfra" . }}
-  namespace: {{ include "common.namespace" . }}
+  name: {{ include "common.ingressurl.aux" $ }}
+  namespace: {{ . }}
 subsets: 
   - addresses:
-      - ip: "{{ .Values.extsvcplt.auxip }}"
+      - ip: "{{ $.Values.extsvcplt.auxip }}"
     ports:
-      - port: {{ include "common.ingresshttpport.ricinfra" . }}
-        name: {{ include "common.ingressurl.ricinfra" . }}-http-ingress-port
-      - port: {{ include "common.ingresshttpsport.ricinfra" . }}
-        name: {{ include "common.ingressurl.ricinfra" . }}-https-ingress-port
+      - port: {{ include "common.ingresshttpport" $ }}
+        name: {{ include "common.ingressurl.aux" $ }}-http-ingress-port
+      - port: {{ include "common.ingresshttpsport" $ }}
+        name: {{ include "common.ingressurl.aux" $ }}-https-ingress-port
+{{- end -}}