diff options
author | Mandeep Khinda <mandeep.khinda@amdocs.com> | 2018-04-17 03:26:26 +0000 |
---|---|---|
committer | Mandeep Khinda <mandeep.khinda@amdocs.com> | 2018-04-17 13:59:30 +0000 |
commit | 15b8fc55f8c290f83a32fdd4d4200b3f99915e5b (patch) | |
tree | e9b6d49d0d59522e20cb4f7a2c502f6f3ccc1443 /templates/service.yaml | |
parent | fd63a1566eed843659da9151fad0b832220cd6ba (diff) |
Synching robot up with Beijing code
-updating configmaps with master
-parameterizing auth
-removing asdc interface fork. no longer needed as be/fe are split
-fixing spaces
-aligning with templates better
-adding comments to values that need overriding per environment
-injecting demo project into container in /share/heat on startup
-addressing comment on demo-k8s.sh
Issue-ID: OOM-795
Change-Id: Iebc959c20491e3e2ca8cf64f22444918650d1970
Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>
Diffstat (limited to 'templates/service.yaml')
-rw-r--r-- | templates/service.yaml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/templates/service.yaml b/templates/service.yaml index f9f2805..3fc21b4 100644 --- a/templates/service.yaml +++ b/templates/service.yaml @@ -15,7 +15,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "common.fullname" . }} + name: {{ include "common.servicename" . }} namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.name" . }} @@ -26,14 +26,14 @@ spec: type: {{ .Values.service.type }} ports: {{if eq .Values.service.type "NodePort" -}} - - port: {{ .Values.service.internalPort }} - nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.externalPort }} - name: {{ .Values.service.name }} + - port: {{ .Values.service.externalPort }} + nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }} + name: {{ .Values.service.portName | default "http" }} {{- else -}} - port: {{ .Values.service.externalPort }} targetPort: {{ .Values.service.internalPort }} - name: {{ .Values.service.name }} + name: {{ .Values.service.portName | default "http" }} {{- end}} selector: app: {{ include "common.name" . }} - release: {{ .Release.Name }} + release: {{ .Release.Name }}
\ No newline at end of file |