diff options
Diffstat (limited to 'kubernetes/so/charts/so-catalog-db-adapter')
| -rwxr-xr-x | kubernetes/so/charts/so-catalog-db-adapter/resources/config/overrides/override.yaml | 25 | ||||
| -rwxr-xr-x | kubernetes/so/charts/so-catalog-db-adapter/templates/service.yaml | 104 |
2 files changed, 1 insertions, 128 deletions
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 }} |