From: Krzysztof Opasiak Date: Thu, 21 Jan 2021 13:23:46 +0000 (+0000) Subject: Merge "[COMMON][CERTS] Use sh to onboard custom certs" into guilin X-Git-Tag: 7.0.1~17 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=865d7dd2add7b6ee00991205eae74d4a02d251dd;hp=400b9424a04806d8515e64e0bc586e49ff5c6762;p=oom.git Merge "[COMMON][CERTS] Use sh to onboard custom certs" into guilin --- diff --git a/docs/conf.py b/docs/conf.py index 3b28eb74a8..a45acf370f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -9,6 +9,30 @@ linkcheck_ignore = [ intersphinx_mapping = {} +needs_services = { + 'github-issues': { + 'url': 'https://api.github.com/', + 'need_type': 'spec', + 'max_amount': 2, + 'max_content_lines': 20, + 'id_prefix': 'GH_ISSUE_' + }, + 'github-prs': { + 'url': 'https://api.github.com/', + 'need_type': 'spec', + 'max_amount': 2, + 'max_content_lines': 20, + 'id_prefix': 'GH_PR_' + }, + 'github-commits': { + 'url': 'https://api.github.com/', + 'need_type': 'spec', + 'max_amount': 2, + 'max_content_lines': 20, + 'id_prefix': 'GH_COMMIT_' + } +} + html_last_updated_fmt = '%d-%b-%y %H:%M' def setup(app): diff --git a/docs/oom_quickstart_guide.rst b/docs/oom_quickstart_guide.rst index 6b1c69cc44..51c28c2ca3 100644 --- a/docs/oom_quickstart_guide.rst +++ b/docs/oom_quickstart_guide.rst @@ -161,8 +161,9 @@ follows:: > make SKIP_LINT=TRUE [HELM_BIN=] all `HELM_BIN` - Sets the helm binary to be used. The default value use helm from PATH. Allow the user to have - multiple version of helm in operating system and choose which one to use. + Sets the helm binary to be used. The default value use helm from PATH. Allow + the user to have multiple version of helm in operating system and choose + which one to use. **Step 7.** Display the onap charts that available to be deployed:: diff --git a/docs/oom_setup_ingress_controller.rst b/docs/oom_setup_ingress_controller.rst index c15171c7be..e49c72a2e4 100644 --- a/docs/oom_setup_ingress_controller.rst +++ b/docs/oom_setup_ingress_controller.rst @@ -15,7 +15,7 @@ .. figure:: oomLogoV2-medium.png :align: right -.. _onap-on-kubernetes-with-rancher: +.. _oom_setup_ingress_controller: Ingress controller setup on HA Kubernetes Cluster @@ -174,7 +174,6 @@ Ingress also can be enabled on any onap setup override using following code: --- <...> - #ingress virtualhost based configuration global: <...> ingress: diff --git a/docs/oom_user_guide.rst b/docs/oom_user_guide.rst index ac716a3eb7..9aac8aefb6 100644 --- a/docs/oom_user_guide.rst +++ b/docs/oom_user_guide.rst @@ -142,8 +142,9 @@ Then build your local Helm repository:: > make SKIP_LINT=TRUE [HELM_BIN=] all `HELM_BIN` - Sets the helm binary to be used. The default value use helm from PATH. Allow the user to have - multiple version of helm in operating system and choose which one to use. + Sets the helm binary to be used. The default value use helm from PATH. + Allow the user to have multiple version of helm in operating system and + choose which one to use. The Helm search command reads through all of the repositories configured on the system, and looks for matches:: diff --git a/docs/oom_user_guide_helm3.rst b/docs/oom_user_guide_helm3.rst index b687fe8bd3..08e9ec0d0b 100644 --- a/docs/oom_user_guide_helm3.rst +++ b/docs/oom_user_guide_helm3.rst @@ -12,8 +12,8 @@ .. _Helm Documentation: https://docs.helm.sh/helm/ .. _Helm: https://docs.helm.sh/ .. _Kubernetes: https://Kubernetes.io/ -.. _Kubernetes LoadBalancer: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer -.. _user-guide-label: +.. _Kubernetes LoadBalancer: https://kubernetes.io/docs/concepts/services-networking/service/#loadbalancer +.. _oom_user_guide_helm3: OOM User Guide helm3 (experimental) ################################### @@ -415,7 +415,7 @@ below:: Ensure you've disabled any proxy settings the browser you are using to access the portal and then simply access now the new ssl-encrypted URL: -https://portal.api.simpledemo.onap.org:30225/ONAPPORTAL/login.htm +``https://portal.api.simpledemo.onap.org:30225/ONAPPORTAL/login.htm`` .. note:: Using the HTTPS based Portal URL the Browser needs to be configured to accept @@ -482,7 +482,7 @@ have been created - a sample from the ONAP Integration labs follows: .. figure:: consulHealth.png :align: center -To see the real-time health of a deployment go to: http://:30270/ui/ +To see the real-time health of a deployment go to: ``http://:30270/ui/`` where a GUI much like the following will be found: diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt index b3188ddd38..e14c784ee4 100644 --- a/docs/requirements-docs.txt +++ b/docs/requirements-docs.txt @@ -8,6 +8,7 @@ sphinx_rtd_theme>=0.4.3 sphinxcontrib-blockdiag sphinxcontrib-needs>=0.2.3 sphinxcontrib-nwdiag +sphinxcontrib-redoc sphinxcontrib-seqdiag sphinxcontrib-swaggerdoc sphinxcontrib-plantuml diff --git a/kubernetes/common/common/templates/_ingress.tpl b/kubernetes/common/common/templates/_ingress.tpl index e57d4bedaa..18f9bb1ba5 100644 --- a/kubernetes/common/common/templates/_ingress.tpl +++ b/kubernetes/common/common/templates/_ingress.tpl @@ -1,42 +1,18 @@ -{{- define "ingress.config.host" -}} -{{- $dot := default . .dot -}} -{{- $baseaddr := (required "'baseaddr' param, set to the specific part of the fqdn, is required." .baseaddr) -}} -{{- $burl := (required "'baseurl' param, set to the generic part of the fqdn, is required." $dot.Values.global.ingress.virtualhost.baseurl) -}} -{{ printf "%s.%s" $baseaddr $burl }} -{{- end -}} - {{- define "ingress.config.port" -}} {{- $dot := default . .dot -}} -{{- if .Values.ingress -}} -{{- if .Values.global.ingress -}} -{{- if or (not .Values.global.ingress.virtualhost) (not .Values.global.ingress.virtualhost.enabled) -}} - - http: - paths: -{{- range .Values.ingress.service }} -{{ $baseaddr := required "baseaddr" .baseaddr }} - - path: {{ include "ingress.config.host" (dict "dot" $dot "baseaddr" $baseaddr) }} - backend: - serviceName: {{ .name }} - servicePort: {{ .port }} -{{- end -}} -{{- else if .Values.ingress.service -}} +{{- $burl := (required "'baseurl' param, set to the generic part of the fqdn, is required." $dot.Values.global.ingress.virtualhost.baseurl) -}} {{ range .Values.ingress.service }} -{{ $baseaddr := required "baseaddr" .baseaddr }} - - host: {{ include "ingress.config.host" (dict "dot" $dot "baseaddr" $baseaddr) }} +{{- $baseaddr := (required "'baseaddr' param, set to the specific part of the fqdn, is required." .baseaddr) }} + - host: {{ printf "%s.%s" $baseaddr $burl }} http: paths: - backend: serviceName: {{ .name }} servicePort: {{ .port }} -{{- end -}} -{{- else -}} - - path: {{ printf "/%s" .Chart.Name }} - backend: - serviceName: {{ .Chart.Name }} - servicePort: {{ .Values.service.externalPort }} -{{- end -}} -{{- end -}} -{{- end -}} + {{- if .path }} + path: {{ .path }} + {{- end }} +{{- end }} {{- end -}} diff --git a/kubernetes/dcaemod/components/dcaemod-designtool/values.yaml b/kubernetes/dcaemod/components/dcaemod-designtool/values.yaml index 5be8cacefd..f2128d2457 100644 --- a/kubernetes/dcaemod/components/dcaemod-designtool/values.yaml +++ b/kubernetes/dcaemod/components/dcaemod-designtool/values.yaml @@ -25,9 +25,8 @@ global: readinessImage: onap/oom/readiness:3.0.1 ingress: - enabled: true virtualhost: - enabled: false + baseurl: "simpledemo.onap.org" config: nifiJarsIndexURL: http://dcaemod-genprocessor:8080/nifi-jars @@ -47,11 +46,14 @@ service: ingress: enabled: true + enabledOverride: true service: - - baseaddr: "nifi" + - baseaddr: "dcaemod" + path: "/nifi" name: "dcaemod-designtool" port: 8080 - - baseaddr: "nifi-api" + - baseaddr: "dcaemod" + path: "/nifi-api" name: "dcaemod-designtool" port: 8080 config: diff --git a/kubernetes/dcaemod/components/dcaemod-distributor-api/values.yaml b/kubernetes/dcaemod/components/dcaemod-distributor-api/values.yaml index c717ca3309..f08ef82c31 100644 --- a/kubernetes/dcaemod/components/dcaemod-distributor-api/values.yaml +++ b/kubernetes/dcaemod/components/dcaemod-distributor-api/values.yaml @@ -25,9 +25,8 @@ global: readinessImage: onap/oom/readiness:3.0.1 ingress: - enabled: true virtualhost: - enabled: false + baseurl: "simpledemo.onap.org" config: nifiRegistryURL: http://dcaemod-nifi-registry:18080/nifi-registry-api @@ -46,8 +45,10 @@ service: ingress: enabled: true + enabledOverride: true service: - - baseaddr: "distributor" + - baseaddr: "dcaemod" + path: "/distributor" name: dcaemod-distributor-api port: 8080 config: diff --git a/kubernetes/dcaemod/components/dcaemod-genprocessor/values.yaml b/kubernetes/dcaemod/components/dcaemod-genprocessor/values.yaml index 92633acf97..9bfcc83d58 100644 --- a/kubernetes/dcaemod/components/dcaemod-genprocessor/values.yaml +++ b/kubernetes/dcaemod/components/dcaemod-genprocessor/values.yaml @@ -24,9 +24,8 @@ global: nodePortPrefixExt: 304 readinessImage: onap/oom/readiness:3.0.1 ingress: - enabled: true virtualhost: - enabled: false + baseurl: "simpledemo.onap.org" config: onboardingAPIURL: http://dcaemod-onboarding-api:8080/onboarding @@ -45,8 +44,10 @@ service: ingress: enabled: true + enabledOverride: true service: - - baseaddr: "nifi-jars" + - baseaddr: "dcaemod" + path: "/nifi-jars" name: dcaemod-genprocessor port: 8080 config: diff --git a/kubernetes/dcaemod/components/dcaemod-onboarding-api/values.yaml b/kubernetes/dcaemod/components/dcaemod-onboarding-api/values.yaml index 161b3621a0..3c460ca9a0 100644 --- a/kubernetes/dcaemod/components/dcaemod-onboarding-api/values.yaml +++ b/kubernetes/dcaemod/components/dcaemod-onboarding-api/values.yaml @@ -23,9 +23,9 @@ global: nodePortPrefixExt: 304 readinessImage: onap/oom/readiness:3.0.1 ingress: - enabled: true virtualhost: - enabled: false + baseurl: "simpledemo.onap.org" + ################################################################# # Secrets metaconfig ################################################################# @@ -49,8 +49,10 @@ service: port: 8080 ingress: enabled: true + enabledOverride: true service: - - baseaddr: "onboarding" + - baseaddr: "dcaemod" + path: "/onboarding" name: dcaemod-onboarding-api port: 8080 config: diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml index 54f886d3aa..11068bae37 100755 --- a/kubernetes/onap/values.yaml +++ b/kubernetes/onap/values.yaml @@ -106,7 +106,6 @@ global: ingress: enabled: false virtualhost: - enabled: true baseurl: "simpledemo.onap.org" # Global Service Mesh configuration diff --git a/kubernetes/releases/7.0.0.yaml b/kubernetes/releases/7.0.0.yaml new file mode 100644 index 0000000000..41db038d6a --- /dev/null +++ b/kubernetes/releases/7.0.0.yaml @@ -0,0 +1,6 @@ +--- +distribution_type: 'helm-charts' +release_tag: '7.0.0' +project: 'oom' +log_dir: 'oom-guilin-merge-helm/22/' +ref: 'Ia61a08d1e6cc4499525d82c5b2dfd83cf2d6a3e8' diff --git a/kubernetes/sdnc/components/dmaap-listener/values.yaml b/kubernetes/sdnc/components/dmaap-listener/values.yaml index 0f3f18b6b2..4695f36a1d 100644 --- a/kubernetes/sdnc/components/dmaap-listener/values.yaml +++ b/kubernetes/sdnc/components/dmaap-listener/values.yaml @@ -55,7 +55,7 @@ secrets: ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/sdnc-dmaap-listener-image:2.0.4 +image: onap/sdnc-dmaap-listener-image:2.0.5 pullPolicy: Always # flag to enable debugging - application support required diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml index 080ae9c15f..fd85746200 100644 --- a/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml +++ b/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml @@ -55,7 +55,7 @@ secrets: ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/sdnc-ansible-server-image:2.0.4 +image: onap/sdnc-ansible-server-image:2.0.5 pullPolicy: Always # flag to enable debugging - application support required diff --git a/kubernetes/sdnc/components/sdnc-web/values.yaml b/kubernetes/sdnc/components/sdnc-web/values.yaml index 136379a7a2..5496e9a554 100644 --- a/kubernetes/sdnc/components/sdnc-web/values.yaml +++ b/kubernetes/sdnc/components/sdnc-web/values.yaml @@ -27,7 +27,7 @@ global: ################################################################# # application image repository: nexus3.onap.org:10001 -image: "onap/sdnc-web-image:2.0.4" +image: "onap/sdnc-web-image:2.0.5" pullPolicy: Always config: diff --git a/kubernetes/sdnc/components/ueb-listener/values.yaml b/kubernetes/sdnc/components/ueb-listener/values.yaml index 2b0da14424..09a3b5d7d1 100644 --- a/kubernetes/sdnc/components/ueb-listener/values.yaml +++ b/kubernetes/sdnc/components/ueb-listener/values.yaml @@ -61,7 +61,7 @@ secrets: ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/sdnc-ueb-listener-image:2.0.4 +image: onap/sdnc-ueb-listener-image:2.0.5 pullPolicy: Always # flag to enable debugging - application support required diff --git a/kubernetes/sdnc/resources/config/bin/createLinks.sh b/kubernetes/sdnc/resources/config/bin/createLinks.sh new file mode 100755 index 0000000000..1999dabb37 --- /dev/null +++ b/kubernetes/sdnc/resources/config/bin/createLinks.sh @@ -0,0 +1,69 @@ +#!/bin/sh + +### +# ============LICENSE_START======================================================= +# ONAP : SDN-C +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights +# reserved. +# ================================================================================ +# 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. +# ============LICENSE_END========================================================= +### + + +if [ "$MDSAL_PATH" = "" ] +then + MDSAL_PATH=/opt/opendaylight/mdsal +fi + +if [ "$DAEXIM_PATH" = "" ] +then + DAEXIM_PATH=/opt/opendaylight/daexim +fi + +if [ "$JOURNAL_PATH" = "" ] +then + JOURNAL_PATH=/opt/opendaylight/journal +fi + +if [ "$SNAPSHOTS_PATH" = "" ] +then + SNAPSHOTS_PATH=/opt/opendaylight/snapshots +fi + + +if [ ! -L $DAEXIM_PATH ] +then + ln -s $MDSAL_PATH/daexim $DAEXIM_PATH +fi + +if [ ! -L $JOURNAL_PATH ] +then + if [ -d $JOURNAL_PATH ] + then + mv $JOURNAL_PATH/* $MDSAL_PATH/journal + rm -f $JOURNAL_PATH + fi + ln -s $MDSAL_PATH/journal $JOURNAL_PATH +fi + +if [ ! -L $SNAPSHOTS_PATH ] +then + if [ -d $SNAPSHOTS_PATH ] + then + mv $SNAPSHOTS_PATH/* $MDSAL_PATH/snapshots + rm -f $SNAPSHOTS_PATH + fi + ln -s $MDSAL_PATH/snapshots $SNAPSHOTS_PATH +fi diff --git a/kubernetes/sdnc/resources/config/conf/org.opendaylight.aaa.filterchain.cfg b/kubernetes/sdnc/resources/config/conf/org.opendaylight.aaa.filterchain.cfg new file mode 100755 index 0000000000..cffc526fb6 --- /dev/null +++ b/kubernetes/sdnc/resources/config/conf/org.opendaylight.aaa.filterchain.cfg @@ -0,0 +1 @@ +customFilterList=org.onap.ccsdk.sli.core.filters.ControllerAuditLogFilter,org.onap.ccsdk.sli.core.filters.ControllerPayloadLoggingFilter diff --git a/kubernetes/sdnc/templates/pv-data.yaml b/kubernetes/sdnc/templates/pv-data.yaml index e40bdd6ea3..a0d998cd07 100644 --- a/kubernetes/sdnc/templates/pv-data.yaml +++ b/kubernetes/sdnc/templates/pv-data.yaml @@ -1,46 +1,17 @@ {{/* -# Copyright © 2018 Amdocs, AT&T, Bell Canada -# # -# # 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. +# Copyright © 2018 Amdocs, Bell Canada, AT&T +# +# 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. */}} -{{- $global := . }} -{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) -}} -{{- if eq "True" (include "common.needPV" .) -}} -{{- range $i := until (int $global.Values.replicaCount)}} -kind: PersistentVolume -apiVersion: v1 -metadata: - name: {{ include "common.fullname" $global }}-data-{{ $i }} - namespace: {{ include "common.namespace" $global }} - labels: - app: {{ include "common.fullname" $global }} - chart: "{{ $global.Chart.Name }}-{{ $global.Chart.Version | replace "+" "_" }}" - release: "{{ include "common.release" $global }}" - heritage: "{{ $global.Release.Service }}" - name: {{ include "common.fullname" $global }} -spec: - capacity: - storage: {{ $global.Values.persistence.size}} - accessModes: - - {{ $global.Values.persistence.accessMode }} - storageClassName: "{{ include "common.fullname" $global }}-data" - persistentVolumeReclaimPolicy: {{ $global.Values.persistence.volumeReclaimPolicy }} - hostPath: - path: {{ $global.Values.global.persistence.mountPath | default $global.Values.persistence.mountPath }}/{{ include "common.release" $global }}/{{ $global.Values.persistence.mountSubPath }}-{{$i}} -{{if ne $i (int $global.Values.replicaCount) }} ---- -{{- end -}} -{{- end -}} -{{- end -}} -{{- end -}} +{{ include "common.replicaPV" . }} diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml index 98ad43ed60..91af687d04 100644 --- a/kubernetes/sdnc/templates/statefulset.yaml +++ b/kubernetes/sdnc/templates/statefulset.yaml @@ -141,15 +141,19 @@ spec: name: certservice-tls-volume {{ end }} - - name: {{ include "common.name" . }}-chown + - name: {{ include "common.name" . }}-init-files image: {{ .Values.global.busyboxRepository | default .Values.busyboxRepository }}/{{ .Values.global.busyboxImage | default .Values.busyboxImage }} command: - sh args: - -c - - chown -R {{ .Values.config.odlUid }}:{{ .Values.config.odlGid}} {{ .Values.persistence.mdsalPath }} + - | + mkdir {{ .Values.persistence.mdsalPath }}/daexim + mkdir {{ .Values.persistence.mdsalPath }}/journal + mkdir {{ .Values.persistence.mdsalPath }}/snapshots + chown -R {{ .Values.config.odlUid }}:{{ .Values.config.odlGid}} {{ .Values.persistence.mdsalPath }} {{- if .Values.global.aafEnabled }} - - chown -R {{ .Values.config.odlUid }}:{{ .Values.config.odlGid}} {{ .Values.certInitializer.credsPath }} + chown -R {{ .Values.config.odlUid }}:{{ .Values.config.odlGid}} {{ .Values.certInitializer.credsPath }} {{- end }} volumeMounts: {{ include "common.certInitializer.volumeMount" . | indent 10 }} @@ -160,7 +164,7 @@ spec: image: "{{ include "common.repository" . }}/{{ .Values.image }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} command: ["/bin/bash"] - args: ["-c", "/opt/onap/sdnc/bin/startODL.sh"] + args: ["-c", "/opt/onap/sdnc/bin/createLinks.sh ; /opt/onap/sdnc/bin/startODL.sh"] ports: - containerPort: {{ .Values.service.internalPort }} - containerPort: {{ .Values.service.internalPort2 }} @@ -200,6 +204,14 @@ spec: value: "{{ .Values.replicaCount }}" - name: MYSQL_HOST value: {{ include "common.mariadbService" . }} + - name: MDSAL_PATH + value: {{ .Values.persistence.mdsalPath }} + - name: DAEXIM_PATH + value: {{ .Values.persistence.daeximPath }} + - name: JOURNAL_PATH + value: {{ .Values.persistence.journalPath }} + - name: SNAPSHOTS_PATH + value: {{ .Values.persistence.snapshotsPath }} - name: JAVA_HOME value: "{{ .Values.config.javaHome}}" - name: JAVA_OPTS @@ -233,6 +245,9 @@ spec: - mountPath: {{ .Values.config.binDir }}/installSdncDb.sh name: bin subPath: installSdncDb.sh + - mountPath: {{ .Values.config.binDir }}/createLinks.sh + name: bin + subPath: createLinks.sh - mountPath: {{ .Values.config.ccsdkConfigDir }}/aaiclient.properties name: properties subPath: aaiclient.properties @@ -267,6 +282,9 @@ spec: - mountPath: {{ .Values.config.odl.etcDir }}/org.opendaylight.controller.cluster.datastore.cfg name: properties subPath: org.opendaylight.controller.cluster.datastore.cfg + - mountPath: {{ .Values.config.odl.etcDir }}/org.opendaylight.aaa.filterchain.cfg + name: properties + subPath: org.opendaylight.aaa.filterchain.cfg - mountPath: {{ .Values.config.odl.binDir }}/setenv name: properties subPath: setenv diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml index f710deb4c0..aab1edfee3 100644 --- a/kubernetes/sdnc/values.yaml +++ b/kubernetes/sdnc/values.yaml @@ -136,7 +136,7 @@ secrets: repository: nexus3.onap.org:10001 pullPolicy: Always -image: onap/sdnc-image:2.0.4 +image: onap/sdnc-image:2.0.5 busyboxRepository: docker.io busyboxImage: busybox:1.30 @@ -193,7 +193,7 @@ config: binDir: /opt/opendaylight/bin gcLogDir: /opt/opendaylight/data/log salConfigDir: /opt/opendaylight/system/org/opendaylight/controller/sal-clustering-config - salConfigVersion: 1.9.1 + salConfigVersion: 1.10.4 akka: seedNodeTimeout: 15s circuitBreaker: @@ -436,7 +436,10 @@ persistence: size: 1Gi mountPath: /dockerdata-nfs mountSubPath: sdnc/mdsal - mdsalPath: /opt/opendaylight/current/daexim + mdsalPath: /opt/opendaylight/mdsal + daeximPath: /opt/opendaylight/daexim + journalPath: /opt/opendaylight/journal + snapshotsPath: /opt/opendaylight/snapshots certpersistence: enabled: true diff --git a/kubernetes/so/components/so-bpmn-infra/values.yaml b/kubernetes/so/components/so-bpmn-infra/values.yaml index 2bb7d7b44c..d234e6007c 100755 --- a/kubernetes/so/components/so-bpmn-infra/values.yaml +++ b/kubernetes/so/components/so-bpmn-infra/values.yaml @@ -67,7 +67,7 @@ secrets: # Application configuration defaults. ################################################################# repository: nexus3.onap.org:10001 -image: onap/so/bpmn-infra:1.7.10 +image: onap/so/bpmn-infra:1.7.11 pullPolicy: Always db: diff --git a/kubernetes/so/components/so-catalog-db-adapter/values.yaml b/kubernetes/so/components/so-catalog-db-adapter/values.yaml index b27566d336..319d45bdea 100755 --- a/kubernetes/so/components/so-catalog-db-adapter/values.yaml +++ b/kubernetes/so/components/so-catalog-db-adapter/values.yaml @@ -66,7 +66,8 @@ secrets: # Application configuration defaults. ################################################################# repository: nexus3.onap.org:10001 -image: onap/so/catalog-db-adapter:1.7.10 +image: onap/so/catalog-db-adapter:1.7.11 + pullPolicy: Always db: diff --git a/kubernetes/so/components/so-cnf-adapter/values.yaml b/kubernetes/so/components/so-cnf-adapter/values.yaml index 7cfa75a152..31c493598f 100755 --- a/kubernetes/so/components/so-cnf-adapter/values.yaml +++ b/kubernetes/so/components/so-cnf-adapter/values.yaml @@ -76,7 +76,8 @@ secrets: ################################################################# # Application configuration defaults. ################################################################# -image: onap/so/mso-cnf-adapter:1.7.1 +repository: nexus3.onap.org:10001 +image: onap/so/mso-cnf-adapter:1.7.11 pullPolicy: Always db: userName: so_user diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml index 0612f506c5..cc8d15b48c 100644 --- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml +++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml @@ -60,7 +60,8 @@ secrets: # Application configuration defaults. ################################################################# repository: nexus3.onap.org:10001 -image: onap/so/so-etsi-nfvo-ns-lcm:1.7.7 +image: onap/so/so-etsi-nfvo-ns-lcm:1.7.11 + pullPolicy: Always aai: diff --git a/kubernetes/so/components/so-monitoring/values.yaml b/kubernetes/so/components/so-monitoring/values.yaml index 31ad9d072c..a4bf6c370b 100644 --- a/kubernetes/so/components/so-monitoring/values.yaml +++ b/kubernetes/so/components/so-monitoring/values.yaml @@ -71,7 +71,7 @@ secrets: # Application configuration defaults. ################################################################# repository: nexus3.onap.org:10001 -image: onap/so/so-monitoring:1.7.7 +image: onap/so/so-monitoring:1.7.11 pullPolicy: Always db: diff --git a/kubernetes/so/components/so-nssmf-adapter/values.yaml b/kubernetes/so/components/so-nssmf-adapter/values.yaml index 40a55c6c0b..5b629e8d9c 100755 --- a/kubernetes/so/components/so-nssmf-adapter/values.yaml +++ b/kubernetes/so/components/so-nssmf-adapter/values.yaml @@ -79,7 +79,8 @@ secrets: # Application configuration defaults. ################################################################# repository: nexus3.onap.org:10001 -image: onap/so/nssmf-adapter:1.7.10 +image: onap/so/nssmf-adapter:1.7.11 + pullPolicy: Always db: diff --git a/kubernetes/so/components/so-oof-adapter/values.yaml b/kubernetes/so/components/so-oof-adapter/values.yaml index 6bddf29032..2641201bb0 100755 --- a/kubernetes/so/components/so-oof-adapter/values.yaml +++ b/kubernetes/so/components/so-oof-adapter/values.yaml @@ -76,8 +76,10 @@ secrets: ################################################################# # Application configuration defaults. ################################################################# + repository: nexus3.onap.org:10001 -image: onap/so/so-oof-adapter:1.7.4 +image: onap/so/so-oof-adapter:1.7.11 + pullPolicy: Always mso: diff --git a/kubernetes/so/components/so-openstack-adapter/values.yaml b/kubernetes/so/components/so-openstack-adapter/values.yaml index 129ad59385..d41904b288 100755 --- a/kubernetes/so/components/so-openstack-adapter/values.yaml +++ b/kubernetes/so/components/so-openstack-adapter/values.yaml @@ -61,7 +61,7 @@ secrets: ################################################################# # Application configuration defaults. ################################################################# -image: onap/so/openstack-adapter:1.7.10 +image: onap/so/openstack-adapter:1.7.11 pullPolicy: Always repository: nexus3.onap.org:10001 diff --git a/kubernetes/so/components/so-request-db-adapter/values.yaml b/kubernetes/so/components/so-request-db-adapter/values.yaml index e221870306..8cffdb1ebc 100755 --- a/kubernetes/so/components/so-request-db-adapter/values.yaml +++ b/kubernetes/so/components/so-request-db-adapter/values.yaml @@ -62,7 +62,8 @@ secrets: # Application configuration defaults. ################################################################# repository: nexus3.onap.org:10001 -image: onap/so/request-db-adapter:1.7.10 +image: onap/so/request-db-adapter:1.7.11 + pullPolicy: Always db: diff --git a/kubernetes/so/components/so-sdc-controller/values.yaml b/kubernetes/so/components/so-sdc-controller/values.yaml index be3be26bc3..865db79f43 100755 --- a/kubernetes/so/components/so-sdc-controller/values.yaml +++ b/kubernetes/so/components/so-sdc-controller/values.yaml @@ -62,7 +62,8 @@ secrets: # Application configuration defaults. ################################################################# repository: nexus3.onap.org:10001 -image: onap/so/sdc-controller:1.7.10 +image: onap/so/sdc-controller:1.7.11 + pullPolicy: Always db: diff --git a/kubernetes/so/components/so-sdnc-adapter/values.yaml b/kubernetes/so/components/so-sdnc-adapter/values.yaml index cabd60e011..d545fd3172 100755 --- a/kubernetes/so/components/so-sdnc-adapter/values.yaml +++ b/kubernetes/so/components/so-sdnc-adapter/values.yaml @@ -61,7 +61,7 @@ secrets: # Application configuration defaults. ################################################################# repository: nexus3.onap.org:10001 -image: onap/so/sdnc-adapter:1.7.10 +image: onap/so/sdnc-adapter:1.7.11 pullPolicy: Always org: diff --git a/kubernetes/so/components/so-vfc-adapter/values.yaml b/kubernetes/so/components/so-vfc-adapter/values.yaml index f88e117fae..50860777a3 100755 --- a/kubernetes/so/components/so-vfc-adapter/values.yaml +++ b/kubernetes/so/components/so-vfc-adapter/values.yaml @@ -61,7 +61,8 @@ secrets: # Application configuration defaults. ################################################################# repository: nexus3.onap.org:10001 -image: onap/so/vfc-adapter:1.7.10 +image: onap/so/vfc-adapter:1.7.11 + pullPolicy: Always db: diff --git a/kubernetes/so/components/so-vnfm-adapter/values.yaml b/kubernetes/so/components/so-vnfm-adapter/values.yaml index f8fa7c93be..ef41c44a44 100755 --- a/kubernetes/so/components/so-vnfm-adapter/values.yaml +++ b/kubernetes/so/components/so-vnfm-adapter/values.yaml @@ -33,7 +33,8 @@ global: # Application configuration defaults. ################################################################# repository: nexus3.onap.org:10001 -image: onap/so/vnfm-adapter:1.7.10 +image: onap/so/vnfm-adapter:1.7.11 + pullPolicy: Always aaf: diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml index a51f21a921..bf540da995 100755 --- a/kubernetes/so/values.yaml +++ b/kubernetes/so/values.yaml @@ -174,8 +174,9 @@ dbCreds: userName: so_user adminName: so_admin + repository: nexus3.onap.org:10001 -image: onap/so/api-handler-infra:1.7.10 +image: onap/so/api-handler-infra:1.7.11 server: aaf: diff --git a/tox.ini b/tox.ini index 60f93a35e4..c685a3fdd2 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,28 @@ [tox] minversion = 1.6 envlist = + docs, + docs-linkcheck, gitlint, skipsdist=true +[doc8] +ignore-path-errors=docs/helm-search.txt;D001 + +[testenv:doc8] +deps = -rdocs/requirements-docs.txt +commands = + doc8 docs/ + +[testenv:docs] +deps = -rdocs/requirements-docs.txt +commands = + sphinx-build -W -b html -n -W -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html + +[testenv:docs-linkcheck] +deps = -rdocs/requirements-docs.txt +commands = sphinx-build -W -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/linkcheck + [testenv:gitlint] basepython = python3 deps =