diff options
Diffstat (limited to 'kubernetes/cds')
15 files changed, 63 insertions, 35 deletions
diff --git a/kubernetes/cds/Chart.yaml b/kubernetes/cds/Chart.yaml index 09955edb86..f2f6cc5092 100644 --- a/kubernetes/cds/Chart.yaml +++ b/kubernetes/cds/Chart.yaml @@ -1,5 +1,5 @@ # Copyright © 2017 Amdocs, Bell Canada -# Modifications Copyright © 2018 Orange +# Modifications Copyright © 2018-2021 Orange # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP Controller Design Studio (CDS) name: cds -version: 8.0.0 +version: 9.0.0 diff --git a/kubernetes/cds/components/cds-blueprints-processor/Chart.yaml b/kubernetes/cds/components/cds-blueprints-processor/Chart.yaml index 002670712b..18c18b6630 100755 --- a/kubernetes/cds/components/cds-blueprints-processor/Chart.yaml +++ b/kubernetes/cds/components/cds-blueprints-processor/Chart.yaml @@ -1,4 +1,5 @@ # Copyright (c) 2019 IBM, Bell Canada +# Modifications Copyright © 2021 Orange # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,4 +16,4 @@ apiVersion: v1 description: ONAP CDS Blueprints Processor name: cds-blueprints-processor -version: 8.0.0 +version: 9.0.0 diff --git a/kubernetes/cds/components/cds-blueprints-processor/requirements.yaml b/kubernetes/cds/components/cds-blueprints-processor/requirements.yaml index baf1a760ab..84fa9c4ce8 100755 --- a/kubernetes/cds/components/cds-blueprints-processor/requirements.yaml +++ b/kubernetes/cds/components/cds-blueprints-processor/requirements.yaml @@ -1,4 +1,5 @@ # Copyright (c) 2019 IBM, Bell Canada +# Modifications Copyright © 2021 Orange # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,15 +15,14 @@ dependencies: - name: common - version: ~8.x-0 + version: ~9.x-0 repository: '@local' - name: repositoryGenerator - version: ~8.x-0 + version: ~9.x-0 repository: '@local' - name: serviceAccount - version: ~8.x-0 + version: ~9.x-0 repository: '@local' - name: certInitializer - version: ~8.x-0 + version: ~9.x-0 repository: '@local' - diff --git a/kubernetes/cds/components/cds-blueprints-processor/values.yaml b/kubernetes/cds/components/cds-blueprints-processor/values.yaml index d21598a4ba..dc2002877a 100755 --- a/kubernetes/cds/components/cds-blueprints-processor/values.yaml +++ b/kubernetes/cds/components/cds-blueprints-processor/values.yaml @@ -31,6 +31,17 @@ global: sdncOamService: sdnc-oam sdncOamPort: 8282 + #AAF is enabled by default + #aafEnabled: true + + #enable importCustomCerts to add custom CA to blueprint processor pod + #importCustomCertsEnabled: true + + #use below configmap to add custom CA certificates + #certificates with *.pem will be added to JAVA truststore $JAVA_HOME/lib/security/cacerts in the pod + #certificates with *.crt will be added to /etc/ssl/certs/ca-certificates.crt in the pod + #customCertsConfigMap: onap-cds-blueprints-processor-configmap + ################################################################# # Secrets metaconfig ################################################################# @@ -51,7 +62,7 @@ secrets: # AAF part ################################################################# certInitializer: - nameOverride: cds-blueprints-processor-initializer + nameOverride: cds-blueprints-processor-cert-initializer aafDeployFqi: deployer@people.osaaf.org aafDeployPass: demo123456! # aafDeployCredsExternalSecret: some secret @@ -63,6 +74,10 @@ certInitializer: app_ns: org.osaaf.aaf credsPath: /opt/app/osaaf/local fqi_namespace: org.onap.sdnc-cds + #enable below if we need custom CA to be added to blueprint processor pod + #importCustomCertsEnabled: true + #truststoreMountpath: /opt/onap/cds + #truststoreOutputFileName: truststoreONAPall.jks aaf_add_config: > /opt/app/aaf_config/bin/agent.sh; /opt/app/aaf_config/bin/agent.sh local showpass diff --git a/kubernetes/cds/components/cds-command-executor/Chart.yaml b/kubernetes/cds/components/cds-command-executor/Chart.yaml index a2659f43f8..8d0e5f3c76 100755 --- a/kubernetes/cds/components/cds-command-executor/Chart.yaml +++ b/kubernetes/cds/components/cds-command-executor/Chart.yaml @@ -1,4 +1,5 @@ # Copyright (c) 2019 Bell Canada +# Modifications Copyright © 2021 Orange # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,4 +16,4 @@ apiVersion: v1 description: ONAP CDS Command Executor name: cds-command-executor -version: 8.0.0 +version: 9.0.0 diff --git a/kubernetes/cds/components/cds-command-executor/requirements.yaml b/kubernetes/cds/components/cds-command-executor/requirements.yaml index 96ce828880..59ed00428a 100755 --- a/kubernetes/cds/components/cds-command-executor/requirements.yaml +++ b/kubernetes/cds/components/cds-command-executor/requirements.yaml @@ -1,4 +1,5 @@ # Copyright (c) 2019 Bell Canada +# Modifications Copyright © 2021 Orange # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,11 +15,11 @@ dependencies: - name: common - version: ~8.x-0 + version: ~9.x-0 repository: '@local' - name: repositoryGenerator - version: ~8.x-0 + version: ~9.x-0 repository: '@local' - name: serviceAccount - version: ~8.x-0 + version: ~9.x-0 repository: '@local' diff --git a/kubernetes/cds/components/cds-command-executor/templates/deployment.yaml b/kubernetes/cds/components/cds-command-executor/templates/deployment.yaml index 3ce24e2e84..da835162e7 100755 --- a/kubernetes/cds/components/cds-command-executor/templates/deployment.yaml +++ b/kubernetes/cds/components/cds-command-executor/templates/deployment.yaml @@ -98,7 +98,11 @@ spec: hostPath: path: /etc/localtime - name: {{ include "common.fullname" . }}-blueprints + {{- if .Values.persistence.enabled }} persistentVolumeClaim: claimName: {{ include "common.release" . }}-cds-blueprints + {{- else }} + emptyDir: {} + {{- end }} imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" diff --git a/kubernetes/cds/components/cds-command-executor/values.yaml b/kubernetes/cds/components/cds-command-executor/values.yaml index 0f7b55632a..658a899c1e 100755 --- a/kubernetes/cds/components/cds-command-executor/values.yaml +++ b/kubernetes/cds/components/cds-command-executor/values.yaml @@ -72,7 +72,7 @@ service: externalPort: 10005 persistence: - enabled: true + enabled: false mountSubPath: cds/blueprints/deploy deployedBlueprint: /opt/app/onap/blueprints/deploy diff --git a/kubernetes/cds/components/cds-py-executor/Chart.yaml b/kubernetes/cds/components/cds-py-executor/Chart.yaml index e4d145329c..d0bfc51c16 100755 --- a/kubernetes/cds/components/cds-py-executor/Chart.yaml +++ b/kubernetes/cds/components/cds-py-executor/Chart.yaml @@ -1,4 +1,5 @@ # Copyright (c) 2020 Bell Canada, Deutsche Telekom +# Modifications Copyright © 2021 Orange # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,4 +16,4 @@ apiVersion: v1 description: ONAP CDS Py Executor name: cds-py-executor -version: 8.0.0 +version: 9.0.0 diff --git a/kubernetes/cds/components/cds-py-executor/requirements.yaml b/kubernetes/cds/components/cds-py-executor/requirements.yaml index 6b7064caca..331a2a4810 100755 --- a/kubernetes/cds/components/cds-py-executor/requirements.yaml +++ b/kubernetes/cds/components/cds-py-executor/requirements.yaml @@ -1,4 +1,5 @@ # Copyright (c) 2020 Bell Canada, Deutsche Telekom +# Modifications Copyright © 2021 Orange # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,11 +15,11 @@ dependencies: - name: common - version: ~8.x-0 + version: ~9.x-0 repository: '@local' - name: repositoryGenerator - version: ~8.x-0 + version: ~9.x-0 repository: '@local' - name: serviceAccount - version: ~8.x-0 + version: ~9.x-0 repository: '@local' diff --git a/kubernetes/cds/components/cds-sdc-listener/Chart.yaml b/kubernetes/cds/components/cds-sdc-listener/Chart.yaml index 9f524b2b70..8897062a39 100755 --- a/kubernetes/cds/components/cds-sdc-listener/Chart.yaml +++ b/kubernetes/cds/components/cds-sdc-listener/Chart.yaml @@ -1,4 +1,5 @@ # Copyright (c) 2019 Bell Canada +# Modifications Copyright © 2021 Orange # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,4 +16,4 @@ apiVersion: v1 description: ONAP CDS SDC listener microservice name: cds-sdc-listener -version: 8.0.0 +version: 9.0.0 diff --git a/kubernetes/cds/components/cds-sdc-listener/requirements.yaml b/kubernetes/cds/components/cds-sdc-listener/requirements.yaml index 96ce828880..59ed00428a 100755 --- a/kubernetes/cds/components/cds-sdc-listener/requirements.yaml +++ b/kubernetes/cds/components/cds-sdc-listener/requirements.yaml @@ -1,4 +1,5 @@ # Copyright (c) 2019 Bell Canada +# Modifications Copyright © 2021 Orange # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,11 +15,11 @@ dependencies: - name: common - version: ~8.x-0 + version: ~9.x-0 repository: '@local' - name: repositoryGenerator - version: ~8.x-0 + version: ~9.x-0 repository: '@local' - name: serviceAccount - version: ~8.x-0 + version: ~9.x-0 repository: '@local' diff --git a/kubernetes/cds/components/cds-ui/Chart.yaml b/kubernetes/cds/components/cds-ui/Chart.yaml index 1fb0dd5ff7..5d40e2bdb8 100644 --- a/kubernetes/cds/components/cds-ui/Chart.yaml +++ b/kubernetes/cds/components/cds-ui/Chart.yaml @@ -1,4 +1,5 @@ # Copyright (c) 2019 Bell Canada +# Modifications Copyright © 2021 Orange # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,4 +16,4 @@ apiVersion: v1 description: ONAP CDS UI name: cds-ui -version: 8.0.0 +version: 9.0.0 diff --git a/kubernetes/cds/components/cds-ui/requirements.yaml b/kubernetes/cds/components/cds-ui/requirements.yaml index 8f6d158a17..fec1da905d 100644 --- a/kubernetes/cds/components/cds-ui/requirements.yaml +++ b/kubernetes/cds/components/cds-ui/requirements.yaml @@ -1,4 +1,5 @@ # Copyright (c) 2019 Bell Canada +# Modifications Copyright © 2021 Orange # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,14 +15,14 @@ dependencies: - name: common - version: ~8.x-0 + version: ~9.x-0 repository: '@local' - name: certInitializer - version: ~8.x-0 + version: ~9.x-0 repository: '@local' - name: repositoryGenerator - version: ~8.x-0 + version: ~9.x-0 repository: '@local' - name: serviceAccount - version: ~8.x-0 + version: ~9.x-0 repository: '@local' diff --git a/kubernetes/cds/requirements.yaml b/kubernetes/cds/requirements.yaml index 58ae5a03e8..c5c05bb43d 100644 --- a/kubernetes/cds/requirements.yaml +++ b/kubernetes/cds/requirements.yaml @@ -1,5 +1,5 @@ # Copyright © 2017 Amdocs, Bell Canada -# Modifications Copyright © 2018 Orange +# Modifications Copyright © 2018,2020-2021 Orange # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,28 +15,28 @@ dependencies: - name: common - version: ~8.x-0 + version: ~9.x-0 repository: '@local' - name: mariadb-galera - version: ~8.x-0 + version: ~9.x-0 repository: '@local' - name: cds-blueprints-processor - version: ~8.x-0 + version: ~9.x-0 repository: 'file://components/cds-blueprints-processor' condition: cds-blueprints-processor.enabled - name: cds-command-executor - version: ~8.x-0 + version: ~9.x-0 repository: 'file://components/cds-command-executor' condition: cds-command-executor.enabled - name: cds-py-executor - version: ~8.x-0 + version: ~9.x-0 repository: 'file://components/cds-py-executor' condition: cds-py-executor.enabled - name: cds-sdc-listener - version: ~8.x-0 + version: ~9.x-0 repository: 'file://components/cds-sdc-listener' condition: cds-sdc-listener.enabled - name: cds-ui - version: ~8.x-0 + version: ~9.x-0 repository: 'file://components/cds-ui' condition: cds-ui.enabled |