diff options
70 files changed, 875 insertions, 587 deletions
diff --git a/kubernetes/aaf/charts/aaf-cm/values.yaml b/kubernetes/aaf/charts/aaf-cm/values.yaml index 9ddb366064..3d6438dcff 100644 --- a/kubernetes/aaf/charts/aaf-cm/values.yaml +++ b/kubernetes/aaf/charts/aaf-cm/values.yaml @@ -25,7 +25,7 @@ flavor: small ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/aaf/aaf_cm:2.1.2-SNAPSHOT +image: onap/aaf/aaf_cm:2.1.4-SNAPSHOT pullPolicy: Always diff --git a/kubernetes/aaf/charts/aaf-cs/templates/deployment.yaml b/kubernetes/aaf/charts/aaf-cs/templates/deployment.yaml index e0d500c420..d52e877154 100644 --- a/kubernetes/aaf/charts/aaf-cs/templates/deployment.yaml +++ b/kubernetes/aaf/charts/aaf-cs/templates/deployment.yaml @@ -63,8 +63,8 @@ spec: periodSeconds: {{ .Values.liveness.periodSeconds }} {{ end -}} readinessProbe: - exec: - command: ["/bin/bash","/opt/app/aaf/cass_init/cmd.sh","wait"] + tcpSocket: + port: {{ .Values.service.internalPort3 }} initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} periodSeconds: {{ .Values.readiness.periodSeconds }} resources: diff --git a/kubernetes/aaf/charts/aaf-cs/values.yaml b/kubernetes/aaf/charts/aaf-cs/values.yaml index a914b542f4..93dd58935c 100644 --- a/kubernetes/aaf/charts/aaf-cs/values.yaml +++ b/kubernetes/aaf/charts/aaf-cs/values.yaml @@ -24,7 +24,7 @@ flavor: small ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/aaf/aaf_cass:2.1.2-SNAPSHOT +image: onap/aaf/aaf_cass:2.1.4-SNAPSHOT pullPolicy: Always # application configuration diff --git a/kubernetes/aaf/charts/aaf-fs/values.yaml b/kubernetes/aaf/charts/aaf-fs/values.yaml index 0f0d7c47e7..e656c43334 100644 --- a/kubernetes/aaf/charts/aaf-fs/values.yaml +++ b/kubernetes/aaf/charts/aaf-fs/values.yaml @@ -25,7 +25,7 @@ flavor: small ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/aaf/aaf_fs:2.1.2-SNAPSHOT +image: onap/aaf/aaf_fs:2.1.4-SNAPSHOT pullPolicy: Always diff --git a/kubernetes/aaf/charts/aaf-gui/values.yaml b/kubernetes/aaf/charts/aaf-gui/values.yaml index d44ac5ed46..756bf2f5e0 100644 --- a/kubernetes/aaf/charts/aaf-gui/values.yaml +++ b/kubernetes/aaf/charts/aaf-gui/values.yaml @@ -25,7 +25,7 @@ flavor: small ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/aaf/aaf_gui:2.1.2-SNAPSHOT +image: onap/aaf/aaf_gui:2.1.4-SNAPSHOT pullPolicy: Always diff --git a/kubernetes/aaf/charts/aaf-hello/values.yaml b/kubernetes/aaf/charts/aaf-hello/values.yaml index 9f694be8b8..b8bbaed9a9 100644 --- a/kubernetes/aaf/charts/aaf-hello/values.yaml +++ b/kubernetes/aaf/charts/aaf-hello/values.yaml @@ -25,7 +25,7 @@ flavor: small ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/aaf/aaf_hello:2.1.2-SNAPSHOT +image: onap/aaf/aaf_hello:2.1.4-SNAPSHOT pullPolicy: Always diff --git a/kubernetes/aaf/charts/aaf-locate/values.yaml b/kubernetes/aaf/charts/aaf-locate/values.yaml index ba1e56373c..16c02cd965 100644 --- a/kubernetes/aaf/charts/aaf-locate/values.yaml +++ b/kubernetes/aaf/charts/aaf-locate/values.yaml @@ -25,7 +25,7 @@ flavor: small ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/aaf/aaf_locate:2.1.2-SNAPSHOT +image: onap/aaf/aaf_locate:2.1.4-SNAPSHOT pullPolicy: Always diff --git a/kubernetes/aaf/charts/aaf-oauth/values.yaml b/kubernetes/aaf/charts/aaf-oauth/values.yaml index e52075a447..72c793a150 100644 --- a/kubernetes/aaf/charts/aaf-oauth/values.yaml +++ b/kubernetes/aaf/charts/aaf-oauth/values.yaml @@ -25,7 +25,7 @@ flavor: small ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/aaf/aaf_oauth:2.1.2-SNAPSHOT +image: onap/aaf/aaf_oauth:2.1.4-SNAPSHOT pullPolicy: Always diff --git a/kubernetes/aaf/charts/aaf-service/values.yaml b/kubernetes/aaf/charts/aaf-service/values.yaml index 7ec6364f3c..19daaae461 100644 --- a/kubernetes/aaf/charts/aaf-service/values.yaml +++ b/kubernetes/aaf/charts/aaf-service/values.yaml @@ -25,7 +25,7 @@ flavor: small ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/aaf/aaf_service:2.1.2-SNAPSHOT +image: onap/aaf/aaf_service:2.1.4-SNAPSHOT pullPolicy: Always diff --git a/kubernetes/aaf/charts/aaf-sms/resources/config/has.json b/kubernetes/aaf/charts/aaf-sms/resources/config/has.json new file mode 100644 index 0000000000..9d017f99ed --- /dev/null +++ b/kubernetes/aaf/charts/aaf-sms/resources/config/has.json @@ -0,0 +1,36 @@ +{ + "domain": { + "name": "has", + "secrets": [ + { + "name": "aai", + "values": { + "username": "OOF", + "password": "OOF" + } + }, + { + "name": "conductor_api", + "values": { + "username": "admin1", + "password": "plan.15" + } + }, + { + "name": "sdnc", + "values": { + "username": "admin", + "password": "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" + } + }, + { + "name": "music_api", + "values": { + "aafuser": "conductor", + "aafpass": "c0nduct0r", + "aafns": "conductor" + } + } + ] + } +} diff --git a/kubernetes/aaf/charts/aaf-sms/resources/config/osdf.json b/kubernetes/aaf/charts/aaf-sms/resources/config/osdf.json new file mode 100644 index 0000000000..0950957b11 --- /dev/null +++ b/kubernetes/aaf/charts/aaf-sms/resources/config/osdf.json @@ -0,0 +1,98 @@ +{ + "domain": { + "name": "osdf", + "secrets": [ + { + "name": "so", + "values": { + "UserName": "", + "Password": "" + } + }, + { + "name": "conductor", + "values": { + "UserName": "admin1", + "Password": "plan.15" + } + }, + { + "name": "policyPlatform", + "values": { + "UserName": "testpdp", + "Password": "alpha123" + } + }, + { + "name": "policyClient", + "values": { + "UserName": "python", + "Password": "test" + } + }, + { + "name": "dmaap", + "values": { + "UserName": "NA", + "Password": "NA" + } + }, + { + "name": "sdc", + "values": { + "UserName": "NA", + "Password": "NA" + } + }, + { + "name": "osdfPlacement", + "values": { + "UserName": "test", + "Password": "testpwd" + } + }, + { + "name": "osdfPlacementSO", + "values": { + "UserName": "so_test", + "Password": "so_testpwd" + } + }, + { + "name": "osdfPlacementVFC", + "values": { + "UserName": "vfc_test", + "Password": "vfc_testpwd" + } + }, + { + "name": "osdfCMScheduler", + "values": { + "UserName": "test1", + "Password": "testpwd1" + } + }, + { + "name": "configDb", + "values": { + "UserName": "osdf", + "Password": "passwd" + } + }, + { + "name": "pciHMS", + "values": { + "UserName": "", + "Password": "" + } + }, + { + "name": "osdfPCIOpt", + "values": { + "UserName": "pci_test", + "Password": "pci_testpwd" + } + } + ] + } +}
\ No newline at end of file diff --git a/kubernetes/aaf/charts/aaf-sms/templates/configmap.yaml b/kubernetes/aaf/charts/aaf-sms/templates/configmap.yaml index 72ce6fbadb..b513d992ef 100644 --- a/kubernetes/aaf/charts/aaf-sms/templates/configmap.yaml +++ b/kubernetes/aaf/charts/aaf-sms/templates/configmap.yaml @@ -1,3 +1,4 @@ +{{/* # Copyright 2018 Intel Corporation, Inc # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,6 +12,7 @@ # 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. +*/}} apiVersion: v1 kind: ConfigMap @@ -25,3 +27,16 @@ metadata: data: smsconfig.json: | {{ .Values.config | toJson }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "common.fullname" . }}-preload + namespace: {{ include "common.namespace" . }} + labels: + app: {{ include "common.name" . }}-preload + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +data: +{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }} diff --git a/kubernetes/aaf/charts/aaf-sms/templates/job.yaml b/kubernetes/aaf/charts/aaf-sms/templates/job.yaml new file mode 100644 index 0000000000..2cee8d5e90 --- /dev/null +++ b/kubernetes/aaf/charts/aaf-sms/templates/job.yaml @@ -0,0 +1,92 @@ +{{/* +# Copyright 2018 Intel Corporation, Inc +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# 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. +*/}} + +apiVersion: batch/v1 +kind: Job +metadata: + name: {{ include "common.fullname" . }}-preload + namespace: {{ include "common.namespace" . }} + labels: + app: {{ include "common.name" . }} + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + replicas: {{ .Values.replicaCount }} + template: + metadata: + labels: + app: {{ include "common.name" . }} + release: {{ .Release.Name }} + spec: + initContainers: + - image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + name: {{ include "common.name" . }}-readiness + command: + - /root/ready.py + args: + - --container-name + - "aaf-sms" + - --container-name + - "aaf-sms-quorumclient" + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + containers: + - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + imagePullPolicy: {{ .Values.pullPolicy }} + name: {{ include "common.name" . }}-preload + command: + - "/sms/bin/preload" + - "-cacert" + - "/sms/certs/aaf_root_ca.cer" + - "-jsondir" + - "/preload/config" + - "-serviceport" + - "{{ .Values.service.internalPort }}" + - "-serviceurl" + - "https://aaf-sms.{{ include "common.namespace" . }}" + workingDir: /sms + volumeMounts: + - mountPath: /etc/localtime + name: localtime + readOnly: true + - mountPath: /preload/config + name: {{ include "common.name" . }}-preload + resources: +{{ include "common.resources" . | indent 10 }} + {{- if .Values.nodeSelector }} + nodeSelector: +{{ toYaml .Values.nodeSelector | indent 10 }} + {{- end -}} + {{- if .Values.affinity }} + affinity: +{{ toYaml .Values.affinity | indent 10 }} + {{- end }} + volumes: + - name: localtime + hostPath: + path: /etc/localtime + - name : {{ include "common.name" . }}-preload + configMap: + name: {{ include "common.fullname" . }}-preload + restartPolicy: OnFailure + imagePullSecrets: + - name: "{{ include "common.namespace" . }}-docker-registry-key" diff --git a/kubernetes/aaf/values.yaml b/kubernetes/aaf/values.yaml index 4cc69c264b..258aec5a9a 100644 --- a/kubernetes/aaf/values.yaml +++ b/kubernetes/aaf/values.yaml @@ -38,7 +38,7 @@ global: ################################################################# repository: nexus3.onap.org:10001 aaf_config: - image: onap/aaf/aaf_config:2.1.2-SNAPSHOT + image: onap/aaf/aaf_config:2.1.4-SNAPSHOT flavor: small # default number of instances diff --git a/kubernetes/aai/charts/aai-traversal/templates/job.yaml b/kubernetes/aai/charts/aai-traversal/templates/job.yaml index a018ede1a3..599bbc23fc 100644 --- a/kubernetes/aai/charts/aai-traversal/templates/job.yaml +++ b/kubernetes/aai/charts/aai-traversal/templates/job.yaml @@ -58,6 +58,7 @@ spec: - | set -x mkdir -p /opt/aai/logroot/AAI-GQ/misc + until nc -w10 -z -v aai.{{.Release.Namespace}} 8443; do echo "Retrying to reach aai on port 8443"; done; bash -x /opt/app/aai-traversal/docker-entrypoint.sh install/updateQueryData.sh env: - name: LOCAL_USER_ID diff --git a/kubernetes/clamp/charts/clamp-dash-kibana/values.yaml b/kubernetes/clamp/charts/clamp-dash-kibana/values.yaml index 88c541a091..d837cd8ef0 100644 --- a/kubernetes/clamp/charts/clamp-dash-kibana/values.yaml +++ b/kubernetes/clamp/charts/clamp-dash-kibana/values.yaml @@ -32,7 +32,7 @@ busyboxRepository: registry.hub.docker.com busyboxImage: library/busybox:latest # application image -loggingRepository: nexus3.onap.org:10001 +imageRepository: nexus3.onap.org:10001 image: onap/clamp-dashboard-kibana:3.0-STAGING-latest pullPolicy: Always diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_engine-inputs.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_engine-inputs.yaml index 24980e5f20..f6a4c7cf85 100644 --- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_engine-inputs.yaml +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_engine-inputs.yaml @@ -20,7 +20,7 @@ {{ if .Values.componentImages.holmes_engine }} "he_image" : '{{ include "common.repository" . }}/{{ .Values.componentImages.holmes_engine }}', {{ end }} - "msb_hostname": "{{ .Values.config.address.msb_discovery }}.{{include "common.namespace" . }}", + "msb_hostname": "{{ .Values.config.address.msb_iag }}.{{include "common.namespace" . }}", "dcae_CL_publish_url": "http://{{ .Values.config.address.message_router }}.{{include "common.namespace" . }}:3904/events/unauthenticated.DCAE_CL_OUTPUT", "ves_fault_publish_url": "http://{{ .Values.config.address.message_router }}.{{include "common.namespace" . }}:3904/events/unauthenticated.SEC_FAULT_OUTPUT", "pgaas_cluster_name" : "{{ .Values.postgres.service.name2 }}.{{include "common.namespace" . }}", diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_rules-inputs.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_rules-inputs.yaml index c5a73e5053..7ede89e521 100644 --- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_rules-inputs.yaml +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_rules-inputs.yaml @@ -21,7 +21,7 @@ "hr_image" : '{{ include "common.repository" . }}/{{ .Values.componentImages.holmes_rules }}', {{ end }} - "msb_hostname": "{{ .Values.config.address.msb_discovery }}.{{include "common.namespace" . }}", + "msb_hostname": "{{ .Values.config.address.msb_iag }}.{{include "common.namespace" . }}", "pgaas_cluster_name" : "{{ .Values.postgres.service.name2 }}.{{include "common.namespace" . }}", "database_name":"holmes" } diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml index 18632d1d39..d7534ad2ae 100644 --- a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml @@ -38,6 +38,7 @@ config: dmaap_dr_prov: dmaap-dr-prov message_router: message-router msb_discovery: msb-discovery + msb_iag: msb-iag policy_pdp: pdp sdc: sdc-be # redisCaching is a string not a boolean! @@ -73,13 +74,13 @@ postgres: # application image repository: nexus3.onap.org:10001 -image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:1.4.3 +image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:1.4.4 # DCAE component images to be deployed via Cloudify Manager # Use to override default setting in blueprints componentImages: config_binding_service: onap/org.onap.dcaegen2.platform.configbinding.app-app:2.2.3 - datafile_collector: onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.0.0 + datafile_collector: onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.0.3 deployment_handler: onap/org.onap.dcaegen2.platform.deployment-handler:3.0.3 holmes_rules: onap/holmes/rule-management:1.2.0-STAGING-latest holmes_engine: onap/holmes/engine-management:1.2.0-STAGING-latest diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml index 778005db45..20265e017e 100644 --- a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml +++ b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml @@ -50,6 +50,9 @@ spec: - name: {{ include "common.name" . }} image: "{{ include "common.repository" . }}/{{ .Values.image }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + envFrom: + - configMapRef: + name: {{ include "common.fullname" . }}-config ports: - containerPort: {{ .Values.service.internalPort }} - containerPort: {{ .Values.service.internalPort2 }} @@ -75,7 +78,7 @@ spec: mountPath: /opt/app/config/conf subPath: buscontroller.env -# NOTE: the basename of the subdirectory is important - it matches the DBCL API URI +# NOTE: the basename of the subdirectory specified in mountPath is important - it matches the DBCL API URI - name: {{ include "common.name" . }}-dmaap mountPath: /opt/app/config/dmaap/ - name: {{ include "common.name" . }}-dcaelocations diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml b/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml index e79a693382..39ecb8f8ac 100644 --- a/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml +++ b/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml @@ -31,7 +31,7 @@ pullPolicy: Always # application images repository: nexus3.onap.org:10001 -image: onap/dmaap/buscontroller:1.0.19 +image: onap/dmaap/buscontroller:1.0.20 # application configuration diff --git a/kubernetes/multicloud/charts/multicloud-ocata/templates/service.yaml b/kubernetes/multicloud/charts/multicloud-ocata/templates/service.yaml index cbe426edae..fda5ecefc8 100644 --- a/kubernetes/multicloud/charts/multicloud-ocata/templates/service.yaml +++ b/kubernetes/multicloud/charts/multicloud-ocata/templates/service.yaml @@ -18,7 +18,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ .Values.service.name }} + name: {{ include "common.servicename" . }} namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.name" . }} @@ -34,18 +34,26 @@ metadata: "protocol": "REST", "port": "{{ .Values.service.externalPort }}", "visualRange": "1" + }, + { + "serviceName": "multicloud-ocata", + "version": "v1", + "url": "/api/multicloud-ocata/v1", + "protocol": "REST", + "port": "{{ .Values.service.externalPort }}", + "visualRange": "1" } ]' spec: ports: {{if eq .Values.service.type "NodePort" -}} - - name: http-{{ .Values.service.name }} - port: {{ .Values.service.externalPort }} + - port: {{ .Values.service.externalPort }} nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }} + name: {{ .Values.service.portName }} {{- else -}} - port: {{ .Values.service.externalPort }} targetPort: {{ .Values.service.internalPort }} - name: http-{{ .Values.service.name }} + name: {{ .Values.service.portName }} {{- end}} selector: app: {{ include "common.name" . }} diff --git a/kubernetes/multicloud/charts/multicloud-ocata/values.yaml b/kubernetes/multicloud/charts/multicloud-ocata/values.yaml index 699b908c43..dcb7df4568 100644 --- a/kubernetes/multicloud/charts/multicloud-ocata/values.yaml +++ b/kubernetes/multicloud/charts/multicloud-ocata/values.yaml @@ -59,6 +59,7 @@ liveness: service: type: NodePort name: multicloud-ocata + portName: multicloud-ocata externalPort: 9006 internalPort: 9006 nodePort: 93 @@ -84,4 +85,4 @@ resources: requests: cpu: 20m memory: 2Gi - unlimited: {}
\ No newline at end of file + unlimited: {} diff --git a/kubernetes/multicloud/charts/multicloud-vio/templates/service.yaml b/kubernetes/multicloud/charts/multicloud-vio/templates/service.yaml index b53aef4bed..b34cbecb9d 100644 --- a/kubernetes/multicloud/charts/multicloud-vio/templates/service.yaml +++ b/kubernetes/multicloud/charts/multicloud-vio/templates/service.yaml @@ -18,7 +18,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ .Values.service.name }} + name: {{ include "common.servicename" . }} namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.name" . }} @@ -34,18 +34,26 @@ metadata: "protocol": "REST", "port": "{{ .Values.service.externalPort }}", "visualRange": "1" + }, + { + "serviceName": "multicloud-vio", + "version": "v1", + "url": "/api/multicloud-vio/v1", + "protocol": "REST", + "port": "{{ .Values.service.externalPort }}", + "visualRange": "1" } ]' spec: ports: {{if eq .Values.service.type "NodePort" -}} - - name: http-{{ .Values.service.name }} - port: {{ .Values.service.externalPort }} + - port: {{ .Values.service.externalPort }} nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }} + name: {{ .Values.service.portName }} {{- else -}} - port: {{ .Values.service.externalPort }} targetPort: {{ .Values.service.internalPort }} - name: http-{{ .Values.service.name }} + name: {{ .Values.service.portName }} {{- end}} selector: app: {{ include "common.name" . }} diff --git a/kubernetes/multicloud/charts/multicloud-vio/values.yaml b/kubernetes/multicloud/charts/multicloud-vio/values.yaml index 810646dc13..b23b014deb 100644 --- a/kubernetes/multicloud/charts/multicloud-vio/values.yaml +++ b/kubernetes/multicloud/charts/multicloud-vio/values.yaml @@ -59,6 +59,7 @@ liveness: service: type: NodePort name: multicloud-vio + portName: multicloud-vio externalPort: 9004 internalPort: 9004 nodePort: 92 @@ -84,4 +85,4 @@ resources: requests: cpu: 20m memory: 2Gi - unlimited: {}
\ No newline at end of file + unlimited: {} diff --git a/kubernetes/multicloud/charts/multicloud-windriver/templates/service.yaml b/kubernetes/multicloud/charts/multicloud-windriver/templates/service.yaml index f876bb97ac..c1128bbf47 100644 --- a/kubernetes/multicloud/charts/multicloud-windriver/templates/service.yaml +++ b/kubernetes/multicloud/charts/multicloud-windriver/templates/service.yaml @@ -18,7 +18,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ .Values.service.name }} + name: {{ include "common.servicename" . }} namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.name" . }} @@ -32,7 +32,7 @@ metadata: "version": "v0", "url": "/api/multicloud-titanium_cloud/v0", "protocol": "REST", - "port": "{{ .Values.service.internalPort }}", + "port": "{{ .Values.service.externalPort }}", "visualRange": "1" }, { @@ -40,7 +40,7 @@ metadata: "version": "v0", "url": "/api/multicloud-titaniumcloud/v0", "protocol": "REST", - "port": "{{ .Values.service.internalPort }}", + "port": "{{ .Values.service.externalPort }}", "visualRange": "1" }, { @@ -48,7 +48,7 @@ metadata: "version": "v1", "url": "/api/multicloud-titaniumcloud/v1", "protocol": "REST", - "port": "{{ .Values.service.internalPort }}", + "port": "{{ .Values.service.externalPort }}", "visualRange": "1" } ]' @@ -56,13 +56,13 @@ metadata: spec: ports: {{ if eq .Values.service.type "NodePort" }} - - name: http-{{ .Values.service.name }} - port: {{ .Values.service.externalPort }} + - port: {{ .Values.service.externalPort }} nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }} + name: {{ .Values.service.portName }} {{ else }} - port: {{ .Values.service.externalPort }} targetPort: {{ .Values.service.internalPort }} - name: http-{{ .Values.service.name }} + name: {{ .Values.service.portName }} {{ end }} selector: app: {{ include "common.name" . }} diff --git a/kubernetes/multicloud/charts/multicloud-windriver/values.yaml b/kubernetes/multicloud/charts/multicloud-windriver/values.yaml index 4ebf84399f..913f682901 100644 --- a/kubernetes/multicloud/charts/multicloud-windriver/values.yaml +++ b/kubernetes/multicloud/charts/multicloud-windriver/values.yaml @@ -43,6 +43,7 @@ config: service: type: NodePort name: multicloud-titaniumcloud + portName: multicloud-titaniumcloud externalPort: 9005 internalPort: 9005 nodePort: 94 @@ -84,4 +85,4 @@ resources: requests: cpu: 20m memory: 2Gi - unlimited: {}
\ No newline at end of file + unlimited: {} diff --git a/kubernetes/multicloud/templates/service.yaml b/kubernetes/multicloud/templates/service.yaml index 1ad3e5164c..e34bdf4502 100644 --- a/kubernetes/multicloud/templates/service.yaml +++ b/kubernetes/multicloud/templates/service.yaml @@ -18,7 +18,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ .Values.service.name }} + name: {{ .Values.service.portName }} namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.name" . }} @@ -34,18 +34,26 @@ metadata: "protocol": "REST", "port": "{{ .Values.service.externalPort }}", "visualRange": "1" + }, + { + "serviceName": "multicloud", + "version": "v1", + "url": "/api/multicloud/v1", + "protocol": "REST", + "port": "{{ .Values.service.externalPort }}", + "visualRange": "1" } ]' spec: ports: {{if eq .Values.service.type "NodePort" -}} - - name: {{ .Values.service.name }} - port: {{ .Values.service.externalPort }} + - port: {{ .Values.service.externalPort }} nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }} + name: {{ .Values.service.portName }} {{- else -}} - port: {{ .Values.service.externalPort }} targetPort: {{ .Values.service.internalPort }} - name: {{ .Values.service.name }} + name: {{ .Values.service.portName }} {{- end}} selector: app: {{ include "common.name" . }} diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml index 3f1da7eb0c..5756d9f616 100644 --- a/kubernetes/multicloud/values.yaml +++ b/kubernetes/multicloud/values.yaml @@ -63,6 +63,7 @@ liveness: service: type: NodePort name: multicloud + portName: multicloud-framework externalPort: 9001 internalPort: 9001 nodePort: 91 @@ -88,4 +89,4 @@ resources: requests: cpu: 20m memory: 2Gi - unlimited: {}
\ No newline at end of file + unlimited: {} diff --git a/kubernetes/nbi/values.yaml b/kubernetes/nbi/values.yaml index 89a3f4b280..ac5d3266d5 100644 --- a/kubernetes/nbi/values.yaml +++ b/kubernetes/nbi/values.yaml @@ -87,8 +87,8 @@ liveness: httpGet: path: /nbi/api/v3/status port: 8080 - initialDelaySeconds: 120 - periodSeconds: 20 + initialDelaySeconds: 180 + periodSeconds: 30 # necessary to disable liveness probe when setting breakpoints # in debugger so K8s doesn't restart unresponsive container enabled: true @@ -97,8 +97,8 @@ readiness: httpGet: path: /nbi/api/v3/status port: 8080 - initialDelaySeconds: 125 - periodSeconds: 20 + initialDelaySeconds: 185 + periodSeconds: 30 service: type: NodePort diff --git a/kubernetes/portal/charts/portal-app/resources/certs/keystoreONAPPortal.p12 b/kubernetes/portal/charts/portal-app/resources/certs/keystoreONAPPortal.p12 Binary files differnew file mode 100644 index 0000000000..df2f4f6cd3 --- /dev/null +++ b/kubernetes/portal/charts/portal-app/resources/certs/keystoreONAPPortal.p12 diff --git a/kubernetes/portal/values.yaml b/kubernetes/portal/values.yaml index 719116b7dd..14d35098a6 100644 --- a/kubernetes/portal/values.yaml +++ b/kubernetes/portal/values.yaml @@ -20,9 +20,9 @@ global: portalPort: "8989" # application's front end hostname. Must be resolvable on the client side environment portalHostName: "portal.api.simpledemo.onap.org" - keystoreFile: "keystoreONAPPortal.jks" + keystoreFile: "keystoreONAPPortal.p12" truststoreFile: "truststoreONAPall.jks" - keypass: "changeit" + keypass: ",@{9!OOv%HO@#c+0Z}axu!xV" trustpass: "changeit" config: diff --git a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py index ad09e444d8..38bfceb12a 100644 --- a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py +++ b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py @@ -14,18 +14,18 @@ # aaf info - everything is from the private oam network (also called onap private network) GLOBAL_AAF_SERVER = "https://aaf-service.{{include "common.namespace" .}}:8100" -GLOBAL_AAF_USERNAME = "demo@people.osaaf.org" -GLOBAL_AAF_PASSWORD = "demo123456!" +GLOBAL_AAF_USERNAME = "{{ .Values.aafUsername }}" +GLOBAL_AAF_PASSWORD = "{{ .Values.aafPassword }}" # aai info - everything is from the private oam network (also called onap private network) GLOBAL_AAI_SERVER_PROTOCOL = "https" GLOBAL_AAI_SERVER_PORT = "8443" -GLOBAL_AAI_USERNAME = "aai@aai.onap.org" -GLOBAL_AAI_PASSWORD = "demo123456!" +GLOBAL_AAI_USERNAME = "{{ .Values.aaiUsername }}" +GLOBAL_AAI_PASSWORD = "{{ .Values.aaiPassword}}" # appc info - everything is from the private oam network (also called onap private network) GLOBAL_APPC_SERVER_PROTOCOL = "http" GLOBAL_APPC_SERVER_PORT = "8282" -GLOBAL_APPC_USERNAME = "admin" -GLOBAL_APPC_PASSWORD = "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" +GLOBAL_APPC_USERNAME = "{{ .Values.appcUsername }}" +GLOBAL_APPC_PASSWORD = "{{ .Values.appcPassword }}" GLOBAL_APPC_CDT_SERVER_PROTOCOL = "http" GLOBAL_APPC_CDT_SERVER_PORT = "80" GLOBAL_APPC_CDT_USERNAME = "demo" @@ -37,8 +37,8 @@ GLOBAL_ASDC_BE_ONBOARD_PORT = "8081" GLOBAL_ASDC_BE_USERNAME = "beep" GLOBAL_ASDC_BE_PASSWORD = "boop" # clamp info - everything is from the private oam network (also called onap private network) -GLOBAL_CLAMP_SERVER_PROTOCOL = "http" -GLOBAL_CLAMP_SERVER_PORT = "8080" +GLOBAL_CLAMP_SERVER_PROTOCOL = "https" +GLOBAL_CLAMP_SERVER_PORT = "8443" # nbi info - everything is from the private oam network (also called onap private network) GLOBAL_NBI_SERVER_PROTOCOL = "http" GLOBAL_NBI_SERVER_PORT = "8080" @@ -48,8 +48,8 @@ GLOBAL_CLI_SERVER_PORT = "8080" # dcae info - everything is from the private oam network (also called onap private network) GLOBAL_DCAE_SERVER_PROTOCOL = "http" GLOBAL_DCAE_HEALTH_SERVER_PORT = "80" -GLOBAL_DCAE_USERNAME = "console" -GLOBAL_DCAE_PASSWORD = "ZjJkYjllMjljMTI2M2Iz" +GLOBAL_DCAE_USERNAME = "{{ .Values.dcaeUsername }}" +GLOBAL_DCAE_PASSWORD = "{{ .Values.dcaePassword}}" # data router info - everything is from the private oam network (also called onap private network) GLOBAL_DMAAP_DR_PROV_SERVER_PROTOCOL = "http" GLOBAL_DMAAP_DR_PROV_SERVER_PORT = "8080" @@ -57,8 +57,8 @@ GLOBAL_DMAAP_DR_NODE_SERVER_PROTOCOL = "http" GLOBAL_DMAAP_DR_NODE_SERVER_PORT = "8080" # DROOL server port and credentials GLOBAL_DROOLS_SERVER_PORT = "9696" -GLOBAL_DROOLS_USERNAME = "demo@people.osaaf.org" -GLOBAL_DROOLS_PASSWORD = "demo123456!" +GLOBAL_DROOLS_USERNAME = "{{ .Values.droolsUsername }}" +GLOBAL_DROOLS_PASSWORD = "{{ .Values.droolsPassword }}" # log server config - NOTE: no log server is run in HEAT; only on OOM GLOBAL_LOG_SERVER_PROTOCOL = "http" GLOBAL_LOG_ELASTICSEARCH_PORT = "9200" @@ -88,10 +88,10 @@ GLOBAL_MSO_REQDB_SERVER_PORT = "8083" GLOBAL_MSO_SDNC_SERVER_PORT = "8086" GLOBAL_MSO_VFC_SERVER_PORT = "8084" -GLOBAL_MSO_USERNAME = "InfraPortalClient" -GLOBAL_MSO_CATDB_USERNAME = "bpel" -GLOBAL_MSO_PASSWORD = "password1$" - +GLOBAL_MSO_USERNAME = "{{ .Values.soUsername }}" +GLOBAL_MSO_CATDB_USERNAME = "{{ .Values.soCatdbUsername }}" +GLOBAL_MSO_PASSWORD = "{{ .Values.soPassword }}" +# robot uses MSO_PASSWORD for both SO and CATDB # music info - everything is from the private oam network (also called onap private network) GLOBAL_MUSIC_SERVER_PROTOCOL = "http" GLOBAL_MUSIC_SERVER_PORT = "8080" @@ -111,21 +111,21 @@ GLOBAL_PGN_PORT = "2831" GLOBAL_POLICY_SERVER_PROTOCOL = "https" GLOBAL_POLICY_SERVER_PORT = "8081" GLOBAL_POLICY_HEALTHCHECK_PORT = "6969" -GLOBAL_POLICY_AUTH = "dGVzdHBkcDphbHBoYTEyMw==" -GLOBAL_POLICY_CLIENTAUTH = "cHl0aG9uOnRlc3Q=" -GLOBAL_POLICY_USERNAME = "demo@people.osaaf.org" -GLOBAL_POLICY_PASSWORD = "demo123456!" +GLOBAL_POLICY_AUTH = "{{ .Values.policyAuth}}" +GLOBAL_POLICY_CLIENTAUTH = "{{ .Values.policyClientAuth}}" +GLOBAL_POLICY_USERNAME = "{{ .Values.policyUsername }}" +GLOBAL_POLICY_PASSWORD = "{{ .Values.policyPassword }}" # portal info - everything is from the private oam network (also called onap private network) GLOBAL_PORTAL_SERVER_PROTOCOL = "http" GLOBAL_PORTAL_SERVER_PORT = "8989" -GLOBAL_PORTAL_USERNAME = "demo" -GLOBAL_PORTAL_PASSWORD = "Kp8bJ4SXszM0WXlhak3eHlcse" +GLOBAL_PORTAL_USERNAME = "{{ .Values.portalUsername }}" +GLOBAL_PORTAL_PASSWORD = "{{ .Values.portalPassword }}" # sdngc info - everything is from the private oam network (also called onap private network) GLOBAL_SDNGC_SERVER_PROTOCOL = "http" GLOBAL_SDNGC_REST_PORT = "8282" GLOBAL_SDNGC_ADMIN_PORT = "8843" -GLOBAL_SDNGC_USERNAME = "admin" -GLOBAL_SDNGC_PASSWORD = "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" +GLOBAL_SDNGC_USERNAME = "{{ .Values.sdncUsername }}" +GLOBAL_SDNGC_PASSWORD = "{{ .Values.sdncPassword }}" # sms (AAF) info GLOBAL_SMS_SERVER_PROTOCOL = "https" GLOBAL_SMS_SERVER_NAME = "aaf-sms.{{include "common.namespace" .}}" @@ -133,10 +133,10 @@ GLOBAL_SMS_SERVER_PORT = "10443" # vid info - everything is from the private oam network (also called onap private network) GLOBAL_VID_SERVER_PROTOCOL = "https" GLOBAL_VID_SERVER_PORT = "8443" -GLOBAL_VID_USERNAME = "demo" -GLOBAL_VID_PASSWORD = "Kp8bJ4SXszM0WX" -GLOBAL_VID_HEALTH_USERNAME = "Default" -GLOBAL_VID_HEALTH_PASSWORD = "AppPassword!1" +GLOBAL_VID_USERNAME = "{{ .Values.vidUsername }}" +GLOBAL_VID_PASSWORD = "{{ .Values.vidPassword}}" +GLOBAL_VID_HEALTH_USERNAME = "{{ .Values.vidHealthUsername }}" +GLOBAL_VID_HEALTH_PASSWORD = "{{ .Values.vidHealthPassword }}" # vnfsdk info - everything is from the private oam network (also called onap private network) GLOBAL_VNFSDK_SERVER_PROTOCOL = "http" GLOBAL_VNFSDK_SERVER_PORT = "8702" @@ -147,4 +147,3 @@ GLOBAL_PROXY_WARNING_CONTINUE_XPATH="" GLOBAL_DNS_TRAFFIC_DURATION = "600" # location where heat templates are loaded from GLOBAL_HEAT_TEMPLATES_FOLDER = "/var/opt/OpenECOMP_ETE/demo/heat" - diff --git a/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml index 7fb9885596..6a11f2bf0c 100755 --- a/kubernetes/robot/values.yaml +++ b/kubernetes/robot/values.yaml @@ -60,7 +60,7 @@ openStackProjectName: "onap" # Domain id of openstack where VNFs will be deployed. Maps to GLOBAL_INJECTED_OPENSTACK_DOMAIN_ID openStackDomainId: "default" # Openstack Keystone API version. Valid values are [ v2.0, v3 ]. Maps to GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION -openStackKeystoneAPIVersion: "" +openStackKeystoneAPIVersion: "v2.0" # Openstack glance image name for Ubuntu 14. Maps to GLOBAL_INJECTED_UBUNTU_1404_IMAGE ubuntu14Image: "Ubuntu_14_trusty" # Openstack glance image name for Ubuntu 16. Maps to GLOBAL_INJECTED_UBUNTU_1604_IMAGE @@ -78,11 +78,54 @@ openStackPrivateNetCidr: "10.0.0.0/8" # The first 2 octets of the private Openstack subnet where VNFs will be spawned. # Needed because sdnc preload templates hardcodes things like this 10.0.${ecompnet}.X openStackOamNetworkCidrPrefix: "10.0" +# VID protocol/port until Selenium issue with SSL resolved +# https/8443 vs http/8080 +vidServerProtocol: "http" +vidServerPort: "8080" # Override with Pub Key for access to VNF vnfPubKey: "FILL_IN_WITH_PUB_KEY" # Override with DCAE VES Collector external IP dcaeCollectorIp: "FILL_IN_WITH_DCAE_VES_COLLECTOR_IP" +# Credentials for ONAP Component +# AAF +aafUsername: "demo@people.osaaf.org" +aafPassword: "demo123456!" +# AAI +aaiUsername: "aai@aai.onap.org" +aaiPassword: "demo123456!" +# APPC +appcUsername: "admin" +appcPassword: "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" +# DCAE +dcaeUsername: "console" +dcaePassword: "ZjJkYjllMjljMTI2M2Iz" +# DROOLS +droolsUsername: "demo@people.osaaf.org" +droolsPassword: "demo123456!" +# POLICY +policyAuth: "dGVzdHBkcDphbHBoYTEyMw==" +policyClientAuth: "cHl0aG9uOnRlc3Q=" +policyUsername: "demo@people.osaaf.org" +policyPassword: "demo123456!" +# PORTAL +portalUsername: "demo" +portalPassword: "Kp8bJ4SXszM0WXlhak3eHlcse" +# SO +soUsername: "InfraPortalClient" +soPassword: "password1$" +soCatdbUsername: "bpel" +soCatdbPassword: "password1$" +# SDNC +sdncUsername: "admin" +sdncPassword: "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" +# VID +vidUsername: "demo" +vidPassword: "Kp8bJ4SXszM0WX" +vidHealthUsername: "Default" +vidHealthPassword: "AppPassword!1" + + # default number of instances replicaCount: 1 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: {} |