From 69bc787c5f5cdafdc8b968bf98fc65cdbadc2fe9 Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Mon, 25 Sep 2023 16:50:48 +0200
Subject: [PATCH] make repository secrets optional

---
 charts/alfresco-repository/Chart.lock                 | 6 +++---
 charts/alfresco-repository/Chart.yaml                 | 4 ++--
 charts/alfresco-repository/README.md                  | 4 ++--
 charts/alfresco-repository/templates/deployment.yaml  | 4 ++--
 charts/alfresco-repository/tests/deployment_test.yaml | 1 +
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/charts/alfresco-repository/Chart.lock b/charts/alfresco-repository/Chart.lock
index e31c7727..4339c70c 100644
--- a/charts/alfresco-repository/Chart.lock
+++ b/charts/alfresco-repository/Chart.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: alfresco-common
   repository: https://alfresco.github.io/alfresco-helm-charts/
-  version: 2.1.0
+  version: 3.0.0-alpha.1
 - name: postgresql
   repository: oci://registry-1.docker.io/bitnamicharts
   version: 12.5.6
-digest: sha256:043a1323627d74eed9c3675ebe4c704df37d01011d07fb704fa24f1a81703c1b
-generated: "2023-09-07T16:17:44.513368+02:00"
+digest: sha256:22d0c45ef4db47622194e37559c7b4be5f45100a9439ac0c2fc7ef35f42261b0
+generated: "2023-09-25T16:46:46.082717+02:00"
diff --git a/charts/alfresco-repository/Chart.yaml b/charts/alfresco-repository/Chart.yaml
index 90bc5128..e01e94b9 100644
--- a/charts/alfresco-repository/Chart.yaml
+++ b/charts/alfresco-repository/Chart.yaml
@@ -2,11 +2,11 @@ apiVersion: v2
 name: alfresco-repository
 description: Alfresco content repository Helm chart
 type: application
-version: 0.1.0-alpha.8
+version: 0.1.0-alpha.9
 appVersion: 23.1.0-A21
 dependencies:
   - name: alfresco-common
-    version: 2.1.0
+    version: 3.0.0-alpha.1
     repository: https://alfresco.github.io/alfresco-helm-charts/
   - name: postgresql
     version: 12.5.6
diff --git a/charts/alfresco-repository/README.md b/charts/alfresco-repository/README.md
index 620670a8..41a374b8 100644
--- a/charts/alfresco-repository/README.md
+++ b/charts/alfresco-repository/README.md
@@ -1,6 +1,6 @@
 # alfresco-repository
 
-![Version: 0.1.0-alpha.8](https://img.shields.io/badge/Version-0.1.0--alpha.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 23.1.0-A21](https://img.shields.io/badge/AppVersion-23.1.0--A21-informational?style=flat-square)
+![Version: 0.1.0-alpha.9](https://img.shields.io/badge/Version-0.1.0--alpha.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 23.1.0-A21](https://img.shields.io/badge/AppVersion-23.1.0--A21-informational?style=flat-square)
 
 Alfresco content repository Helm chart
 
@@ -8,7 +8,7 @@ Alfresco content repository Helm chart
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 2.1.0 |
+| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 3.0.0-alpha.1 |
 | oci://registry-1.docker.io/bitnamicharts | postgresql | 12.5.6 |
 
 ## Configuring Alfresco subsystems
diff --git a/charts/alfresco-repository/templates/deployment.yaml b/charts/alfresco-repository/templates/deployment.yaml
index dc64a2fa..8dd53ce3 100644
--- a/charts/alfresco-repository/templates/deployment.yaml
+++ b/charts/alfresco-repository/templates/deployment.yaml
@@ -188,10 +188,10 @@ spec:
         {{- range .Values.configuration.repository.existingSecrets }}
           {{- if eq "acs-license" .purpose }}
             {{- $licitems := list (dict "key" .key "path" "license.lic") }}
-            {{- $licvol := dict "name" "acs-license" "secret" (dict "secretName" .name "defaultMode" 0400 "optional" true "items" $licitems ) }}
+            {{- $licvol := dict "name" "acs-license" "secret" (dict "secretName" .name "defaultMode" 0400 "optional" true "items" $licitems) }}
             {{- list $licvol | toYaml | nindent 8 }}
           {{- else if and (hasPrefix "subsystems:" (.purpose | default "")) (eq (splitList ":" (.purpose | default "") | len) 3) }}
-            {{- $subsysvol := dict "name" .name "secret" (dict "secretName" .name "defaultMode" 0400) }}
+            {{- $subsysvol := dict "name" .name "secret" (dict "secretName" .name "defaultMode" 0400 "optional" true) }}
             {{- list $subsysvol | toYaml | nindent 8 }}
           {{- end }}
         {{- end }}
diff --git a/charts/alfresco-repository/tests/deployment_test.yaml b/charts/alfresco-repository/tests/deployment_test.yaml
index d82c447d..2145971c 100644
--- a/charts/alfresco-repository/tests/deployment_test.yaml
+++ b/charts/alfresco-repository/tests/deployment_test.yaml
@@ -129,6 +129,7 @@ tests:
             secret:
               secretName: myAzureAD
               defaultMode: 0400
+              optional: true
         template: deployment.yaml
       - contains:
           path: spec.template.spec.containers[0].volumeMounts