From 1f4a415b1073af488f8a8e83d546c10aff7dd333 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20J=2E=20Salmer=C3=B3n-Garc=C3=ADa?= Date: Mon, 22 Jan 2024 16:14:54 +0100 Subject: [PATCH] [bitnami/jasperreports] fix: :lock: Move service-account token auto-mount to pod declaration (#22485) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [bitnami/jasperreports] fix: :lock: Move service-account token auto-mount to pod declaration Signed-off-by: Javier Salmeron Garcia * Update bitnami/jasperreports/values.yaml Co-authored-by: Jose Antonio Carmona Signed-off-by: Javier J. Salmerón-García * Update README.md with readme-generator-for-helm Signed-off-by: Bitnami Containers --------- Signed-off-by: Javier Salmeron Garcia Signed-off-by: Javier J. Salmerón-García Signed-off-by: Bitnami Containers Co-authored-by: Jose Antonio Carmona Co-authored-by: Bitnami Containers --- bitnami/jasperreports/Chart.yaml | 2 +- bitnami/jasperreports/README.md | 5 +++++ bitnami/jasperreports/templates/_helpers.tpl | 11 ++++++++++ .../jasperreports/templates/deployment.yaml | 2 ++ .../templates/serviceaccount.yaml | 18 +++++++++++++++ bitnami/jasperreports/values.yaml | 22 +++++++++++++++++++ 6 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 bitnami/jasperreports/templates/serviceaccount.yaml diff --git a/bitnami/jasperreports/Chart.yaml b/bitnami/jasperreports/Chart.yaml index cde7ee8a75..5df6b3c6df 100644 --- a/bitnami/jasperreports/Chart.yaml +++ b/bitnami/jasperreports/Chart.yaml @@ -35,4 +35,4 @@ maintainers: name: jasperreports sources: - https://github.com/bitnami/charts/tree/main/bitnami/jasperreports -version: 18.1.1 +version: 18.2.0 diff --git a/bitnami/jasperreports/README.md b/bitnami/jasperreports/README.md index 3966e65972..900655b8e4 100644 --- a/bitnami/jasperreports/README.md +++ b/bitnami/jasperreports/README.md @@ -109,6 +109,7 @@ The command removes all the Kubernetes components associated with the chart and | Name | Description | Value | | --------------------------------------------------- | ----------------------------------------------------------------------------------------- | -------------------------- | +| `automountServiceAccountToken` | Mount Service Account token in pod | `false` | | `hostAliases` | Add deployment host aliases | `[]` | | `containerPorts.http` | HTTP port to expose at container level | `8080` | | `dnsConfig` | Pod DNS configuration. | `{}` | @@ -176,6 +177,10 @@ The command removes all the Kubernetes components associated with the chart and | `persistence.size` | PVC Storage Request for Jasperreports volume | `8Gi` | | `persistence.existingClaim` | An Existing PVC name for Jasperreports volume | `""` | | `persistence.annotations` | Persistent Volume Claim annotations | `{}` | +| `serviceAccount.create` | Enable creation of ServiceAccount for JasperReports pod | `true` | +| `serviceAccount.name` | The name of the ServiceAccount to use. | `""` | +| `serviceAccount.automountServiceAccountToken` | Allows auto mount of ServiceAccountToken on the serviceAccount created | `false` | +| `serviceAccount.annotations` | Additional custom annotations for the ServiceAccount | `{}` | ### Exposure parameters diff --git a/bitnami/jasperreports/templates/_helpers.tpl b/bitnami/jasperreports/templates/_helpers.tpl index 831baf55e5..c3e18d6013 100644 --- a/bitnami/jasperreports/templates/_helpers.tpl +++ b/bitnami/jasperreports/templates/_helpers.tpl @@ -31,6 +31,17 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this {{- end -}} {{- end -}} +{{/* + Create the name of the service account to use + */}} +{{- define "jasperreports.serviceAccountName" -}} +{{- if .Values.serviceAccount.create -}} + {{ default (include "common.names.fullname" .) .Values.serviceAccount.name }} +{{- else -}} + {{ default "default" .Values.serviceAccount.name }} +{{- end -}} +{{- end -}} + {{/* Return the database Type */}} diff --git a/bitnami/jasperreports/templates/deployment.yaml b/bitnami/jasperreports/templates/deployment.yaml index 77061b3adc..54c1c18cf0 100644 --- a/bitnami/jasperreports/templates/deployment.yaml +++ b/bitnami/jasperreports/templates/deployment.yaml @@ -25,6 +25,8 @@ spec: {{- end }} spec: {{- include "jasperreports.imagePullSecrets" . | nindent 6 }} + serviceAccountName: {{ include "jasperreports.serviceAccountName" .}} + automountServiceAccountToken: {{ .Values.automountServiceAccountToken }} {{- if .Values.hostAliases }} hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.hostAliases "context" $) | nindent 8 }} {{- end }} diff --git a/bitnami/jasperreports/templates/serviceaccount.yaml b/bitnami/jasperreports/templates/serviceaccount.yaml new file mode 100644 index 0000000000..8b0218fa06 --- /dev/null +++ b/bitnami/jasperreports/templates/serviceaccount.yaml @@ -0,0 +1,18 @@ +{{- /* +Copyright VMware, Inc. +SPDX-License-Identifier: APACHE-2.0 +*/}} + +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "jasperreports.serviceAccountName" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- if or .Values.serviceAccount.annotations .Values.commonAnnotations }} + {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.serviceAccount.annotations .Values.commonAnnotations ) "context" . ) }} + annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} + {{- end }} +automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }} +{{- end -}} diff --git a/bitnami/jasperreports/values.yaml b/bitnami/jasperreports/values.yaml index e697d97c1f..74241ab2ea 100644 --- a/bitnami/jasperreports/values.yaml +++ b/bitnami/jasperreports/values.yaml @@ -142,6 +142,9 @@ updateStrategy: ## @section Jasperreports deployment parameters ## +## @param automountServiceAccountToken Mount Service Account token in pod +## +automountServiceAccountToken: false ## @param hostAliases Add deployment host aliases ## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/ ## @@ -406,6 +409,25 @@ persistence: ## annotations: {} +## Service Account +## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/ +## +serviceAccount: + ## @param serviceAccount.create Enable creation of ServiceAccount for JasperReports pod + ## + create: true + ## @param serviceAccount.name The name of the ServiceAccount to use. + ## If not set and create is true, a name is generated using the common.names.fullname template + ## + name: "" + ## @param serviceAccount.automountServiceAccountToken Allows auto mount of ServiceAccountToken on the serviceAccount created + ## Can be set to false if pods using this serviceAccount do not need to use K8s API + ## + automountServiceAccountToken: false + ## @param serviceAccount.annotations Additional custom annotations for the ServiceAccount + ## + annotations: {} + ## @section Exposure parameters ##