From b535fa4d875858dee6b5f5be35b76be9e3bd897e Mon Sep 17 00:00:00 2001 From: Russ Sayers Date: Sat, 17 Aug 2024 02:01:49 +1000 Subject: [PATCH] [bitnami/apache] fix CrashLoopBackOff when using cloneHtdocsFromGit (#28868) * Fix: bitnami/apache cloneHtdocsFromGit causes CrashLoopBackOff Signed-off-by: Russ Sayers * Update CHANGELOG.md Signed-off-by: Bitnami Containers * Update CHANGELOG.md Signed-off-by: Bitnami Containers --------- Signed-off-by: Russ Sayers Signed-off-by: Bitnami Containers Co-authored-by: Bitnami Containers --- bitnami/apache/CHANGELOG.md | 8 ++++++-- bitnami/apache/Chart.yaml | 2 +- bitnami/apache/templates/deployment.yaml | 9 +++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/bitnami/apache/CHANGELOG.md b/bitnami/apache/CHANGELOG.md index e47251a5f546ad..36ab99d04556b4 100644 --- a/bitnami/apache/CHANGELOG.md +++ b/bitnami/apache/CHANGELOG.md @@ -1,8 +1,12 @@ # Changelog -## 11.2.13 (2024-07-25) +## 11.2.14 (2024-08-15) -* [bitnami/apache] Release 11.2.13 ([#28398](https://github.com/bitnami/charts/pull/28398)) +* [bitnami/apache] fix CrashLoopBackOff when using cloneHtdocsFromGit ([#28868](https://github.com/bitnami/charts/pull/28868)) + +## 11.2.13 (2024-07-25) + +* [bitnami/apache] Release 11.2.13 (#28398) ([08be0e2](https://github.com/bitnami/charts/commit/08be0e271998c1046f66d815ac5c411b46e3af29)), closes [#28398](https://github.com/bitnami/charts/issues/28398) ## 11.2.12 (2024-07-24) diff --git a/bitnami/apache/Chart.yaml b/bitnami/apache/Chart.yaml index d334bfdefc5577..ab2fd29df0aa81 100644 --- a/bitnami/apache/Chart.yaml +++ b/bitnami/apache/Chart.yaml @@ -35,4 +35,4 @@ maintainers: name: apache sources: - https://github.com/bitnami/charts/tree/main/bitnami/apache -version: 11.2.13 +version: 11.2.14 diff --git a/bitnami/apache/templates/deployment.yaml b/bitnami/apache/templates/deployment.yaml index 71dd8772105e06..644c9f0612e42f 100644 --- a/bitnami/apache/templates/deployment.yaml +++ b/bitnami/apache/templates/deployment.yaml @@ -112,12 +112,18 @@ spec: {{- else if ne .Values.cloneHtdocsFromGit.resourcesPreset "none" }} resources: {{- include "common.resources.preset" (dict "type" .Values.cloneHtdocsFromGit.resourcesPreset) | nindent 12 }} {{- end }} + {{- if .Values.containerSecurityContext.enabled }} + securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.containerSecurityContext "context" $) | nindent 12 }} + {{- end }} volumeMounts: - name: htdocs mountPath: /app - name: empty-dir mountPath: /tmp subPath: tmp-dir + - name: empty-dir + mountPath: /etc/ssh + subPath: etc-ssh-dir {{- if .Values.cloneHtdocsFromGit.extraVolumeMounts }} {{- include "common.tplvalues.render" (dict "value" .Values.cloneHtdocsFromGit.extraVolumeMounts "context" $) | nindent 12 }} {{- end }} @@ -154,6 +160,9 @@ spec: - name: empty-dir mountPath: /tmp subPath: tmp-dir + - name: empty-dir + mountPath: /etc/ssh + subPath: etc-ssh-dir {{- if .Values.cloneHtdocsFromGit.extraVolumeMounts }} {{- include "common.tplvalues.render" (dict "value" .Values.cloneHtdocsFromGit.extraVolumeMounts "context" $) | nindent 12 }} {{- end }}