diff options
Diffstat (limited to 'kubernetes/onap')
| -rwxr-xr-x | kubernetes/onap/requirements.yaml | 4 | ||||
| -rwxr-xr-x | kubernetes/onap/values.yaml | 18 |
2 files changed, 5 insertions, 17 deletions
diff --git a/kubernetes/onap/requirements.yaml b/kubernetes/onap/requirements.yaml index 335629d8e2..3e96bdf3ec 100755 --- a/kubernetes/onap/requirements.yaml +++ b/kubernetes/onap/requirements.yaml @@ -39,10 +39,6 @@ dependencies: version: ~7.x-0 repository: '@local' condition: cds.enabled - - name: clamp - version: ~7.x-0 - repository: '@local' - condition: clamp.enabled - name: cli version: ~7.x-0 repository: '@local' diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml index 60850b7aed..0920222ad7 100755 --- a/kubernetes/onap/values.yaml +++ b/kubernetes/onap/values.yaml @@ -1,6 +1,6 @@ # Copyright © 2019 Amdocs, Bell Canada # Copyright (c) 2020 Nordix Foundation, Modifications -# Modifications Copyright © 2020 Nokia +# Modifications Copyright © 2020-2021 Nokia # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -179,7 +179,8 @@ global: # default values for certificates certificate: default: - renewBefore: 8h + renewBefore: 720h #30 days + duration: 8760h #365 days subject: organization: "Linux-Foundation" country: "US" @@ -190,27 +191,18 @@ global: group: certmanager.onap.org kind: CMPv2Issuer name: cmpv2-issuer-onap - p12Keystore: - create: false - passwordSecretRef: - name: "" - key: "" - jksKeystore: - create: false - passwordSecretRef: - name: "" - key: "" # Enabling CMPv2 cmpv2Enabled: true CMPv2CertManagerIntegration: false platform: certServiceClient: - image: onap/org.onap.oom.platform.cert-service.oom-certservice-client:2.3.2 + image: onap/org.onap.oom.platform.cert-service.oom-certservice-client:2.3.3 secret: name: oom-cert-service-client-tls-secret mountPath: /etc/onap/oom/certservice/certs/ envVariables: + certPath: "/var/custom-certs" # Certificate related cmpv2Organization: "Linux-Foundation" cmpv2OrganizationalUnit: "ONAP" |