From ddc54178261fd3f3b55bbf203facac4011600789 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20J=2E=20Salmer=C3=B3n-Garc=C3=ADa?= Date: Wed, 6 Mar 2024 10:08:23 +0100 Subject: [PATCH] [bitnami/logstash] feat: :sparkles: :lock: Add automatic adaptation for Openshift restricted-v2 SCC (#24111) Signed-off-by: Javier Salmeron Garcia --- bitnami/logstash/Chart.lock | 6 +++--- bitnami/logstash/Chart.yaml | 2 +- bitnami/logstash/README.md | 11 ++++++----- bitnami/logstash/templates/sts.yaml | 4 ++-- bitnami/logstash/values.yaml | 9 +++++++++ 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/bitnami/logstash/Chart.lock b/bitnami/logstash/Chart.lock index 249d90a055..f51df94b9f 100644 --- a/bitnami/logstash/Chart.lock +++ b/bitnami/logstash/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common repository: oci://registry-1.docker.io/bitnamicharts - version: 2.16.1 -digest: sha256:f808a6fdc9c374d158ad7ff2f2c53a6c409e41da778d768b232dd20f86ef8b47 -generated: "2024-02-21T14:45:43.349221992Z" + version: 2.18.0 +digest: sha256:f489ae7394a4eceb24fb702901483c67a5b4fff605f19d5e2545e3a6778e1280 +generated: "2024-03-05T14:32:54.823956864+01:00" diff --git a/bitnami/logstash/Chart.yaml b/bitnami/logstash/Chart.yaml index 89eefe1c90..f7f0e0e595 100644 --- a/bitnami/logstash/Chart.yaml +++ b/bitnami/logstash/Chart.yaml @@ -30,4 +30,4 @@ maintainers: name: logstash sources: - https://github.com/bitnami/charts/tree/main/bitnami/logstash -version: 5.11.3 +version: 5.12.0 diff --git a/bitnami/logstash/README.md b/bitnami/logstash/README.md index e51601be9b..6a397129c0 100644 --- a/bitnami/logstash/README.md +++ b/bitnami/logstash/README.md @@ -55,11 +55,12 @@ The command removes all the Kubernetes components associated with the chart and ### Global parameters -| Name | Description | Value | -| ------------------------- | ----------------------------------------------- | ----- | -| `global.imageRegistry` | Global Docker image registry | `""` | -| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` | -| `global.storageClass` | Global StorageClass for Persistent Volume(s) | `""` | +| Name | Description | Value | +| ----------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- | +| `global.imageRegistry` | Global Docker image registry | `""` | +| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` | +| `global.storageClass` | Global StorageClass for Persistent Volume(s) | `""` | +| `global.compatibility.openshift.adaptSecurityContext` | Adapt the securityContext sections of the deployment to make them compatible with Openshift restricted-v2 SCC: remove runAsUser, runAsGroup and fsGroup and let the platform use their allowed default IDs. Possible values: auto (apply if the detected running cluster is Openshift), force (perform the adaptation always), disabled (do not perform adaptation) | `disabled` | ### Common parameters diff --git a/bitnami/logstash/templates/sts.yaml b/bitnami/logstash/templates/sts.yaml index 87cbf3f22d..0490114ad5 100644 --- a/bitnami/logstash/templates/sts.yaml +++ b/bitnami/logstash/templates/sts.yaml @@ -64,7 +64,7 @@ spec: terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }} {{- end }} {{- if .Values.podSecurityContext.enabled }} - securityContext: {{- omit .Values.podSecurityContext "enabled" | toYaml | nindent 8 }} + securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.podSecurityContext "context" $) | nindent 8 }} {{- end }} initContainers: {{- if and .Values.persistence.enabled .Values.volumePermissions.enabled }} @@ -96,7 +96,7 @@ spec: image: {{ include "logstash.image" . }} imagePullPolicy: {{ .Values.image.pullPolicy | quote }} {{- if .Values.containerSecurityContext.enabled }} - securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 12 }} + securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.containerSecurityContext "context" $) | nindent 12 }} {{- end }} {{- if .Values.diagnosticMode.enabled }} command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }} diff --git a/bitnami/logstash/values.yaml b/bitnami/logstash/values.yaml index f25ea18d0a..f2bc9eba5f 100644 --- a/bitnami/logstash/values.yaml +++ b/bitnami/logstash/values.yaml @@ -18,6 +18,15 @@ global: ## imagePullSecrets: [] storageClass: "" + ## Compatibility adaptations for Kubernetes platforms + ## + compatibility: + ## Compatibility adaptations for Openshift + ## + openshift: + ## @param global.compatibility.openshift.adaptSecurityContext Adapt the securityContext sections of the deployment to make them compatible with Openshift restricted-v2 SCC: remove runAsUser, runAsGroup and fsGroup and let the platform use their allowed default IDs. Possible values: auto (apply if the detected running cluster is Openshift), force (perform the adaptation always), disabled (do not perform adaptation) + ## + adaptSecurityContext: disabled ## @section Common parameters ## @param kubeVersion Force target Kubernetes version (using Helm capabilities if not set)