From: Sylvain Desbureaux Date: Thu, 29 Oct 2020 12:40:02 +0000 (+0000) Subject: Merge "[SO] change comment style" X-Git-Tag: 7.0.0~63 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d7fd48ee3880a662c57e206fd67a9df27ba91651;hp=-c;p=oom.git Merge "[SO] change comment style" --- d7fd48ee3880a662c57e206fd67a9df27ba91651 diff --combined kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml index 6aa2356bed,19e31eb5a9..cf448cc9cd --- a/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml +++ b/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml @@@ -1,3 -1,4 +1,4 @@@ + {{/* # Copyright © 2018 AT&T USA # # Licensed under the Apache License, Version 2.0 (the "License"); @@@ -11,6 -12,7 +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. + */}} aai: auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.aai.auth )}} dme2: @@@ -92,7 -94,7 +94,7 @@@ 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/v1/vnfs + endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/rest/{{ .Values.vnf.api.version }}/vnfs volume-groups: rest: endpoint: http://so-openstack-adapter.{{ include "common.namespace" . }}:8087/services/rest/v1/volume-groups diff --combined kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml index 322fd4142f,6320a27bcc..c9aa5823bf --- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml +++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml @@@ -1,3 -1,4 +1,4 @@@ + {{/* # Copyright © 2020 Nordix Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); @@@ -11,6 -12,7 +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. + */}} aai: auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.aai.auth )}} @@@ -61,10 -63,3 +63,10 @@@ etsi-catalog-manager {{- else }} endpoint: http://modeling-etsicatalog.{{ include "common.namespace" . }}:8806/api {{- end }} +camunda: + bpm: + history-level: full + job-execution: + max-pool-size: 30 + core-pool-size: 3 + deployment-aware: true diff --combined kubernetes/so/components/so-etsi-nfvo-ns-lcm/templates/deployment.yaml index bc36fc1f46,21f278b087..9408c1f556 --- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/templates/deployment.yaml +++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/templates/deployment.yaml @@@ -1,3 -1,4 +1,4 @@@ + {{/* # Copyright © 2020 Nordix Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); @@@ -11,6 -12,7 +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: apps/v1 kind: Deployment @@@ -39,7 -41,6 +41,7 @@@ spec {{- if .Values.global.aafEnabled }} export $(grep '^c' {{ .Values.soHelpers.certInitializer.credsPath }}/mycreds.prop | xargs -0) export TRUSTSTORE_PASSWORD="${cadi_truststore_password}" + export TRUSTSTORE="file:/${TRUSTSTORE}" {{- if .Values.global.security.aaf.enabled }} export KEYSTORE_PASSWORD="${cadi_keystore_password}" {{- end }} @@@ -83,7 -84,7 +85,7 @@@ readOnly: true - name: {{ include "common.fullname" . }}-truststore mountPath: /app/client - readonly: true + readOnly: true livenessProbe: tcpSocket: port: {{ index .Values.livenessProbe.port }} diff --combined kubernetes/so/components/so-nssmf-adapter/templates/deployment.yaml index f37c8b2166,910aa73208..f1ec31adf1 --- a/kubernetes/so/components/so-nssmf-adapter/templates/deployment.yaml +++ b/kubernetes/so/components/so-nssmf-adapter/templates/deployment.yaml @@@ -1,3 -1,4 +1,4 @@@ + {{/* # Copyright © 2020 Huawei Technologies Co., Ltd. # # Licensed under the Apache License, Version 2.0 (the "License"); @@@ -11,6 -12,7 +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: apps/v1 kind: Deployment metadata: {{- include "common.resourceMetadata" . | nindent 2 }} @@@ -89,7 -91,7 +91,7 @@@ spec {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "server-actuator-creds" "key" "login") | indent 14 }} - name: ACTUATOR_PASSWORD_INPUT {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "server-actuator-creds" "key" "password") | indent 14 }} - {{ include "so.certificates.env" . | indent 8 | trim }} + {{ include "so.certificates.env" . | nindent 12 }} envFrom: - configMapRef: name: {{ include "common.fullname" . }}-env