fix(Bridge): Fix connection on bridge to gate on deploy helm

eclipse-tractusx · Jun 1, 2023 · fa8898f · fa8898f
1 parent 6202ae1
commit fa8898f
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 23 deletions.
diff --git a/charts/bpdm/Chart.yaml b/charts/bpdm/Chart.yaml
@@ -22,7 +22,7 @@ apiVersion: v2
 name: bpdm
 type: application
 description: A Helm chart for Kubernetes that deploys the gate and pool applications
-version: 3.0.0
+version: 3.0.1
 appVersion: 1.0.0
 home: https://github.com/eclipse-tractusx/bpdm
 sources:

diff --git a/charts/bpdm/charts/bpdm-bridge-dummy/templates/_helpers.tpl b/charts/bpdm/charts/bpdm-bridge-dummy/templates/_helpers.tpl
@@ -70,13 +70,13 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
         {{- if and $pool (not (empty (index $pool "base-url"))) -}}
             {{- index $pool "base-url" -}}
         {{- else -}}
-            {{- printf "%s-bpdm-pool" .Release.Name -}}
+            {{- print "http://" (printf "%s-bpdm-pool" .Release.Name) ":8080" -}}
         {{- end -}}
     {{- else -}}
-        {{- printf "%s-bpdm-pool" .Release.Name -}}
+        {{- print "http://" (printf "%s-bpdm-pool" .Release.Name) ":8080" -}}
     {{- end -}}
 {{- else -}}
-    {{- printf "%s-bpdm-pool" .Release.Name -}}
+    {{- print "http://" (printf "%s-bpdm-pool" .Release.Name) ":8080" -}}
 {{- end -}}
 {{- end }}
 
@@ -89,13 +89,13 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
         {{- if and $gate (not (empty (index $gate "base-url"))) -}}
             {{- index $gate "base-url" -}}
         {{- else -}}
-            {{- printf "%s-bpdm-gate" .Release.Name -}}
+            {{- print "http://" (printf "%s-bpdm-gate" .Release.Name) ":8080" -}}
         {{- end -}}
     {{- else -}}
-        {{- printf "%s-bpdm-gate" .Release.Name -}}
+        {{- print "http://" (printf "%s-bpdm-gate" .Release.Name) ":8080" -}}
     {{- end -}}
 {{- else -}}
-    {{- printf "%s-bpdm-gate" .Release.Name -}}
+    {{- print "http://" (printf "%s-bpdm-gate" .Release.Name) ":8080" -}}
 {{- end -}}
 {{- end }}
 

diff --git a/charts/bpdm/charts/bpdm-gate/templates/_helpers.tpl b/charts/bpdm/charts/bpdm-gate/templates/_helpers.tpl
@@ -70,13 +70,13 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
         {{- if and $pool (not (empty (index $pool "base-url"))) -}}
             {{- index $pool "base-url" -}}
         {{- else -}}
-            {{- printf "%s-bpdm-pool" .Release.Name -}}
+            {{- print "http://" (printf "%s-bpdm-pool" .Release.Name) ":8080" -}}
         {{- end -}}
     {{- else -}}
-        {{- printf "%s-bpdm-pool" .Release.Name -}}
+        {{- print "http://" (printf "%s-bpdm-pool" .Release.Name) ":8080" -}}
     {{- end -}}
 {{- else -}}
-    {{- printf "%s-bpdm-pool" .Release.Name -}}
+    {{- print "http://" (printf "%s-bpdm-pool" .Release.Name) ":8080" -}}
 {{- end -}}
 {{- end }}
 

diff --git a/charts/bpdm/values.yaml b/charts/bpdm/values.yaml
@@ -8,9 +8,11 @@ bpdm-gate:
     tag: ""
   # ... more configuration for bpdm-gate if need...
   applicationConfig:
-    bpdm:
-      pool:
-        base-url: ""
+# Use this configuration to specify custom base-urls for the bpdm pool and gate.
+# Only needed if the automatic default deploy is not used.
+#    bpdm:
+#      pool:
+#        base-url: ""
   postgres:
     enabled: false
 
@@ -38,11 +40,13 @@ bpdm-bridge-dummy:
     pullPolicy: Always
     tag: ""
   applicationConfig:
-    bpdm:
-      pool:
-        base-url: ""
-      gate:
-        base-url: ""
+# Use this configuration to specify custom base-urls for the bpdm pool and gate.
+# Only needed if the automatic default deploy is not used.
+#    bpdm:
+#      pool:
+#        base-url: ""
+#      gate:
+#        base-url: ""
   postgres:
     enabled: false
 
@@ -65,16 +69,11 @@ opensearch:
       memory: 2Gi
   config:
     opensearch.yml: |
-      # Bind to all interfaces because we don't know what
-      # IP address Docker will assign to us.
       network.host: 0.0.0.0
-      # Disable security
       plugins.security.disabled: true
   securityConfig:
     enabled: false
   extraInitContainers:
-    # Image that performs the sysctl operation to modify Kernel settings
-    # needed sometimes to avoid boot errors
     - name: sysctl
       image: docker.io/bitnami/bitnami-shell:10-debian-10-r199
       imagePullPolicy: "IfNotPresent"