summaryrefslogtreecommitdiffstats
path: root/kubernetes/so/charts
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/so/charts')
-rwxr-xr-xkubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml12
-rwxr-xr-xkubernetes/so/charts/so-bpmn-infra/templates/service.yaml23
-rwxr-xr-xkubernetes/so/charts/so-catalog-db-adapter/resources/config/overrides/override.yaml25
-rwxr-xr-xkubernetes/so/charts/so-catalog-db-adapter/templates/service.yaml104
-rw-r--r--kubernetes/so/charts/so-monitoring/resources/config/overrides/override.yaml17
-rw-r--r--kubernetes/so/charts/so-monitoring/templates/configmap.yaml18
-rw-r--r--kubernetes/so/charts/so-monitoring/templates/deployment.yaml26
-rwxr-xr-xkubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml26
-rwxr-xr-xkubernetes/so/charts/so-openstack-adapter/templates/service.yaml50
-rwxr-xr-xkubernetes/so/charts/so-openstack-adapter/values.yaml7
-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
13 files changed, 74 insertions, 393 deletions
diff --git a/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml
index 7bab7fbbac..19c6028202 100755
--- a/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-bpmn-infra/resources/config/overrides/override.yaml
@@ -68,12 +68,12 @@ mso:
vnf:
endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/VnfAdapter
rest:
- endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/rest/vnfs/v1/vnfs
+ endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/rest/v1/vnfs
volume-groups:
rest:
endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}g:8087/services/rest/v1/volume-groups
vnf-async:
- endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/VnfAsyncAdapter
+ endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/VnfAsync
bpmn:
process:
historyTimeToLive: '30'
@@ -212,13 +212,13 @@ mso:
callback: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/SDNCAdapterCallbackService
vnfadapter:
create:
- callback: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/VNFAdaptercallback
+ callback: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/vnfAdapterNotify
delete:
- callback: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/VNFAdaptercallback
+ callback: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/vnfAdapterNotify
query:
- callback: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/VNFAdaptercallback
+ callback: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/vnfAdapterNotify
rollback:
- callback: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/VNFAdaptercallback
+ callback: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/vnfAdapterNotify
global:
dmaap:
username: testuser
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/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-catalog-db-adapter/resources/config/overrides/override.yaml
index 601cd49eae..bdf82b6fbd 100755
--- a/kubernetes/so/charts/so-catalog-db-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-catalog-db-adapter/resources/config/overrides/override.yaml
@@ -26,26 +26,6 @@ mso:
db:
auth: Basic YnBlbDpwYXNzd29yZDEk
spring:
- datasource:
- url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
- username: ${DB_USERNAME}
- password: ${DB_PASSWORD}
- driver-class-name: org.mariadb.jdbc.Driver
- initialize: false
- initialization-mode: never
- dbcp2:
- initial-size: 5
- max-total: 20
- validation-query: select 1
- test-on-borrow: true
- jpa:
- generate-ddl: false
- show-sql: false
- hibernate:
- ddl-auto: validate
- naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
- enable-lazy-load-no-trans: true
- database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
security:
usercredentials:
-
@@ -59,8 +39,3 @@ spring:
#Actuator
management:
context-path: /manage
-flyway:
- baseline-on-migrate: true
- url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
- username: ${DB_USERNAME}
- password: ${DB_PASSWORD}
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-monitoring/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-monitoring/resources/config/overrides/override.yaml
new file mode 100644
index 0000000000..c7e958c5a9
--- /dev/null
+++ b/kubernetes/so/charts/so-monitoring/resources/config/overrides/override.yaml
@@ -0,0 +1,17 @@
+server:
+ port: 8088
+ tomcat:
+ max-threads: 50
+ssl-enable: false
+camunda:
+ rest:
+ api:
+ url: http://bpmn-infra.{{ include "common.namespace" . }}:8081/engine-rest/engine/
+ engine: default
+ auth: Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==
+mso:
+ database:
+ rest:
+ api:
+ url: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083/infraActiveRequests/
+ auth: Basic YnBlbDpwYXNzd29yZDEk
diff --git a/kubernetes/so/charts/so-monitoring/templates/configmap.yaml b/kubernetes/so/charts/so-monitoring/templates/configmap.yaml
index f7860108d8..489d5f48fc 100644
--- a/kubernetes/so/charts/so-monitoring/templates/configmap.yaml
+++ b/kubernetes/so/charts/so-monitoring/templates/configmap.yaml
@@ -24,3 +24,21 @@ kind: ConfigMap
metadata:
name: {{ include "common.fullname" . }}-configmap
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: {{ include "common.fullname" . }}-app-configmap
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+data:
+{{ tpl (.Files.Glob "resources/config/overrides/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/so/charts/so-monitoring/templates/deployment.yaml b/kubernetes/so/charts/so-monitoring/templates/deployment.yaml
index 79d466227d..e11e404e8d 100644
--- a/kubernetes/so/charts/so-monitoring/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-monitoring/templates/deployment.yaml
@@ -84,26 +84,6 @@ spec:
secretKeyRef:
name: {{ .Release.Name}}-so-db-secrets
key: mariadb.admin.password
- - name: CADI_KEYSTORE_PASSWORD
- valueFrom:
- secretKeyRef:
- name: {{ .Release.Name}}-so-ssl-pwd-secret
- key: cadi_keystore_password
- - name: CADI_TRUSTSTORE_PASSWORD
- valueFrom:
- secretKeyRef:
- name: {{ .Release.Name}}-so-ssl-pwd-secret
- key: cadi_truststore_password
- - name: MSO_KEYSTORE_PASSWORD
- valueFrom:
- secretKeyRef:
- name: {{ .Release.Name}}-so-ssl-client-secret
- key: keystore_password
- - name: MSO_TRUSTSTORE_PASSWORD
- valueFrom:
- secretKeyRef:
- name: {{ .Release.Name}}-so-ssl-client-secret
- key: truststore_password
envFrom:
- configMapRef:
name: {{ include "common.fullname" . }}-configmap
@@ -111,9 +91,6 @@ spec:
volumeMounts:
- name: logs
mountPath: /app/logs
- - name: certs
- mountPath: /app/certs/
- readOnly: true
- name: config
mountPath: /app/config
readOnly: true
@@ -137,9 +114,6 @@ spec:
volumes:
- name: logs
emptyDir: {}
- - name: certs
- secret:
- secretName: {{ .Release.Name}}-so-ssl-secret
- name: config
configMap:
name: {{ include "common.fullname" . }}-app-configmap
diff --git a/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml
index c0f7851103..f7e9e47947 100755
--- a/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml
@@ -16,8 +16,8 @@ server:
spring:
datasource:
url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
- username: ${DB_USERNAME}
- password: ${DB_PASSWORD}
+ username: ${DB_ADMIN_USERNAME}
+ password: ${DB_ADMIN_PASSWORD}
driver-class-name: org.mariadb.jdbc.Driver
dbcp2:
initial-size: 5
@@ -112,11 +112,20 @@ cloud_config:
identity_url: "https://identity.api.rackspacecloud.com/v2.0"
mso_id: "RACKSPACE_ACCOUNT_ID"
mso_pass: "RACKSPACE_ACCOUNT_APIKEY"
- admin_tenant: "service"
+ admin_tenant: "{{ .Values.config.openStackServiceTenantName }}"
member_role: "admin"
tenant_metadata: true
identity_server_type: "KEYSTONE"
identity_authentication_type: "RACKSPACE_APIKEY"
+ DEFAULT_KEYSTONE:
+ identity_url: "{{ .Values.config.openStackKeyStoneUrl }}"
+ mso_id: "{{ .Values.config.openStackUserName }}"
+ mso_pass: "{{ .Values.config.openStackEncryptedPasswordHere }}"
+ admin_tenant: "{{ .Values.config.openStackServiceTenantName }}"
+ member_role: "admin"
+ tenant_metadata: true
+ identity_server_type: "KEYSTONE"
+ identity_authentication_type: "USERNAME_PASSWORD"
cloud_sites:
Dallas:
region_id: "DFW"
@@ -133,8 +142,13 @@ cloud_config:
clli: "ORD"
aic_version: "2.5"
identity_service_id: "RAX_KEYSTONE"
+ RegionOne:
+ region_id: "RegionOne"
+ clli: "RegionOne"
+ aic_version: "2.5"
+ identity_service_id: "DEFAULT_KEYSTONE"
DEFAULT:
- region_id: "DFW"
- clli: "DFW"
+ region_id: "{{ .Values.config.openStackRegion }}"
+ clli: "{{ .Values.config.openStackRegion }}"
aic_version: "2.5"
- identity_service_id: "RAX_KEYSTONE"
+ identity_service_id: "DEFAULT_KEYSTONE"
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-openstack-adapter/values.yaml b/kubernetes/so/charts/so-openstack-adapter/values.yaml
index 867e599202..f30de2799f 100755
--- a/kubernetes/so/charts/so-openstack-adapter/values.yaml
+++ b/kubernetes/so/charts/so-openstack-adapter/values.yaml
@@ -57,6 +57,13 @@ livenessProbe:
failureThreshold: 3
ingress:
enabled: false
+config:
+ openStackUserName: "vnf_user"
+ openStackRegion: "RegionOne"
+ openStackKeyStoneUrl: "http://1.2.3.4:5000/v2.0"
+ openStackServiceTenantName: "service"
+ openStackEncryptedPasswordHere: "c124921a3a0efbe579782cde8227681e"
+ openStackTenantId: "d570c718cbc545029f40e50b75eb13df"
nodeSelector: {}
tolerations: []
affinity: {}
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 }}