Merge pull request #223 from bci-oss/feature/autogenerate-password

Adjust to implement autogenerate Password if not set
eclipse-tractusx · Jan 23, 2024 · 03981eb · 03981eb
2 parents 885f5a6 + e238e57
commit 03981eb
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 13 deletions.
diff --git a/charts/semantic-hub/Chart.yaml b/charts/semantic-hub/Chart.yaml
@@ -1,6 +1,6 @@
 ###############################################################
-# Copyright (c) 2021, 2023 Robert Bosch Manufacturing Solutions GmbH
-# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+# Copyright (c) 2021, 2024 Robert Bosch Manufacturing Solutions GmbH
+# Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
@@ -26,7 +26,7 @@ sources:
   - https://github.com/eclipse-tractusx/sldt-semantic-hub
 
 type: application
-version: 0.1.34
+version: 0.1.35
 appVersion: 0.2.16
 dependencies:
   - repository: https://charts.bitnami.com/bitnami

diff --git a/charts/semantic-hub/templates/hub/hub-secret.yaml b/charts/semantic-hub/templates/hub/hub-secret.yaml
@@ -1,6 +1,6 @@
 ###############################################################
-# Copyright (c) 2021, 2023 Robert Bosch Manufacturing Solutions GmbH
-# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+# Copyright (c) 2021, 2024 Robert Bosch Manufacturing Solutions GmbH
+# Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
@@ -37,4 +37,13 @@ data:
   # the fuseki instance does not require authentication yet
   # this variables need to be provided because they are mandatory in the application
   HUB_TRIPLE_STORE_USERNAME: {{ .Values.graphdb.username | b64enc }}
-  HUB_TRIPLE_STORE_PASSWORD: {{ .Values.graphdb.password | b64enc }}
+  {{ if .Values.graphdb.password -}}
+  HUB_TRIPLE_STORE_PASSWORD: {{ ( .Values.graphdb.password | b64enc) }}
+  {{ else }}                                                         
+  {{- $secret := (lookup "v1" "Secret" .Release.Namespace $sec_name) }}
+  {{ if $secret -}}                                                     
+  HUB_TRIPLE_STORE_PASSWORD: {{ index $secret.data "HUB_TRIPLE_STORE_PASSWORD" | quote }}
+  {{- else -}}
+  HUB_TRIPLE_STORE_PASSWORD: {{ randAlphaNum 32 | b64enc }}
+  {{- end }}
+  {{- end -}}
diff --git a/charts/semantic-hub/values.yaml b/charts/semantic-hub/values.yaml
@@ -1,6 +1,6 @@
 ###############################################################
-# Copyright (c) 2021, 2023 Robert Bosch Manufacturing Solutions GmbH
-# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+# Copyright (c) 2021, 2024 Robert Bosch Manufacturing Solutions GmbH
+# Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
@@ -20,7 +20,7 @@
 
 
 # enables the default keycloak identity provider
-enableKeycloak: true
+enableKeycloak: false
 
 hub:
   image:
@@ -77,7 +77,7 @@ graphdb:
   queryEndpoint: query
   updateEndpoint: update
   username: admin
-  password: admin
+  password:
   javaOptions: "-Xmx1048m -Xms1048m"
   args: ["--tdb2", "--update", "--loc", "databases/", "/ds"]
   storageClassName: default
@@ -94,10 +94,10 @@ graphdb:
 
 keycloak:
   postgresql:
-    enabled: true
+    enabled: false
   auth:
-    adminUser: admin
-    adminPassword: "admin"
+    adminUser:
+    adminPassword:
   service:
     type: ClusterIP
   extraVolumes: