summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorJan Malkiewicz <jan.malkiewicz@nokia.com>2021-02-22 15:40:00 +0100
committerRemigiusz Janeczek <remigiusz.janeczek@nokia.com>2021-02-27 14:43:16 +0000
commit1f21b6e740dd3bca5a0eb2ceaff7ccca2fb9cc6e (patch)
tree0bd87e378de5c2871399b32993adcaa5990c055d /kubernetes
parentee9dcfa335b1ad71af665c5dd6604bb779891bf1 (diff)
[DCAEGEN2] Top up cm-container
Update cloudify manager container with support for Cert Manager Certificates. Add configuration for underlying k8splugin for CMPv2 with Cert Manager integration. Issue-ID: DCAEGEN2-2440 Signed-off-by: Jan Malkiewicz <jan.malkiewicz@nokia.com> Signed-off-by: Tomasz Wrobel <tomasz.wrobel@nokia.com> Change-Id: I8739835c8649278005d2ef763dcbf16beb86decd
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/dcaegen2/components/dcae-cloudify-manager/resources/config/plugins/k8s-plugin.json6
-rw-r--r--kubernetes/dcaegen2/components/dcae-cloudify-manager/values.yaml7
2 files changed, 11 insertions, 2 deletions
diff --git a/kubernetes/dcaegen2/components/dcae-cloudify-manager/resources/config/plugins/k8s-plugin.json b/kubernetes/dcaegen2/components/dcae-cloudify-manager/resources/config/plugins/k8s-plugin.json
index c967774cb9..6018abe309 100644
--- a/kubernetes/dcaegen2/components/dcae-cloudify-manager/resources/config/plugins/k8s-plugin.json
+++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/resources/config/plugins/k8s-plugin.json
@@ -3,7 +3,7 @@
#=================================================================================
# Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2018 Amdocs, Bell Canada
-# Modifications (c) 2020 Nokia. All rights reserved.
+# Modifications (c) 2020-2021 Nokia. 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.
@@ -55,5 +55,9 @@
},
"cert_post_processor": {
"image_tag": "{{ include "repositoryGenerator.repository" . }}/{{ .Values.cmpv2Config.global.platform.certPostProcessor.image }}"
+ },
+ "cmpv2_issuer": {
+ "enabled": "{{ .Values.global.CMPv2CertManagerIntegration }}",
+ "name": "{{ .Values.cmpv2issuer.name }}"
}
}
diff --git a/kubernetes/dcaegen2/components/dcae-cloudify-manager/values.yaml b/kubernetes/dcaegen2/components/dcae-cloudify-manager/values.yaml
index 9022f60b80..312eaa47fb 100644
--- a/kubernetes/dcaegen2/components/dcae-cloudify-manager/values.yaml
+++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/values.yaml
@@ -28,6 +28,11 @@ global:
repositoryCred:
user: docker
password: docker
+ # Enabling CMPv2 with CertManager
+ CMPv2CertManagerIntegration: false
+
+cmpv2issuer:
+ name: cmpv2-issuer-onap
secrets:
- uid: 'cm-pass'
@@ -50,7 +55,7 @@ config:
# Application configuration defaults.
#################################################################
# application image
-image: onap/org.onap.dcaegen2.deployments.cm-container:4.3.1
+image: onap/org.onap.dcaegen2.deployments.cm-container:4.4.0
pullPolicy: Always
# name of shared ConfigMap with kubeconfig for multiple clusters