Merge branch 'master' into cherry

[it/dep.git] / nonrtric / helm / nonrtricgateway / templates / configmap.yaml

diff --git a/nonrtric/helm/controlpanel/resources/application.properties b/nonrtric/helm/nonrtricgateway/templates/configmap.yaml
similarity index 53%
rename from nonrtric/helm/controlpanel/resources/application.properties
rename to nonrtric/helm/nonrtricgateway/templates/configmap.yaml
index 3c1699e..d391d1e 100644 (file)
--- a/nonrtric/helm/controlpanel/resources/application.properties
+++ b/nonrtric/helm/nonrtricgateway/templates/configmap.yaml
@@ -1,5 +1,5 @@
 ################################################################################
-#   Copyright (c) 2020 Nordix Foundation.                                      #
+#   Copyright (c) 2021 Nordix Foundation.                                      #
 #                                                                              #
 #   Licensed under the Apache License, Version 2.0 (the "License");            #
 #   you may not use this file except in compliance with the License.           #
@@ -13,27 +13,17 @@
 #   See the License for the specific language governing permissions and        #
 #   limitations under the License.                                             #
 ################################################################################
-server.port = 8082
-server.ssl.key-store-type = PKCS12
-server.ssl.key-store-password = ericsson_kwdjfhw
-server.ssl.key-store =  classpath:keystore.jks
-server.ssl.key-password = ericsson_kwdjfhw
-server.http.port = 8080
-# https api
-policycontroller.url.prefix = https://policymanagementservice:9081
-# http api
-#policycontroller.url.prefix = http://policymanagementservice:9080
-userfile = users.json
-portalapi.decryptor = org.oransc.portal.nonrtric.controlpanel.portalapi.PortalSdkDecryptorAes
-portalapi.usercookie = UserId
-portalapi.security = false
-portalapi.appname = Non-RT RIC Control Panel
-portalapi.username = Default
-portalapi.password = password
 
-# URL for enrichment coordinator service
-# enrichmentcontroller.url.prefix = https://enrichment-service-container:8434
-enrichmentcontroller.url.prefix = http://enrichment-service-container:8083/ei-producer/v1
 
-# Mimic slow endpoints by defining sleep period, in milliseconds
-mock.config.delay = 0
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "common.name.nonrtricgateway" . }}-configmap
+  namespace: {{ include "common.namespace.nonrtric" . }}
+  labels:
+    app: {{ include "common.namespace.nonrtric" . }}-{{ include "common.name.nonrtricgateway" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
\ No newline at end of file