From 2091000187895ad5e68eed85fc489711b0e5af05 Mon Sep 17 00:00:00 2001 From: Vijay Venkatesh Kumar Date: Tue, 7 Sep 2021 12:19:48 -0400 Subject: [DCAEMOD] RuntimAPI updates for HELM-gen integration - Add switch for RuntimeAPI support for cloudify/helm - Add new properties for Chartmuseum integration for helm-gen tool - Bumpup onboardingAPI container version to support v3 Change-Id: I956632d04fa4ac4cac552ebf2b63432e29fe2386 Signed-off-by: Vijay Venkatesh Kumar Issue-ID: DCAEGEN2-2694 Signed-off-by: Vijay Venkatesh Kumar --- .../config/addons/templates/certificates.yaml | 3 + .../resources/config/base/Chart.yaml | 43 +++++++++ .../resources/config/base/templates/configmap.yaml | 1 + .../config/base/templates/deployment.yaml | 1 + .../resources/config/base/templates/secret.yaml | 1 + .../resources/config/base/templates/service.yaml | 1 + .../resources/config/base/values.yaml | 100 +++++++++++++++++++++ 7 files changed, 150 insertions(+) create mode 100644 kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/addons/templates/certificates.yaml create mode 100644 kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/Chart.yaml create mode 100644 kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/templates/configmap.yaml create mode 100644 kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/templates/deployment.yaml create mode 100644 kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/templates/secret.yaml create mode 100644 kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/templates/service.yaml create mode 100644 kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/values.yaml (limited to 'kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config') diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/addons/templates/certificates.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/addons/templates/certificates.yaml new file mode 100644 index 0000000000..8c964ecd02 --- /dev/null +++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/addons/templates/certificates.yaml @@ -0,0 +1,3 @@ +{{ if and .Values.certDirectory .Values.global.cmpv2Enabled .Values.global.CMPv2CertManagerIntegration }} +{{ include "certManagerCertificate.certificate" . }} +{{ end }} \ No newline at end of file diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/Chart.yaml new file mode 100644 index 0000000000..4496ee5d9c --- /dev/null +++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/Chart.yaml @@ -0,0 +1,43 @@ +#============LICENSE_START======================================================== +#================================================================================= +# Copyright (c) 2021 AT&T Intellectual Property. 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========================================================= + +apiVersion: v2 +appVersion: "Istanbul" +description: TBD +name: TBD +version: TBD + +dependencies: + - name: common + version: ~9.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~9.x-0 + repository: '@local' + - name: readinessCheck + version: ~9.x-0 + repository: '@local' + - name: dcaegen2-services-common + version: ~9.x-0 + repository: '@local' + - name: postgres + version: ~9.x-0 + repository: '@local' + condition: postgres.enabled + - name: serviceAccount + version: ~9.x-0 + repository: '@local' diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/templates/configmap.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/templates/configmap.yaml new file mode 100644 index 0000000000..866a9ad672 --- /dev/null +++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/templates/configmap.yaml @@ -0,0 +1 @@ +{{ include "dcaegen2-services-common.configMap" . }} diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/templates/deployment.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/templates/deployment.yaml new file mode 100644 index 0000000000..bef31a7a3a --- /dev/null +++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/templates/deployment.yaml @@ -0,0 +1 @@ +{{ include "dcaegen2-services-common.microserviceDeployment" . }} \ No newline at end of file diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/templates/secret.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/templates/secret.yaml new file mode 100644 index 0000000000..6ee9297869 --- /dev/null +++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/templates/secret.yaml @@ -0,0 +1 @@ +{{ include "common.secretFast" . }} diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/templates/service.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/templates/service.yaml new file mode 100644 index 0000000000..f024c64864 --- /dev/null +++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/templates/service.yaml @@ -0,0 +1 @@ +{{ include "common.service" . }} diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/values.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/values.yaml new file mode 100644 index 0000000000..139e3d308f --- /dev/null +++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/values.yaml @@ -0,0 +1,100 @@ +#============LICENSE_START======================================================== +#================================================================================= +# Copyright (c) 2021 AT&T Intellectual Property. 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========================================================= +################################################################# +# Global configuration defaults. +################################################################# +global: + nodePortPrefix: 302 + nodePortPrefixExt: 304 + +################################################################# +# Filebeat configuration defaults. +################################################################# +filebeatConfig: + logstashServiceName: log-ls + logstashPort: 5044 + +################################################################# +# initContainer images. +################################################################# +tlsImage: onap/org.onap.dcaegen2.deployments.tls-init-container:2.1.0 +consulLoaderImage: onap/org.onap.dcaegen2.deployments.consul-loader-container:1.1.0 + +################################################################# +# Application configuration defaults. +################################################################# +# application image +image: TBD #DONE +pullPolicy: Always + +#policy sync image +dcaePolicySyncImage: onap/org.onap.dcaegen2.deployments.dcae-services-policy-sync:1.0.1 + +#postgres enable/disable +postgres: + enabled: false + +# log directory where logging sidecar should look for log files +# if absent, no sidecar will be deployed +#logDirectory: TBD #/opt/app/VESCollector/logs #DONE + +# directory where TLS certs should be stored +# if absent, no certs will be retrieved and stored +#certDirectory: TBD #/opt/app/dcae-certificate #DONE + +# TLS role -- set to true if microservice acts as server +# If true, an init container will retrieve a server cert +# and key from AAF and mount them in certDirectory. +#tlsServer: TBD #DONE + +# dependencies +readinessCheck: + wait_for: + - dcae-config-binding-service + - aaf-cm + +# probe configuration #NEED DISCUSSION +readiness: + initialDelaySeconds: TBD + periodSeconds: TBD + path: TBD + scheme: TBD + port: TBD + +# Resource Limit flavor -By Default using small +flavor: small +# Segregation for Different environment (Small and Large) +resources: + small: + limits: + cpu: 2 + memory: 2Gi + requests: + cpu: 1 + memory: 1Gi + large: + limits: + cpu: 4 + memory: 4Gi + requests: + cpu: 2 + memory: 2Gi + unlimited: {} +serviceAccount: + nameOverride: TBD + roles: + - read -- cgit 1.2.3-korg