X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ric-platform%2F55-Ext-Services%2Fhelm%2Fext%2Ftemplates%2Fservices-docker.yaml;fp=ric-platform%2F55-Ext-Services%2Fhelm%2Fext%2Ftemplates%2F_helper.tpl;h=019b1a2ba3f726b53f02d48056f8381b3dee5dcc;hb=8ae5e5da06fcdfe30d719497ecbb4b41bf286df7;hp=64a5876ce44e7f2da7b6037681e7e32d8d17f266;hpb=cca6ad5be1ba8679874c24a5b1c628055cd1eac8;p=it%2Fdep.git diff --git a/ric-platform/55-Ext-Services/helm/ext/templates/_helper.tpl b/ric-platform/55-Ext-Services/helm/ext/templates/services-docker.yaml similarity index 55% rename from ric-platform/55-Ext-Services/helm/ext/templates/_helper.tpl rename to ric-platform/55-Ext-Services/helm/ext/templates/services-docker.yaml index 64a5876c..019b1a2b 100644 --- a/ric-platform/55-Ext-Services/helm/ext/templates/_helper.tpl +++ b/ric-platform/55-Ext-Services/helm/ext/templates/services-docker.yaml @@ -15,37 +15,31 @@ # limitations under the License. # ################################################################################ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "ext.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec) -. -If release name contains chart name it will be used as a full name. -*/}} -{{- define "ext.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} -{{- end -}} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "ext.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} - +kind: "Service" +apiVersion: "v1" +metadata: + name: {{ include "common.ingressurl.localdocker" . }} + namespace: {{ include "common.namespace" . }} +spec: + ports: + - name: {{ include "common.ingressurl.localdocker" . }}-http-ingress-port + protocol: "TCP" + port: 80 + - name: {{ include "common.ingressurl.localdocker" . }}-https-ingress-port + protocol: "TCP" + port: 443 +--- +kind: "Endpoints" +apiVersion: "v1" +metadata: + # match with the selector-less service + name: {{ include "common.ingressurl.localdocker" . }} + namespace: {{ include "common.namespace" . }} +subsets: + - addresses: + - ip: "{{ .Values.ext.ip }}" + ports: + - port: {{ include "common.ingresshttpport.ricinfra" . }} + name: {{ include "common.ingressurl.localdocker" . }}-http-ingress-port + - port: {{ include "common.ingresshttpport.ricinfra" . }} + name: {{ include "common.ingressurl.localdocker" . }}-https-ingress-port