From d12a1b6c672ec9c1db51bb0dd8d0cb61ef22aa25 Mon Sep 17 00:00:00 2001 From: Jack Lucas Date: Mon, 11 Jan 2021 12:46:33 -0500 Subject: [DCAEGEN2] Updates to bootstrap and cm-container Update cm-container to 4.1.0 Update bootstrap to 3.0.0 Move plugin configuration from bootstrap to cm-container Remove unneeded inputs files Issue-ID: DCAEGEN2-2542 Issue-ID: DCAEGEN2-2582 Issue-ID: DCAEGEN2-2543 Issue-ID: DCAEGEN2-2383 Signed-off-by: Jack Lucas Change-Id: I30a3f549d9811adedc8472fd410038eaa068e771 --- .../resources/config/k8s-plugin.json | 60 ---------------------- 1 file changed, 60 deletions(-) delete mode 100644 kubernetes/dcaegen2/components/dcae-bootstrap/resources/config/k8s-plugin.json (limited to 'kubernetes/dcaegen2/components/dcae-bootstrap/resources/config/k8s-plugin.json') diff --git a/kubernetes/dcaegen2/components/dcae-bootstrap/resources/config/k8s-plugin.json b/kubernetes/dcaegen2/components/dcae-bootstrap/resources/config/k8s-plugin.json deleted file mode 100644 index 5e37856d19..0000000000 --- a/kubernetes/dcaegen2/components/dcae-bootstrap/resources/config/k8s-plugin.json +++ /dev/null @@ -1,60 +0,0 @@ -{{/* -#============LICENSE_START======================================================== -#================================================================================= -# Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved. -# Modifications Copyright © 2018 Amdocs, Bell Canada -# Modifications (c) 2020 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. -# 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========================================================= -*/}} - -{ - "namespace": "{{ if .Values.dcae_ns }}{{ .Values.dcae_ns}}{{ else }}{{include "common.namespace" . }}{{ end}}", - "consul_dns_name": "{{ .Values.config.address.consul.host }}.{{ include "common.namespace" . }}", - "default_k8s_location": "{{ .Values.default_k8s_location }}", - "image_pull_secrets": [ - "{{ include "common.namespace" . }}-docker-registry-key" - ], - "filebeat": { - "log_path": "/var/log/onap", - "data_path": "/usr/share/filebeat/data", - "config_path": "/usr/share/filebeat/filebeat.yml", - "config_subpath": "filebeat.yml", - "image": "{{ include "repositoryGenerator.image.logging" . }}", - "config_map": "{{ include "common.release" . }}-dcae-filebeat-configmap" - }, - "tls": { - "cert_path": "/opt/app/osaaf", - "image": "{{ include "repositoryGenerator.repository" . }}/{{ .Values.global.tlsImage }}", - "component_cert_dir": "/opt/dcae/cacert", - "component_ca_cert_path": "/opt/dcae/cacert/cacert.pem", - "ca_cert_configmap": "{{ include "common.fullname" . }}-dcae-cacert" - }, - "external_cert": { - "image_tag": "{{ include "repositoryGenerator.repository" . }}/{{ .Values.cmpv2Config.global.platform.certServiceClient.image }}", - "request_url": "{{ .Values.cmpv2Config.global.platform.certServiceClient.envVariables.requestURL }}", - "timeout": "{{ .Values.cmpv2Config.global.platform.certServiceClient.envVariables.requestTimeout }}", - "country": "{{ .Values.cmpv2Config.global.platform.certServiceClient.envVariables.cmpv2Country }}", - "organization": "{{ .Values.cmpv2Config.global.platform.certServiceClient.envVariables.cmpv2Organization }}", - "state": "{{ .Values.cmpv2Config.global.platform.certServiceClient.envVariables.cmpv2State }}", - "organizational_unit": "{{ .Values.cmpv2Config.global.platform.certServiceClient.envVariables.cmpv2OrganizationalUnit }}", - "location": "{{ .Values.cmpv2Config.global.platform.certServiceClient.envVariables.cmpv2Location }}", - "cert_secret_name": "{{ .Values.cmpv2Config.global.platform.certServiceClient.secretName }}", - "keystore_password": "{{ .Values.cmpv2Config.global.platform.certServiceClient.envVariables.keystorePassword }}", - "truststore_password": "{{ .Values.cmpv2Config.global.platform.certServiceClient.envVariables.truststorePassword }}" - }, - "cert_post_processor": { - "image_tag": "{{ include "repositoryGenerator.repository" . }}/{{ .Values.cmpv2Config.global.platform.certPostProcessor.image }}" - } -} -- cgit 1.2.3-korg