Merge R3 into master

[it/dep.git] / ric-aux / helm / infrastructure / subcharts / extsvcaux / templates / services-plt.yaml

diff --git a/ric-aux/85-Ext-Services/helm/extsvcaux/templates/services-ric.yaml b/ric-aux/helm/infrastructure/subcharts/extsvcaux/templates/services-plt.yaml
similarity index 71%
rename from ric-aux/85-Ext-Services/helm/extsvcaux/templates/services-ric.yaml
rename to ric-aux/helm/infrastructure/subcharts/extsvcaux/templates/services-plt.yaml
index 7047cd7..4287209 100644 (file)
--- a/ric-aux/85-Ext-Services/helm/extsvcaux/templates/services-ric.yaml
+++ b/ric-aux/helm/infrastructure/subcharts/extsvcaux/templates/services-plt.yaml
@@ -14,18 +14,18 @@
 #   See the License for the specific language governing permissions and        #
 #   limitations under the License.                                             #
 ################################################################################
-
+---
 kind: "Service"
 apiVersion: "v1"
 metadata:
-  name: {{ include "common.ingressurl.ric" . }}
+  name: {{ include "common.ingresscontroller.url.platform" . }}
   namespace: {{ include "common.namespace.aux" . }}
 spec:
   ports:
-    - name: {{ include "common.ingressurl.ric" . }}-http-ingress-port
+    - name: {{ include "common.ingresscontroller.url.platform" . }}-http-ingress-port
       protocol: "TCP"
       port: 80
-    - name: {{ include "common.ingressurl.ric" . }}-https-ingress-port
+    - name: {{ include "common.ingresscontroller.url.platform" . }}-https-ingress-port
       protocol: "TCP"
       port: 443
 ---
@@ -33,13 +33,13 @@ kind: "Endpoints"
 apiVersion: "v1"
 metadata:
   # match with the selector-less service
-  name: {{ include "common.ingressurl.ric" . }}
+  name: {{ include "common.ingresscontroller.url.platform" . }}
   namespace: {{ include "common.namespace.aux" . }}
 subsets: 
   - addresses:
-      - ip: "{{ .Values.extsvcaux.ricip }}"
+      - ip: "{{ .Values.ricip }}"
     ports:
-      - port: {{ include "common.ingresshttpport" . }}
-        name: {{ include "common.ingressurl.ric" . }}-http-ingress-port
-      - port: {{ include "common.ingresshttpsport" . }}
-        name: {{ include "common.ingressurl.ric" . }}-https-ingress-port
+      - port: {{ include "common.ingresscontroller.port.http" . }}
+        name: {{ include "common.ingresscontroller.url.platform" $ }}-http-ingress-port
+      - port: {{ include "common.ingresscontroller.port.https" $ }}
+        name: {{ include "common.ingresscontroller.url.platform" $ }}-https-ingress-port