aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/so/charts
diff options
context:
space:
mode:
authorAlexis de Talhouƫt <alexis.de_talhouet@bell.ca>2018-10-12 17:56:06 +0000
committerGerrit Code Review <gerrit@onap.org>2018-10-12 17:56:06 +0000
commitf494bb62332bbb12bd66d7fd1a726e20ac266181 (patch)
treeef983b211a898fbce90b09d9c8464219a09c4232 /kubernetes/so/charts
parent1a56e161a616a8d84caa291f92fbf87b5ba4a6bc (diff)
parentf8b4b96163072c2695617ab11dc13a6e2fc702e4 (diff)
Merge "Update MSB annotations SO helm chart service"
Diffstat (limited to 'kubernetes/so/charts')
-rwxr-xr-xkubernetes/so/charts/so-bpmn-infra/templates/service.yaml23
-rwxr-xr-xkubernetes/so/charts/so-catalog-db-adapter/templates/service.yaml104
-rwxr-xr-xkubernetes/so/charts/so-openstack-adapter/templates/service.yaml50
-rwxr-xr-xkubernetes/so/charts/so-request-db-adapter/templates/service.yaml113
-rwxr-xr-xkubernetes/so/charts/so-sdc-controller/templates/service.yaml23
-rwxr-xr-xkubernetes/so/charts/so-sdnc-adapter/templates/service.yaml23
6 files changed, 6 insertions, 330 deletions
diff --git a/kubernetes/so/charts/so-bpmn-infra/templates/service.yaml b/kubernetes/so/charts/so-bpmn-infra/templates/service.yaml
index 1ad478667c..741614886c 100755
--- a/kubernetes/so/charts/so-bpmn-infra/templates/service.yaml
+++ b/kubernetes/so/charts/so-bpmn-infra/templates/service.yaml
@@ -21,27 +21,6 @@ metadata:
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
- annotations:
- msb.onap.org/service-info: '[
- {
- "serviceName": "so/bpmn",
- "version": "v1",
- "url": "/VNFAdaptercallback/",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1" ,
- "lb_policy":"ip_hash"
- },
- {
- "serviceName": "so/bpmn",
- "version": "v1",
- "url": "/SDNCAdapterCallbackService",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1",
- "lb_policy":"ip_hash"
- }
- ]'
spec:
type: {{ .Values.service.type }}
ports:
@@ -56,4 +35,4 @@ spec:
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }} \ No newline at end of file
+ release: {{ .Release.Name }}
diff --git a/kubernetes/so/charts/so-catalog-db-adapter/templates/service.yaml b/kubernetes/so/charts/so-catalog-db-adapter/templates/service.yaml
index db3bb7848b..741614886c 100755
--- a/kubernetes/so/charts/so-catalog-db-adapter/templates/service.yaml
+++ b/kubernetes/so/charts/so-catalog-db-adapter/templates/service.yaml
@@ -21,108 +21,6 @@ metadata:
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
- annotations:
- msb.onap.org/service-info: '[
- {
- "serviceName": "so/catdb",
- "version": "v1",
- "url": "/services",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1" ,
- "lb_policy":"ip_hash"
- },
- {
- "serviceName": "so/catdb",
- "version": "v1",
- "url": "/{version: v[0-9]+}/vnfResources/{vnfModelCustomizationUuid}",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1",
- "lb_policy":"ip_hash"
- },
- {
- "serviceName": "so/catdb",
- "version": "v1",
- "url": "/{version: v[0-9]+}/serviceVnfs",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1",
- "lb_policy":"ip_hash"
- },
- {
- "serviceName": "so/catdb",
- "version": "v1",
- "url": "/{version: v[0-9]+}/networkResources/{networkModelCustomizationUuid}",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1",
- "lb_policy":"ip_hash"
- },
- {
- "serviceName": "so/catdb",
- "version": "v1",
- "url": "/{version: v[0-9]+}/serviceNetworks",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1",
- "lb_policy":"ip_hash"
- },
- {
- "serviceName": "so/catdb",
- "version": "v1",
- "url": "/{version: v[0-9]+}/serviceResources",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1",
- "lb_policy":"ip_hash"
- },
- {
- "serviceName": "so/catdb",
- "version": "v1",
- "url": "/{version: v[0-9]+}/allottedResources/{arModelCustomizationUuid}",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1",
- "lb_policy":"ip_hash"
- },
- {
- "serviceName": "so/catdb",
- "version": "v1",
- "url": "/{version: v[0-9]+}/serviceAllottedResources",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1",
- "lb_policy":"ip_hash"
- },
- {
- "serviceName": "so/catdb",
- "version": "v1",
- "url": "/{version: v[0-9]+}/vfModules",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1",
- "lb_policy":"ip_hash"
- },
- {
- "serviceName": "so/catdb",
- "version": "v1",
- "url": "/{version: v[0-9]+}/serviceToscaCsar",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1",
- "lb_policy":"ip_hash"
- },
- {
- "serviceName": "so/catdb",
- "version": "v1",
- "url": "/{version: v[0-9]+}/resourceRecipe",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1",
- "lb_policy":"ip_hash"
- }
- ]'
spec:
type: {{ .Values.service.type }}
ports:
@@ -137,4 +35,4 @@ spec:
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }} \ No newline at end of file
+ release: {{ .Release.Name }}
diff --git a/kubernetes/so/charts/so-openstack-adapter/templates/service.yaml b/kubernetes/so/charts/so-openstack-adapter/templates/service.yaml
index 031616a4f3..741614886c 100755
--- a/kubernetes/so/charts/so-openstack-adapter/templates/service.yaml
+++ b/kubernetes/so/charts/so-openstack-adapter/templates/service.yaml
@@ -21,54 +21,6 @@ metadata:
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
- annotations:
- msb.onap.org/service-info: '[
- {
- "serviceName": "so/openstack",
- "version": "v1",
- "url": "/NetworkAdapter",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1",
- "lb_policy":"ip_hash"
- },
- {
- "serviceName": "so/openstack",
- "version": "v1",
- "url": "/NetworkAdapterAsync",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1",
- "lb_policy":"ip_hash"
- },
- {
- "serviceName": "so/openstack",
- "version": "v1",
- "url": "/TenantAdapter",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1",
- "lb_policy":"ip_hash"
- },
- {
- "serviceName": "so/openstack",
- "version": "v1",
- "url": "/VnfAdapter",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1",
- "lb_policy":"ip_hash"
- },
- {
- "serviceName": "so/openstack",
- "version": "v1",
- "url": "/VnfCloudifyAdapterImpl",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1",
- "lb_policy":"ip_hash"
- }
- ]'
spec:
type: {{ .Values.service.type }}
ports:
@@ -83,4 +35,4 @@ spec:
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }} \ No newline at end of file
+ release: {{ .Release.Name }}
diff --git a/kubernetes/so/charts/so-request-db-adapter/templates/service.yaml b/kubernetes/so/charts/so-request-db-adapter/templates/service.yaml
index 085d986eb4..741614886c 100755
--- a/kubernetes/so/charts/so-request-db-adapter/templates/service.yaml
+++ b/kubernetes/so/charts/so-request-db-adapter/templates/service.yaml
@@ -21,117 +21,6 @@ metadata:
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
- annotations:
- msb.onap.org/service-info: '[
- {
- "serviceName": "so/reqdb",
- "version": "v1",
- "url": "/services",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1" ,
- "lb_policy":"ip_hash"
- },
- {
- "serviceName": "so/reqdb",
- "version": "v1",
- "url": "/RequestsDbAdapter/updateInfraRequest",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1",
- "lb_policy":"ip_hash"
- },
- {
- "serviceName": "so/reqdb",
- "version": "v1",
- "url": "/RequestsDbAdapter/getInfraRequest",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1",
- "lb_policy":"ip_hash"
- },
- {
- "serviceName": "so/reqdb",
- "version": "v1",
- "url": "/RequestsDbAdapter/getSiteStatus",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1",
- "lb_policy":"ip_hash"
- },
- {
- "serviceName": "so/reqdb",
- "version": "v1",
- "url": "/RequestsDbAdapter/updateServiceOperationStatus",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1",
- "lb_policy":"ip_hash"
- },
- {
- "serviceName": "so/reqdb",
- "version": "v1",
- "url": "/RequestsDbAdapter/initResourceOperationStatus",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1",
- "lb_policy":"ip_hash"
- },
- {
- "serviceName": "so/reqdb",
- "version": "v1",
- "url": "/RequestsDbAdapter/getResourceOperationStatus",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1",
- "lb_policy":"ip_hash"
- },
- {
- "serviceName": "so/reqdb",
- "version": "v1",
- "url": "/RequestsDbAdapter/updateResourceOperationStatus",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1",
- "lb_policy":"ip_hash"
- },
- {
- "serviceName": "so/reqdb",
- "version": "v1",
- "url": "/RequestsDbAdapter/infraActiveRequests/getCloudOrchestrationFiltersFromInfraActive",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1",
- "lb_policy":"ip_hash"
- },
- {
- "serviceName": "so/reqdb",
- "version": "v1",
- "url": "/RequestsDbAdapter/infraActiveRequests/getOrchestrationFiltersFromInfraActive",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1",
- "lb_policy":"ip_hash"
- },
- {
- "serviceName": "so/reqdb",
- "version": "v1",
- "url": "/RequestsDbAdapter/infraActiveRequests/checkVnfIdStatus/{operationalEnvironmentId}",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1",
- "lb_policy":"ip_hash"
- },
- {
- "serviceName": "so/reqdb",
- "version": "v1",
- "url": "/RequestsDbAdapter/infraActiveRequests/checkInstanceNameDuplicate",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1",
- "lb_policy":"ip_hash"
- }
- ]'
spec:
type: {{ .Values.service.type }}
ports:
@@ -146,4 +35,4 @@ spec:
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }} \ No newline at end of file
+ release: {{ .Release.Name }}
diff --git a/kubernetes/so/charts/so-sdc-controller/templates/service.yaml b/kubernetes/so/charts/so-sdc-controller/templates/service.yaml
index 9746e3f151..741614886c 100755
--- a/kubernetes/so/charts/so-sdc-controller/templates/service.yaml
+++ b/kubernetes/so/charts/so-sdc-controller/templates/service.yaml
@@ -21,27 +21,6 @@ metadata:
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
- annotations:
- msb.onap.org/service-info: '[
- {
- "serviceName": "so/sdc",
- "version": "v1",
- "url": "/treatNotification/v1",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1",
- "lb_policy":"ip_hash"
- },
- {
- "serviceName": "so/sdc",
- "version": "v1",
- "url": "/statusData/v1",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1",
- "lb_policy":"ip_hash"
- }
- ]'
spec:
type: {{ .Values.service.type }}
ports:
@@ -56,4 +35,4 @@ spec:
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }} \ No newline at end of file
+ release: {{ .Release.Name }}
diff --git a/kubernetes/so/charts/so-sdnc-adapter/templates/service.yaml b/kubernetes/so/charts/so-sdnc-adapter/templates/service.yaml
index 39f96a7ffa..741614886c 100755
--- a/kubernetes/so/charts/so-sdnc-adapter/templates/service.yaml
+++ b/kubernetes/so/charts/so-sdnc-adapter/templates/service.yaml
@@ -21,27 +21,6 @@ metadata:
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
- annotations:
- msb.onap.org/service-info: '[
- {
- "serviceName": "so/sdnc",
- "version": "v1",
- "url": "/SDNCAdapter",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1",
- "lb_policy":"ip_hash"
- },
- {
- "serviceName": "so/sdnc",
- "version": "v1",
- "url": "/SDNCNotify/SNIROResponse/{correlator}",
- "protocol": "REST",
- "port": "{{ .Values.service.externalPort }}",
- "visualRange":"1",
- "lb_policy":"ip_hash"
- }
- ]'
spec:
type: {{ .Values.service.type }}
ports:
@@ -56,4 +35,4 @@ spec:
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }} \ No newline at end of file
+ release: {{ .Release.Name }}