From 4ba97ba0922a4e951b4b39f6f5ca409e2580da63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20J=2E=20Salmer=C3=B3n-Garc=C3=ADa?= Date: Wed, 24 Jan 2024 10:45:56 +0100 Subject: [PATCH] [bitnami/apache] fix: :bug: Set seLinuxOptions to null for Openshift compatibility (#22566) Signed-off-by: Javier Salmeron Garcia --- bitnami/apache/Chart.yaml | 2 +- bitnami/apache/README.md | 2 +- bitnami/apache/values.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bitnami/apache/Chart.yaml b/bitnami/apache/Chart.yaml index 08a385cfa3..e74efb14ac 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: 10.4.1 +version: 10.4.2 diff --git a/bitnami/apache/README.md b/bitnami/apache/README.md index cc4528cf2c..c9a047ba43 100644 --- a/bitnami/apache/README.md +++ b/bitnami/apache/README.md @@ -126,7 +126,7 @@ The command removes all the Kubernetes components associated with the chart and | `podSecurityContext.supplementalGroups` | Set filesystem extra groups | `[]` | | `podSecurityContext.fsGroup` | Set Apache Server pod's Security Context fsGroup | `1001` | | `containerSecurityContext.enabled` | Enabled Apache Server containers' Security Context | `true` | -| `containerSecurityContext.seLinuxOptions` | Set SELinux options in container | `{}` | +| `containerSecurityContext.seLinuxOptions` | Set SELinux options in container | `nil` | | `containerSecurityContext.runAsUser` | Set Apache Server containers' Security Context runAsUser | `1001` | | `containerSecurityContext.runAsNonRoot` | Set Controller container's Security Context runAsNonRoot | `true` | | `containerSecurityContext.privileged` | Set primary container's Security Context privileged | `false` | diff --git a/bitnami/apache/values.yaml b/bitnami/apache/values.yaml index eb72eac75e..417d948d44 100644 --- a/bitnami/apache/values.yaml +++ b/bitnami/apache/values.yaml @@ -226,7 +226,7 @@ podSecurityContext: ## Configure Container Security Context ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod ## @param containerSecurityContext.enabled Enabled Apache Server containers' Security Context -## @param containerSecurityContext.seLinuxOptions Set SELinux options in container +## @param containerSecurityContext.seLinuxOptions [object,nullable] Set SELinux options in container ## @param containerSecurityContext.runAsUser Set Apache Server containers' Security Context runAsUser ## @param containerSecurityContext.runAsNonRoot Set Controller container's Security Context runAsNonRoot ## @param containerSecurityContext.privileged Set primary container's Security Context privileged @@ -236,7 +236,7 @@ podSecurityContext: ## containerSecurityContext: enabled: true - seLinuxOptions: {} + seLinuxOptions: null runAsUser: 1001 runAsNonRoot: true privileged: false