-{{- define "ricxapp.servicename.rmr" -}}
+{{- define "ricxapp.servicename" -}}
{{- $name := ( include "ricxapp.fullname" . ) -}}
- {{- printf "service-%s-rmr" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- define "ricxapp.servicename.http" -}}
- {{- $name := ( include "ricxapp.fullname" . ) -}}
- {{- printf "service-%s-http" $name | trunc 63 | trimSuffix "-" -}}
+ {{- printf "service-%s" $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- define "ricxapp.configmapname" -}}
+++ /dev/null
-################################################################################
-# Copyright (c) 2019 AT&T Intellectual Property. #
-# #
-# 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. #
-################################################################################
-
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ include "ricxapp.servicename.rmr" . }}
- namespace: {{ include "ricxapp.namespace" . }}
- labels:
- app: {{ include "ricxapp.namespace" . }}-{{ include "ricxapp.name" . }}
- chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
- heritage: {{ .Release.Service }}
-spec:
- type: ClusterIP
- ports:
- {{- range .Values.containers }}
- {{- if .ports }}
- {{- if .ports.rmr_data }}
- - port: {{ .ports.rmr_data }}
- targetPort: rmrdata-{{ .name }}
- protocol: TCP
- name: rmrdata-{{ .name }}
- {{- end }}
- {{- if .ports.rmr_route }}
- - port: {{ .ports.rmr_route }}
- targetPort: rmrroute-{{ .name }}
- protocol: TCP
- name: rmrroute-{{ .name }}
- {{- end }}
- {{- end }}
- {{- end }}
- selector:
- app: {{ include "ricxapp.namespace" . }}-{{ include "ricxapp.name" . }}
- release: {{ .Release.Name }}
apiVersion: v1
kind: Service
metadata:
- name: {{ include "ricxapp.servicename.http" . }}
+ name: {{ include "ricxapp.servicename" . }}
namespace: {{ include "ricxapp.namespace" . }}
labels:
app: {{ include "ricxapp.namespace" . }}-{{ include "ricxapp.name" . }}
spec:
type: ClusterIP
ports:
- {{- range .Values.containers }}
- {{- if .ports }}
- {{- if .ports.http }}
- - port: {{ .ports.http }}
- targetPort: http-{{ .name }}
+ {{- range .Values.messaging.ports }}
+ - port: {{ .port }}
+ targetPort: {{ .name }}
protocol: TCP
- name: http-{{ .name }}
- {{- end }}
- {{- end }}
+ name: {{ .name }}
{{- end }}
selector:
app: {{ include "ricxapp.namespace" . }}-{{ include "ricxapp.name" . }}