From: Fiachra Corcoran <fiachra.corcoran@est.tech>
Date: Wed, 7 Dec 2022 15:47:55 +0000 (+0000)
Subject: Merge "[DCAEGEN2] Ves-open-api Add mech to load config at deploy time"
X-Git-Tag: 12.0.0~149
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=5baf1c91590378270d9b01c5406e89f1f80dcfd3;hp=f782dd401e681b5490b5eebd1673f298d485db71;p=oom.git

Merge "[DCAEGEN2] Ves-open-api Add mech to load config at deploy time"
---

diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/Chart.yaml
index 33b129555f..6c8550c727 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/Chart.yaml
@@ -35,3 +35,6 @@ dependencies:
   - name: serviceAccount
     version: ~12.x-0
     repository: '@local'
+  - name: dcaegen2-services-common
+    version: ~12.x-0
+    repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/templates/configmap.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/templates/configmap.yaml
new file mode 100644
index 0000000000..7253125d50
--- /dev/null
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/templates/configmap.yaml
@@ -0,0 +1,20 @@
+{{/*
+#============LICENSE_START========================================================
+# ================================================================================
+# Copyright (c) 2022 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=========================================================
+*/}}
+
+{{ include "dcaegen2-services-common.configMap" . }}
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/templates/deployment.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/templates/deployment.yaml
index a2c15450bf..25658390b2 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/templates/deployment.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/templates/deployment.yaml
@@ -58,6 +58,8 @@ spec:
           volumeMounts:
             - name: schema-map
               mountPath: {{ .Values.schemaMap.directory }}
+            - name: app-config
+              mountPath: /app/config/
       serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       volumes:
         - name: schema-map
@@ -67,5 +69,10 @@ spec:
             items:
               - key: {{ .Values.schemaMap.filename }}
                 path: {{ .Values.schemaMap.filename }}
+        - name: app-config
+          configMap:
+            name: {{ include "common.fullname" . }}-application-config-configmap
+            defaultMode: 420
+            optional: true
       imagePullSecrets:
-      - name: "{{ include "common.namespace" . }}-docker-registry-key"
\ No newline at end of file
+      - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/values.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/values.yaml
index a9763c9483..4f1f18444c 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/values.yaml
@@ -94,3 +94,22 @@ serviceAccount:
   nameOverride: dcae-ves-openapi-manager
   roles:
     - read
+
+# initial application configuration
+applicationConfig:
+  vesopenapimanager:
+    validation:
+      schemaMapPath: ${SCHEMA_MAP_PATH:./src/main/resources/schema-map.json}
+      eventDomainPath: /event/structure/commonEventHeader/structure/domain/value
+      eventSchemaReferencePath: /event/structure/stndDefinedFields/structure/schemaReference/value
+    distribution:
+      sdcAddress: ${SDC_ADDRESS:sdc-be.onap:30204}
+      user: dcae
+      password: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+      pollingInterval: 20
+      pollingTimeout: 20
+      consumerGroup: dcaegen2
+      environmentName: AUTO
+      consumerID: ves-openapi-manager
+      activateServerTLSAuth: false
+      isFilterInEmptyResources: false