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 "[SDC] Change default access mode for cert PVC"
[oom.git]
/
kubernetes
/
multicloud
/
charts
/
multicloud-vio
/
templates
/
service.yaml
diff --git
a/kubernetes/multicloud/charts/multicloud-vio/templates/service.yaml
b/kubernetes/multicloud/charts/multicloud-vio/templates/service.yaml
index
dcaf37d
..
4a926df
100644
(file)
--- a/
kubernetes/multicloud/charts/multicloud-vio/templates/service.yaml
+++ b/
kubernetes/multicloud/charts/multicloud-vio/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,12
+18,12
@@
apiVersion: v1
kind: Service
metadata:
apiVersion: v1
kind: Service
metadata:
- name: {{
.Values.service.name
}}
+ name: {{
include "common.servicename" .
}}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{
.Release.Name
}}
+ release: {{
include "common.release" .
}}
heritage: {{ .Release.Service }}
annotations:
msb.onap.org/service-info: '[
heritage: {{ .Release.Service }}
annotations:
msb.onap.org/service-info: '[
@@
-33,20
+34,28
@@
metadata:
"protocol": "REST",
"port": "{{ .Values.service.externalPort }}",
"visualRange": "1"
"protocol": "REST",
"port": "{{ .Values.service.externalPort }}",
"visualRange": "1"
+ },
+ {
+ "serviceName": "multicloud-vio",
+ "version": "v1",
+ "url": "/api/multicloud-vio/v1",
+ "protocol": "REST",
+ "port": "{{ .Values.service.externalPort }}",
+ "visualRange": "1"
}
]'
spec:
ports:
{{if eq .Values.service.type "NodePort" -}}
}
]'
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" . }}
- release: {{
.Release.Name
}}
+ release: {{
include "common.release" .
}}
type: {{ .Values.service.type }}
type: {{ .Values.service.type }}