OPSEXP-2296 update url approach

Alfresco · Dec 20, 2023 · eda1966 · eda1966
1 parent f70b557
commit eda1966
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/charts/alfresco-connector-msteams/templates/config-connector-msteams.yaml b/charts/alfresco-connector-msteams/templates/config-connector-msteams.yaml
@@ -1,4 +1,3 @@
-{{- if not .Values.repository.existingConfigMap.name -}}
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -12,12 +11,10 @@ data:
   {{ $key }}: {{ $val | quote }}
   {{- end }}
   {{- end }}
-  ALFRESCO_BASE_URL: "{{ .Values.alfresco.baseUrl }}"
   ALFRESCO_DIGITAL_WORKSPACE_CONTEXT_PATH: "{{ .Values.alfresco.digitalWorkspace.contextPath }}"
   MICROSOFT_APP_ID: "{{ .Values.microsoft.app.id }}"
   MICROSOFT_APP_PASSWORD: "{{ .Values.microsoft.app.password }}"
   MICROSOFT_APP_OAUTH_CONNECTION_NAME: "{{ .Values.microsoft.app.oauth.connectionName }}"
   TEAMS_CHAT_FILENAME_ENABLED: "{{ .Values.teams.chat.filenameEnabled }}"
   TEAMS_CHAT_METADATA_ENABLED: "{{ .Values.teams.chat.metadataEnabled }}"
   TEAMS_CHAT_IMAGE_ENABLED: "{{ .Values.teams.chat.imageEnabled }}"
-{{- end -}}
diff --git a/charts/alfresco-connector-msteams/templates/configmap-repository.yaml b/charts/alfresco-connector-msteams/templates/configmap-repository.yaml
@@ -0,0 +1,12 @@
+{{- if not .Values.repository.existingConfigMap.name -}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  {{- $ctx := dict "Values" (dict "nameOverride" "repo-teams") "Chart" .Chart "Release" .Release }}
+  name: {{ template "alfresco-connector-msteams.fullname" $ctx }}
+  labels:
+    {{- include "alfresco-connector-msteams.labels" . | nindent 4 }}
+data:
+  {{- $reqmsg := "You must provide a base URL in the repository.url" }}
+  ALFRESCO_BASE_URL: {{ required $reqmsg .Values.alfresco.baseUrl | quote }}
+{{- end }}
diff --git a/charts/alfresco-connector-msteams/templates/deployment-connector-msteams.yaml b/charts/alfresco-connector-msteams/templates/deployment-connector-msteams.yaml
@@ -63,16 +63,17 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           {{- include "alfresco-common.component-security-context" .Values | indent 8 }}
-          {{- $msteams_details_cm := .Values.repository.existingConfigMap.name | default (print (include "alfresco-connector-msteams.fullname" .) "-configmap") }}
+          envFrom:
+            - configMapRef:
+                name: {{ template "alfresco-connector-msteams.fullname" . }}
           env:
+            {{- $msteamsCmCtx := dict "Values" (dict "nameOverride" "repo-teams") "Chart" .Chart "Release" .Release }}
+            {{- $msteamsCm := coalesce .Values.repository.existingConfigMap.name (include "alfresco-connector-msteams.fullname" $msteamsCmCtx) }}
             - name: ALFRESCO_BASE_URL
               valueFrom:
                 configMapKeyRef:
-                  name: {{ $msteams_details_cm }}
+                  name: {{ $msteamsCm }}
                   key: {{ .Values.repository.existingConfigMap.keys.url }}
-          envFrom:
-            - configMapRef:
-                name: {{ template "alfresco-connector-msteams.fullname" . }}
           ports:
               - containerPort: {{ .Values.image.internalPort }}
           resources: {{- toYaml .Values.resources | nindent 12 }}