Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add FCAPS to oom"
[oom.git]
/
kubernetes
/
multicloud
/
templates
/
service.yaml
diff --git
a/kubernetes/multicloud/templates/service.yaml
b/kubernetes/multicloud/templates/service.yaml
index
9f18c5e
..
e34bdf4
100644
(file)
--- a/
kubernetes/multicloud/templates/service.yaml
+++ b/
kubernetes/multicloud/templates/service.yaml
@@
-1,5
+1,6
@@
{{/*
# Copyright © 2017 Amdocs, Bell Canada
{{/*
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2018 AT&T
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-17,7
+18,7
@@
apiVersion: v1
kind: Service
metadata:
apiVersion: v1
kind: Service
metadata:
- name: {{ .Values.service.
n
ame }}
+ name: {{ .Values.service.
portN
ame }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@
-31,20
+32,28
@@
metadata:
"version": "v0",
"url": "/api/multicloud/v0",
"protocol": "REST",
"version": "v0",
"url": "/api/multicloud/v0",
"protocol": "REST",
- "port": {{ .Values.service.externalPort }},
+ "port": "{{ .Values.service.externalPort }}",
+ "visualRange": "1"
+ },
+ {
+ "serviceName": "multicloud",
+ "version": "v1",
+ "url": "/api/multicloud/v1",
+ "protocol": "REST",
+ "port": "{{ .Values.service.externalPort }}",
"visualRange": "1"
}
]'
spec:
ports:
{{if eq .Values.service.type "NodePort" -}}
"visualRange": "1"
}
]'
spec:
ports:
{{if eq .Values.service.type "NodePort" -}}
- - name: {{ .Values.service.name }}
- port: {{ .Values.service.externalPort }}
+ - port: {{ .Values.service.externalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
+ name: {{ .Values.service.portName }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.
n
ame }}
+ name: {{ .Values.service.
portN
ame }}
{{- end}}
selector:
app: {{ include "common.name" . }}
{{- end}}
selector:
app: {{ include "common.name" . }}