chore: Merge branch 'refs/heads/main' into feat/webdav-support-encode…

…d-chars # Conflicts: # charts/4allportal/Chart.yaml # charts/4allportal/README.md
4ALLPORTAL · May 17, 2024 · 26b310e · 26b310e
2 parents c2bc79e + 4feb0cf
commit 26b310e
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 8 deletions.
diff --git a/charts/4allportal/README.md b/charts/4allportal/README.md
@@ -256,7 +256,7 @@ A Helm chart for 4ALLPORTAL version 3.10.0 and up
 | webdav.groups | object | `{}` |  |
 | webdav.image.registry | string | `"docker.io"` |  |
 | webdav.image.repository | string | `"httpd"` |  |
-| webdav.image.tag | string | `"2.4.58"` |  |
+| webdav.image.tag | string | `"2.4.59"` |  |
 | webdav.livenessProbe.enabled | bool | `true` |  |
 | webdav.livenessProbe.failureThreshold | int | `4` |  |
 | webdav.livenessProbe.initialDelaySeconds | int | `5` |  |

diff --git a/charts/4allportal/templates/4allportal/apikey.yaml b/charts/4allportal/templates/4allportal/apikey.yaml
@@ -0,0 +1,13 @@
+{{- if .Values.webdav.enabled }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: apikey-{{ .Release.Name }}
+  namespace: {{ .Release.Namespace }}
+data:
+  {{- if .Release.IsInstall }}
+  key: {{ include "4allportal.fourAllPortal.systemApiKey" . | b64enc }}
+  {{- else }}
+  key: {{ index (lookup "v1" "Secret" .Release.Namespace (printf "apikey-%s" .Release.Name)).data "key" }}
+  {{- end }}
+{{- end -}}
diff --git a/charts/4allportal/templates/4allportal/deployment.yaml b/charts/4allportal/templates/4allportal/deployment.yaml
@@ -100,7 +100,10 @@ spec:
               value: {{ .Values.fourAllPortal.debug | quote }}
 
             - name: SYSTEM_API_KEY
-              value: {{ include "4allportal.fourAllPortal.systemApiKey" . }}
+              valueFrom:
+                secretKeyRef:
+                  name: apikey-{{ .Release.Name }}
+                  key: key
 
             - name: MANAGED
               value: "true"

diff --git a/charts/4allportal/templates/webdav/configmap.yaml b/charts/4allportal/templates/webdav/configmap.yaml
@@ -204,7 +204,7 @@ data:
         fi
         RES_CODE=$(curl -X POST -sw "%{http_code}\n" \
           -H 'Content-Type: application/json' \
-          -H "Authorization: Bearer {{ include "4allportal.fourAllPortal.systemApiKey" . }}" \
+          -H "Authorization: Bearer ${FOURALLPORTAL_API_KEY}" \
           -d "$BODY" \
           --connect-timeout 1 -o /dev/null ${ENDPOINT})
         echo "Response status: ${RES_CODE}"  > /proc/self/fd/1

diff --git a/charts/4allportal/templates/webdav/deployment.yaml b/charts/4allportal/templates/webdav/deployment.yaml
@@ -158,6 +158,12 @@ spec:
               subPath: log-handler.sh
               mountPath: /usr/bin/log-handler.sh
               readOnly: true
+          env:
+            - name: FOURALLPORTAL_API_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: apikey-{{ .Release.Name }}
+                  key: key
           resources:
             requests:
               cpu: "100m"

diff --git a/charts/4allportal/values.yaml b/charts/4allportal/values.yaml
@@ -249,7 +249,7 @@ webdav:
   image:
     registry: docker.io
     repository: httpd
-    tag: 2.4.58
+    tag: 2.4.59
 
   events:
     enabled: false

diff --git a/charts/base-cluster/Chart.yaml b/charts/base-cluster/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A generic, base cluster setup
 name: base-cluster
-version: 40.0.3
+version: 40.0.4
 home: "https://4allportal.com"
 maintainers:
   - name: jpkraemer-mg

diff --git a/charts/base-cluster/README.md b/charts/base-cluster/README.md
@@ -1,6 +1,6 @@
 # base-cluster
 
-![Version: 40.0.3](https://img.shields.io/badge/Version-40.0.3-informational?style=flat-square)
+![Version: 40.0.4](https://img.shields.io/badge/Version-40.0.4-informational?style=flat-square)
 
 A generic, base cluster setup
 
@@ -84,7 +84,7 @@ This helm chart requires flux v2 to be installed (https://fluxcd.io/docs/install
 | global.imageRegistry | string | `""` |  |
 | global.kubectl.image.registry | string | `"docker.io"` |  |
 | global.kubectl.image.repository | string | `"bitnami/kubectl"` |  |
-| global.kubectl.image.tag | string | `"1.29.4"` |  |
+| global.kubectl.image.tag | string | `"1.30.1"` |  |
 | global.networkPolicy.dnsLabels."io.kubernetes.pod.namespace" | string | `"kube-system"` |  |
 | global.networkPolicy.dnsLabels.k8s-app | string | `"kube-dns"` |  |
 | global.networkPolicy.metricsLabels."app.kubernetes.io/name" | string | `"prometheus"` |  |

diff --git a/charts/base-cluster/values.yaml b/charts/base-cluster/values.yaml
@@ -50,7 +50,7 @@ global:
     image:
       registry: docker.io
       repository: bitnami/kubectl
-      tag: "1.29.4"
+      tag: "1.30.1"
   helm:
     image:
       registry: docker.io