OPSEXP-2529: ACTIVITI-5113 workaround (#266)

Alfresco · Apr 8, 2024 · 2cfce81 · 2cfce81
1 parent eb7e9b7
commit 2cfce81
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 5 deletions.
diff --git a/charts/alfresco-activiti-admin/Chart.yaml b/charts/alfresco-activiti-admin/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart for Alfresco Activiti
 name: alfresco-activiti-admin
-version: 0.1.0-alpha.1
+version: 0.1.0-alpha.2
 appVersion: 24.1.0
 dependencies:
   - name: alfresco-common

diff --git a/charts/alfresco-activiti-admin/README.md b/charts/alfresco-activiti-admin/README.md
@@ -1,6 +1,6 @@
 # alfresco-activiti-admin
 
-![Version: 0.1.0-alpha.1](https://img.shields.io/badge/Version-0.1.0--alpha.1-informational?style=flat-square) ![AppVersion: 24.1.0](https://img.shields.io/badge/AppVersion-24.1.0-informational?style=flat-square)
+![Version: 0.1.0-alpha.2](https://img.shields.io/badge/Version-0.1.0--alpha.2-informational?style=flat-square) ![AppVersion: 24.1.0](https://img.shields.io/badge/AppVersion-24.1.0-informational?style=flat-square)
 
 A Helm chart for Alfresco Activiti
 
@@ -64,3 +64,4 @@ A Helm chart for Alfresco Activiti
 | tolerations | list | `[]` |  |
 | volumeMounts | list | `[]` |  |
 | volumes | list | `[]` |  |
+| workaround.ACTIVITI-5113 | bool | `true` | Enable workaround for https://hyland.atlassian.net/browse/ACTIVITI-5113 Set to `true` to enable the workaround Set to `false` to disable the workaround |
diff --git a/charts/alfresco-activiti-admin/templates/_helpers-rest.tpl b/charts/alfresco-activiti-admin/templates/_helpers-rest.tpl
@@ -0,0 +1,6 @@
+{{- define "alfresco-activiti-admin.rest.baseUrl" -}}
+{{- $restScheme := include "alfresco-common.url.scheme" .Values.environment.ACTIVITI_ADMIN_REST_APP_HOST }}
+{{- $restHost := include "alfresco-common.url.host" .Values.environment.ACTIVITI_ADMIN_REST_APP_HOST }}
+{{- $urlRoot := index .Values "workaround" "ACTIVITI-5113" | ternary "\\/\\/" "//"}}
+{{- printf "%s:%s%s" $restScheme $urlRoot $restHost }}
+{{- end -}}
diff --git a/charts/alfresco-activiti-admin/templates/configmap.yaml b/charts/alfresco-activiti-admin/templates/configmap.yaml
@@ -6,7 +6,11 @@ metadata:
     {{- include "alfresco-activiti-admin.labels" . | nindent 4 }}
 data:
   {{- if .Values.environment }}
-  {{- range $key, $val := .Values.environment }}
-  {{ $key }}: {{ tpl $val $ | quote }}
-  {{- end }}
+    {{- range $key, $val := .Values.environment }}
+      {{- if eq $key "ACTIVITI_ADMIN_REST_APP_HOST" }}
+        {{- $key | nindent 4 }}: {{ template "alfresco-activiti-admin.rest.baseUrl" $ }}
+      {{- else }}
+        {{- $key | nindent 4 }}: {{ tpl $val $ | quote }}
+      {{- end }}
+    {{- end }}
   {{- end }}
diff --git a/charts/alfresco-activiti-admin/values.yaml b/charts/alfresco-activiti-admin/values.yaml
@@ -82,6 +82,12 @@ database:
       # -- Key within the secret holding the database password for admin app
       password: DATABASE_PASSWORD
 
+workaround:
+  # -- Enable workaround for https://hyland.atlassian.net/browse/ACTIVITI-5113
+  # Set to `true` to enable the workaround
+  # Set to `false` to disable the workaround
+  ACTIVITI-5113: true
+
 tags:
   # -- A chart tag used for Hyland's CI purpose. Do not set it to true.
   ci: false