diff options
Diffstat (limited to 'kubernetes/so')
36 files changed, 482 insertions, 510 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..57d4fdf10b 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 @@ -257,7 +257,7 @@ appc: service: ueb poolMembers: message-router.{{ include "common.namespace" . }}:3904,message-router.{{ include "common.namespace" . }}:3904 server: - port: 8081 + port: {{ index .Values.containerPort }} tomcat: max-threads: 50 spring: diff --git a/kubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml b/kubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml index 20068a8edd..ad3a19f37e 100755 --- a/kubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml +++ b/kubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml @@ -34,6 +34,21 @@ spec: app: {{ include "common.name" . }} release: {{ .Release.Name }} spec: + initContainers: + - command: + - /root/ready.py + args: + - --container-name + - {{ .Values.mariadb.nameOverride }} + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + name: {{ include "common.name" . }}-readiness containers: - name: {{ include "common.name" . }} image: {{ include "common.repository" . }}/{{ .Values.image }} @@ -73,7 +88,7 @@ spec: envFrom: - configMapRef: name: {{ include "common.fullname" . }}-configmap - imagePullPolicy: {{ index .Values "global" "pullPolicy" }} + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - name: logs mountPath: /app/logs 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-bpmn-infra/values.yaml b/kubernetes/so/charts/so-bpmn-infra/values.yaml index 6f301b9774..44d32fa4b8 100755 --- a/kubernetes/so/charts/so-bpmn-infra/values.yaml +++ b/kubernetes/so/charts/so-bpmn-infra/values.yaml @@ -11,9 +11,25 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +################################################################# +# Global configuration defaults. +################################################################# +global: + nodePortPrefix: 302 + nodePortPrefixExt: 304 + repository: nexus3.onap.org:10001 + readinessRepository: oomk8s + readinessImage: readiness-check:2.0.0 + persistence: + mountPath: /dockerdata-nfs + +################################################################# +# Application configuration defaults. +################################################################# repository: nexus3.onap.org:10001 image: onap/so/bpmn-infra:1.3.0-STAGING-latest -pullPolicy: IfNotPresent +pullPolicy: Always + replicaCount: 1 minReadySeconds: 10 containerPort: 8081 @@ -55,6 +71,8 @@ livenessProbe: timeoutSeconds: 10 successThreshold: 1 failureThreshold: 3 +mariadb: + nameOverride: so-mariadb ingress: enabled: false nodeSelector: {} 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..320af6127e 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 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. server: - port: 8082 + port: {{ index .Values.containerPort }} tomcat: max-threads: 50 ssl-enable: false @@ -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/deployment.yaml b/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml index 20068a8edd..ad3a19f37e 100755 --- a/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml +++ b/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml @@ -34,6 +34,21 @@ spec: app: {{ include "common.name" . }} release: {{ .Release.Name }} spec: + initContainers: + - command: + - /root/ready.py + args: + - --container-name + - {{ .Values.mariadb.nameOverride }} + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + name: {{ include "common.name" . }}-readiness containers: - name: {{ include "common.name" . }} image: {{ include "common.repository" . }}/{{ .Values.image }} @@ -73,7 +88,7 @@ spec: envFrom: - configMapRef: name: {{ include "common.fullname" . }}-configmap - imagePullPolicy: {{ index .Values "global" "pullPolicy" }} + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - name: logs mountPath: /app/logs 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-catalog-db-adapter/values.yaml b/kubernetes/so/charts/so-catalog-db-adapter/values.yaml index 2083633599..105b3d4085 100755 --- a/kubernetes/so/charts/so-catalog-db-adapter/values.yaml +++ b/kubernetes/so/charts/so-catalog-db-adapter/values.yaml @@ -11,9 +11,25 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +################################################################# +# Global configuration defaults. +################################################################# +global: + nodePortPrefix: 302 + nodePortPrefixExt: 304 + repository: nexus3.onap.org:10001 + readinessRepository: oomk8s + readinessImage: readiness-check:2.0.0 + persistence: + mountPath: /dockerdata-nfs + +################################################################# +# Application configuration defaults. +################################################################# repository: nexus3.onap.org:10001 image: onap/so/catalog-db-adapter:1.3.0-STAGING-latest -pullPolicy: IfNotPresent +pullPolicy: Always + replicaCount: 1 minReadySeconds: 10 containerPort: 8082 @@ -56,6 +72,8 @@ livenessProbe: timeoutSeconds: 10 successThreshold: 1 failureThreshold: 3 +mariadb: + nameOverride: so-mariadb ingress: enabled: false nodeSelector: {} diff --git a/kubernetes/so/charts/so-mariadb/values.yaml b/kubernetes/so/charts/so-mariadb/values.yaml index 954589967c..9587c4a4cd 100755 --- a/kubernetes/so/charts/so-mariadb/values.yaml +++ b/kubernetes/so/charts/so-mariadb/values.yaml @@ -14,16 +14,28 @@ # Default values for mariadb. # This is a YAML-formatted file. # Declare variables to be passed into your templates. -global: # global defaults +################################################################# +# Global configuration defaults. +################################################################# +global: nodePortPrefix: 302 - persistence: {} + nodePortPrefixExt: 304 + repository: nexus3.onap.org:10001 readinessRepository: oomk8s + readinessImage: readiness-check:2.0.0 ubuntuInitRepository: registry.hub.docker.com + persistence: + mountPath: /dockerdata-nfs + +################################################################# +# Application configuration defaults. +################################################################# # application image repository: nexus3.onap.org:10001 image: mariadb:10.1.11 pullPolicy: Always ubuntuInitImage: oomk8s/ubuntu-init:2.0.0 + # application configuration config: mariadbRootPassword: password 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..7434b14da2 --- /dev/null +++ b/kubernetes/so/charts/so-monitoring/resources/config/overrides/override.yaml @@ -0,0 +1,17 @@ +server: + port: {{ index .Values.containerPort }} + 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..bfedc05a19 100644 --- a/kubernetes/so/charts/so-monitoring/templates/deployment.yaml +++ b/kubernetes/so/charts/so-monitoring/templates/deployment.yaml @@ -45,7 +45,7 @@ spec: volumeMounts: - name: logs mountPath: /app/logs - imagePullPolicy: {{ index .Values.pullPolicy }} + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} command: ["/bin/sh", "-c", "chown -Rf 1000:1000 /app/logs"] restartPolicy: Always containers: @@ -84,36 +84,13 @@ 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 - imagePullPolicy: {{ index .Values "global" "pullPolicy" }} + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} 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-monitoring/values.yaml b/kubernetes/so/charts/so-monitoring/values.yaml index 79170eb5d2..a0915a1223 100644 --- a/kubernetes/so/charts/so-monitoring/values.yaml +++ b/kubernetes/so/charts/so-monitoring/values.yaml @@ -16,8 +16,25 @@ # SPDX-License-Identifier: Apache-2.0 # ============LICENSE_END========================================================= # @author: gareth.roper@ericsson.com +################################################################# +# Global configuration defaults. +################################################################# +global: + nodePortPrefix: 302 + nodePortPrefixExt: 304 + repository: nexus3.onap.org:10001 + readinessRepository: oomk8s + readinessImage: readiness-check:2.0.0 + persistence: + mountPath: /dockerdata-nfs + +################################################################# +# Application configuration defaults. +################################################################# +repository: nexus3.onap.org:10001 image: onap/so/so-monitoring:latest -pullPolicy: IfNotPresent +pullPolicy: Always + replicaCount: 1 minReadySeconds: 10 containerPort: 9091 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..98b0976314 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 @@ -12,12 +12,12 @@ # See the License for the specific language governing permissions and # limitations under the License. server: - port: 8087 + port: {{ index .Values.containerPort }} 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/deployment.yaml b/kubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml index 20068a8edd..ad3a19f37e 100755 --- a/kubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml +++ b/kubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml @@ -34,6 +34,21 @@ spec: app: {{ include "common.name" . }} release: {{ .Release.Name }} spec: + initContainers: + - command: + - /root/ready.py + args: + - --container-name + - {{ .Values.mariadb.nameOverride }} + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + name: {{ include "common.name" . }}-readiness containers: - name: {{ include "common.name" . }} image: {{ include "common.repository" . }}/{{ .Values.image }} @@ -73,7 +88,7 @@ spec: envFrom: - configMapRef: name: {{ include "common.fullname" . }}-configmap - imagePullPolicy: {{ index .Values "global" "pullPolicy" }} + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - name: logs mountPath: /app/logs 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..447b7cab75 100755 --- a/kubernetes/so/charts/so-openstack-adapter/values.yaml +++ b/kubernetes/so/charts/so-openstack-adapter/values.yaml @@ -11,8 +11,25 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +################################################################# +# Global configuration defaults. +################################################################# +global: + nodePortPrefix: 302 + nodePortPrefixExt: 304 + repository: nexus3.onap.org:10001 + readinessRepository: oomk8s + readinessImage: readiness-check:2.0.0 + persistence: + mountPath: /dockerdata-nfs + +################################################################# +# Application configuration defaults. +################################################################# image: onap/so/openstack-adapter:1.3.0-STAGING-latest -pullPolicy: IfNotPresent +pullPolicy: Always +repository: nexus3.onap.org:10001 + replicaCount: 1 minReadySeconds: 10 containerPort: 8087 @@ -55,8 +72,17 @@ livenessProbe: timeoutSeconds: 10 successThreshold: 1 failureThreshold: 3 +mariadb: + nameOverride: so-mariadb 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/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-request-db-adapter/resources/config/overrides/override.yaml index 49ccdeb097..2755f94f41 100755 --- a/kubernetes/so/charts/so-request-db-adapter/resources/config/overrides/override.yaml +++ b/kubernetes/so/charts/so-request-db-adapter/resources/config/overrides/override.yaml @@ -13,7 +13,7 @@ # limitations under the License. # will be used as entry in DB to say SITE OFF/ON for healthcheck server: - port: 8083 + port: {{ index .Values.containerPort }} tomcat: max-threads: 50 ssl-enable: false diff --git a/kubernetes/so/charts/so-request-db-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-request-db-adapter/templates/deployment.yaml index 20068a8edd..ad3a19f37e 100755 --- a/kubernetes/so/charts/so-request-db-adapter/templates/deployment.yaml +++ b/kubernetes/so/charts/so-request-db-adapter/templates/deployment.yaml @@ -34,6 +34,21 @@ spec: app: {{ include "common.name" . }} release: {{ .Release.Name }} spec: + initContainers: + - command: + - /root/ready.py + args: + - --container-name + - {{ .Values.mariadb.nameOverride }} + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + name: {{ include "common.name" . }}-readiness containers: - name: {{ include "common.name" . }} image: {{ include "common.repository" . }}/{{ .Values.image }} @@ -73,7 +88,7 @@ spec: envFrom: - configMapRef: name: {{ include "common.fullname" . }}-configmap - imagePullPolicy: {{ index .Values "global" "pullPolicy" }} + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - name: logs mountPath: /app/logs 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-request-db-adapter/values.yaml b/kubernetes/so/charts/so-request-db-adapter/values.yaml index 50eb7ba776..9d350c4248 100755 --- a/kubernetes/so/charts/so-request-db-adapter/values.yaml +++ b/kubernetes/so/charts/so-request-db-adapter/values.yaml @@ -11,8 +11,25 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +################################################################# +# Global configuration defaults. +################################################################# +global: + nodePortPrefix: 302 + nodePortPrefixExt: 304 + repository: nexus3.onap.org:10001 + readinessRepository: oomk8s + readinessImage: readiness-check:2.0.0 + persistence: + mountPath: /dockerdata-nfs + +################################################################# +# Application configuration defaults. +################################################################# +repository: nexus3.onap.org:10001 image: onap/so/request-db-adapter:1.3.0-STAGING-latest -pullPolicy: IfNotPresent +pullPolicy: Always + replicaCount: 1 minReadySeconds: 10 containerPort: 8083 @@ -55,6 +72,8 @@ livenessProbe: timeoutSeconds: 10 successThreshold: 1 failureThreshold: 3 +mariadb: + nameOverride: so-mariadb ingress: enabled: false nodeSelector: {} diff --git a/kubernetes/so/charts/so-sdc-controller/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-sdc-controller/resources/config/overrides/override.yaml index 8b33067a8a..f45abbb3d3 100755 --- a/kubernetes/so/charts/so-sdc-controller/resources/config/overrides/override.yaml +++ b/kubernetes/so/charts/so-sdc-controller/resources/config/overrides/override.yaml @@ -14,7 +14,7 @@ aai: auth: 2630606608347B7124C244AB0FE34F6F server: - port: 8085 + port: {{ index .Values.containerPort }} spring: datasource: url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb diff --git a/kubernetes/so/charts/so-sdc-controller/templates/deployment.yaml b/kubernetes/so/charts/so-sdc-controller/templates/deployment.yaml index 20068a8edd..ad3a19f37e 100755 --- a/kubernetes/so/charts/so-sdc-controller/templates/deployment.yaml +++ b/kubernetes/so/charts/so-sdc-controller/templates/deployment.yaml @@ -34,6 +34,21 @@ spec: app: {{ include "common.name" . }} release: {{ .Release.Name }} spec: + initContainers: + - command: + - /root/ready.py + args: + - --container-name + - {{ .Values.mariadb.nameOverride }} + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + name: {{ include "common.name" . }}-readiness containers: - name: {{ include "common.name" . }} image: {{ include "common.repository" . }}/{{ .Values.image }} @@ -73,7 +88,7 @@ spec: envFrom: - configMapRef: name: {{ include "common.fullname" . }}-configmap - imagePullPolicy: {{ index .Values "global" "pullPolicy" }} + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - name: logs mountPath: /app/logs 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-sdc-controller/values.yaml b/kubernetes/so/charts/so-sdc-controller/values.yaml index 2981a82c0d..e996c24da6 100755 --- a/kubernetes/so/charts/so-sdc-controller/values.yaml +++ b/kubernetes/so/charts/so-sdc-controller/values.yaml @@ -11,8 +11,25 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +################################################################# +# Global configuration defaults. +################################################################# +global: + nodePortPrefix: 302 + nodePortPrefixExt: 304 + repository: nexus3.onap.org:10001 + readinessRepository: oomk8s + readinessImage: readiness-check:2.0.0 + persistence: + mountPath: /dockerdata-nfs + +################################################################# +# Application configuration defaults. +################################################################# +repository: nexus3.onap.org:10001 image: onap/so/sdc-controller:1.3.0-STAGING-latest -pullPolicy: IfNotPresent +pullPolicy: Always + replicaCount: 1 minReadySeconds: 10 containerPort: 8085 @@ -55,6 +72,8 @@ livenessProbe: timeoutSeconds: 10 successThreshold: 1 failureThreshold: 3 +mariadb: + nameOverride: so-mariadb ingress: enabled: false nodeSelector: {} diff --git a/kubernetes/so/charts/so-sdnc-adapter/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-sdnc-adapter/resources/config/overrides/override.yaml index 615988066a..2ebdfb3a7f 100755 --- a/kubernetes/so/charts/so-sdnc-adapter/resources/config/overrides/override.yaml +++ b/kubernetes/so/charts/so-sdnc-adapter/resources/config/overrides/override.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. server: - port: 8086 + port: {{ index .Values.containerPort }} mso: async: core-pool-size: 50 diff --git a/kubernetes/so/charts/so-sdnc-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-sdnc-adapter/templates/deployment.yaml index 20068a8edd..56b628c539 100755 --- a/kubernetes/so/charts/so-sdnc-adapter/templates/deployment.yaml +++ b/kubernetes/so/charts/so-sdnc-adapter/templates/deployment.yaml @@ -73,7 +73,7 @@ spec: envFrom: - configMapRef: name: {{ include "common.fullname" . }}-configmap - imagePullPolicy: {{ index .Values "global" "pullPolicy" }} + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - name: logs mountPath: /app/logs 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 }} diff --git a/kubernetes/so/charts/so-sdnc-adapter/values.yaml b/kubernetes/so/charts/so-sdnc-adapter/values.yaml index 4bab856b98..11abcd8415 100755 --- a/kubernetes/so/charts/so-sdnc-adapter/values.yaml +++ b/kubernetes/so/charts/so-sdnc-adapter/values.yaml @@ -11,8 +11,25 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +################################################################# +# Global configuration defaults. +################################################################# +global: + nodePortPrefix: 302 + nodePortPrefixExt: 304 + repository: nexus3.onap.org:10001 + readinessRepository: oomk8s + readinessImage: readiness-check:2.0.0 + persistence: + mountPath: /dockerdata-nfs + +################################################################# +# Application configuration defaults. +################################################################# +repository: nexus3.onap.org:10001 image: onap/so/sdnc-adapter:1.3.0-STAGING-latest -pullPolicy: IfNotPresent +pullPolicy: Always + replicaCount: 1 minReadySeconds: 10 containerPort: 8086 diff --git a/kubernetes/so/charts/so-vfc-adapter/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-vfc-adapter/resources/config/overrides/override.yaml index b8108ab8f8..da26017c4d 100755 --- a/kubernetes/so/charts/so-vfc-adapter/resources/config/overrides/override.yaml +++ b/kubernetes/so/charts/so-vfc-adapter/resources/config/overrides/override.yaml @@ -25,7 +25,7 @@ spring: validation-query: select 1 test-on-borrow: true server: - port: 8084 + port: {{ index .Values.containerPort }} tomcat: max-threads: 50 mso: diff --git a/kubernetes/so/charts/so-vfc-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-vfc-adapter/templates/deployment.yaml index 20068a8edd..ad3a19f37e 100755 --- a/kubernetes/so/charts/so-vfc-adapter/templates/deployment.yaml +++ b/kubernetes/so/charts/so-vfc-adapter/templates/deployment.yaml @@ -34,6 +34,21 @@ spec: app: {{ include "common.name" . }} release: {{ .Release.Name }} spec: + initContainers: + - command: + - /root/ready.py + args: + - --container-name + - {{ .Values.mariadb.nameOverride }} + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + name: {{ include "common.name" . }}-readiness containers: - name: {{ include "common.name" . }} image: {{ include "common.repository" . }}/{{ .Values.image }} @@ -73,7 +88,7 @@ spec: envFrom: - configMapRef: name: {{ include "common.fullname" . }}-configmap - imagePullPolicy: {{ index .Values "global" "pullPolicy" }} + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - name: logs mountPath: /app/logs diff --git a/kubernetes/so/charts/so-vfc-adapter/values.yaml b/kubernetes/so/charts/so-vfc-adapter/values.yaml index b0c3b0114e..3d9de229e9 100755 --- a/kubernetes/so/charts/so-vfc-adapter/values.yaml +++ b/kubernetes/so/charts/so-vfc-adapter/values.yaml @@ -11,8 +11,25 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +################################################################# +# Global configuration defaults. +################################################################# +global: + nodePortPrefix: 302 + nodePortPrefixExt: 304 + repository: nexus3.onap.org:10001 + readinessRepository: oomk8s + readinessImage: readiness-check:2.0.0 + persistence: + mountPath: /dockerdata-nfs + +################################################################# +# Application configuration defaults. +################################################################# +repository: nexus3.onap.org:10001 image: onap/so/vfc-adapter:1.3.0-STAGING-latest -pullPolicy: IfNotPresent +pullPolicy: Always + replicaCount: 1 minReadySeconds: 10 containerPort: 8084 @@ -55,6 +72,8 @@ livenessProbe: timeoutSeconds: 10 successThreshold: 1 failureThreshold: 3 +mariadb: + nameOverride: so-mariadb ingress: enabled: false nodeSelector: {} diff --git a/kubernetes/so/resources/config/overrides/override.yaml b/kubernetes/so/resources/config/overrides/override.yaml index 1806b20dbb..6adc2120fb 100755 --- a/kubernetes/so/resources/config/overrides/override.yaml +++ b/kubernetes/so/resources/config/overrides/override.yaml @@ -1,5 +1,5 @@ server: - port: 8080 + port: {{ index .Values.containerPort }} tomcat: max-threads: 50 ssl-enable: false diff --git a/kubernetes/so/templates/deployment.yaml b/kubernetes/so/templates/deployment.yaml index 20068a8edd..ad3a19f37e 100755 --- a/kubernetes/so/templates/deployment.yaml +++ b/kubernetes/so/templates/deployment.yaml @@ -34,6 +34,21 @@ spec: app: {{ include "common.name" . }} release: {{ .Release.Name }} spec: + initContainers: + - command: + - /root/ready.py + args: + - --container-name + - {{ .Values.mariadb.nameOverride }} + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + name: {{ include "common.name" . }}-readiness containers: - name: {{ include "common.name" . }} image: {{ include "common.repository" . }}/{{ .Values.image }} @@ -73,7 +88,7 @@ spec: envFrom: - configMapRef: name: {{ include "common.fullname" . }}-configmap - imagePullPolicy: {{ index .Values "global" "pullPolicy" }} + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - name: logs mountPath: /app/logs diff --git a/kubernetes/so/templates/service.yaml b/kubernetes/so/templates/service.yaml index a813a18030..ab58ea6ede 100755 --- a/kubernetes/so/templates/service.yaml +++ b/kubernetes/so/templates/service.yaml @@ -24,362 +24,362 @@ metadata: annotations: msb.onap.org/service-info: '[ { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/cloudResources/{version:[vV][1]}/operationalEnvironments", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/cloudResources/{version:[vV][1]}/operationalEnvironments/{operationalEnvironmentId}/activate", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/cloudResources/{version:[vV][1]}/operationalEnvironments/{operationalEnvironmentId}/deactivate", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/cloudResourcesRequests/{version:[vV][1]}/{requestId}/unlock", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/cloudResourcesRequests/{version:[vV][1]}", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/orchestrationRequests/{version:[vV][4-7]}/{requestId}", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/orchestrationRequests/{version:[vV][4-7]}", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/orchestrationRequests/{version:[vV][4-7]}/{requestId}/unlock", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/activate", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/deactivate", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][7]}/serviceInstances/assign", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/serviceInstantiation/{version:[vV][7]}/serviceInstances/{serviceInstanceId}/unassign", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/configurations", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/configurations/{configurationInstanceId}", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/configurations/{configurationInstanceId}/enablePort", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/configurations/{configurationInstanceId}/disablePort", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/configurations/{configurationInstanceId}/activate", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/configurations/{configurationInstanceId}/deactivate", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][6-7]}/serviceInstances/{serviceInstanceId}/addRelationships", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/serviceInstantiation/{version:[vV][6-7]}/serviceInstances/{serviceInstanceId}/removeRelationships", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/replace", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/serviceInstantiation/{version:[vV][6-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/applyUpdatedConfig", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfmoduleInstanceId}/replace", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfmoduleInstanceId}", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][6-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/inPlaceSoftwareUpdate", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfmoduleInstanceId}", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/serviceInstantiation/{version:[vV][7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfmoduleInstanceId}/deactivateAndCloudDelete", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/serviceInstantiation/{version:[vV][7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/scaleOut", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/volumeGroups", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/volumeGroups/{volumeGroupInstanceId}", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/vnfs/{vnfInstanceId}/volumeGroups/{volumeGroupInstanceId}", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/serviceInstantiation/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/networks", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/networks/{networkInstanceId}", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" }, { - "serviceName": "so/apih", + "serviceName": "so", "version": "v1", "url": "/onap/so/infra/serviceInstantiationRequests/{version:[vV][5-7]}/serviceInstances/{serviceInstanceId}/networks/{networkInstanceId}", "protocol": "REST", - "port": "{{ .Values.service.externalPort }}", + "port": "{{ .Values.service.internalPort }}", "visualRange":"0", "lb_policy":"ip_hash" } @@ -398,4 +398,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/values.yaml b/kubernetes/so/values.yaml index 60d0424e6f..8a504beb3b 100755 --- a/kubernetes/so/values.yaml +++ b/kubernetes/so/values.yaml @@ -11,9 +11,25 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +################################################################# +# Global configuration defaults. +################################################################# +global: + nodePortPrefix: 302 + nodePortPrefixExt: 304 + repository: nexus3.onap.org:10001 + readinessRepository: oomk8s + readinessImage: readiness-check:2.0.0 + persistence: + mountPath: /dockerdata-nfs + +################################################################# +# Application configuration defaults. +################################################################# repository: nexus3.onap.org:10001 image: onap/so/api-handler-infra:1.3.0-STAGING-latest -pullPolicy: IfNotPresent +pullPolicy: Always + replicaCount: 1 minReadySeconds: 10 containerPort: 8080 @@ -55,13 +71,25 @@ livenessProbe: timeoutSeconds: 10 successThreshold: 1 failureThreshold: 3 -global: - nodePortPrefix: 302 - # docker repository - repository: nexus3.onap.org:10001 - # image pull Policy - pullPolicy: IfNotPresent mariadb: - nameOverride: so-db + nameOverride: so-mariadb +so-bpmn-infra: + mariadb: + nameOverride: so-mariadb +so-catalog-db-adapter: + mariadb: + nameOverride: so-mariadb +so-openstack-adapter: + mariadb: + nameOverride: so-mariadb +so-request-db-adapter: + mariadb: + nameOverride: so-mariadb +so-sdc-controller: + mariadb: + nameOverride: so-mariadb +so-vfc-adapter: + mariadb: + nameOverride: so-mariadb nodeSelector: {} affinity: {} |