From 4c2f9de0e109324c18aba0200db02891aade7cb4 Mon Sep 17 00:00:00 2001
From: trantzas <ktrantzas@ece.upatras.gr>
Date: Wed, 16 Apr 2025 22:40:24 +0000
Subject: [PATCH] Updating HELM chart with application.yml values

---
 helm/templates/deployment.yaml | 23 +++++++++++++++++++----
 helm/values.yaml               | 26 +++++++++++++++++++++++++-
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml
index 2d0a64a..464c909 100644
--- a/helm/templates/deployment.yaml
+++ b/helm/templates/deployment.yaml
@@ -33,10 +33,25 @@ spec:
               value: >-
                 {
                   "logging.level.org.springframework" : "{{ .Values.spring.logLevel | default "INFO" }}",
-                  "logging.level.org.etsi.osl.controllers.oslcapif" : "{{ .Values.logLevel | default "INFO" }}" 
+                  "logging.level.org.etsi.osl.controllers.capif.invoker.*" : "{{ .Values.logLevel | default "INFO" }}"
+                  "spring.activemq.brokerUrl": "{{ .Values.activemq.brokerUrl }}", 
+                  "spring.activemq.user": "{{ .Values.activemq.user }}", 
+                  "spring.activemq.password": "{{ .Values.activemq.password }}",
+                  "capif.REGISTER_HOSTNAME": "{{ .Values.capif.registerHostname }}",
+                  "capif.REGISTER_PORT": "{{ .Values.capif.registerPort }}",
+                  "capif.USER_NAME": "{{ .Values.capif.userName }}",
+                  "capif.USER_PASSWORD": "{{ .Values.capif.userPassword }}",
+                  "capif.CAPIF_HOSTNAME": "{{ .Values.capif.hostname }}",
+                  "capif.CAPIF_PORT": "{{ .Values.capif.port }}",
+                  "capif.ONBOARDING_URL": "{{ .Values.capif.onboardingUrl }}",
+                  "capif.ONBOARDING_URL_INVOKER": "{{ .Values.capif.onboardingUrlInvoker }}",
+                  "capif.DISCOVER_URL": "{{ .Values.capif.discoveryUrl }}",
+                  "capif.ALLOW_INSECURE": "{{ .Values.capif.allowInsecure }}",
+                  "capif.TRUSTSTORE_PATH": "{{ .Values.capif.TrustorePath }}",
+                  "capif.TRUSTSTORE_PASSWORD": "{{ .Values.capif.TrustorePassword }}",
+                  "capif.authRefreshTokensPeriod": "{{ .Values.capif.authRefreshTokensPeriod }}",
+                  "capif.processBearerRefreshTokenPeriod": "{{ .Values.capif.processBearerRefreshTokenPeriod }}"
                 }
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
-      restartPolicy: Always
-
-      
\ No newline at end of file
+      restartPolicy: Always
\ No newline at end of file
diff --git a/helm/values.yaml b/helm/values.yaml
index 0f72b3f..7ccddb6 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -9,10 +9,34 @@ image:
     # Overrides the image tag whose default is the chart appVersion.
     tag: "latest"
 
-logLevel: INFO
+logLevel: DEBUG
 spring:
   loglevel: INFO
 
+activemq:
+  brokerUrl: tcp://osl.etsi.org:61616?jms.watchTopicAdvisories=false
+  user: artemis
+  password: artemis
+
+capif:
+  registerHostname: localhost
+  registerPort: 8084
+  userName: custom_user
+  userPassword: user_pass
+  hostname: capifcore
+  port: 443
+  onboardingUrl: api-provider-management/v1/registrations
+  onboardingUrlInvoker: api-invoker-management/v1/onboardedInvokers
+  discoveryUrl: service-apis/v1/allServiceAPIs
+  allowInsecure: true
+  TrustorePath: none
+  TrustorePassword: none
+  authRefreshTokensPeriod: 36000
+  processBearerRefreshTokenPeriod: 180000
+
+# need to add dynamic invokers
+
+
 autoscaling:
   enabled: false
   minReplicas: 1
-- 
GitLab