From 1db59ce0d8d4e90795f195be4dd7f0254bd75ed7 Mon Sep 17 00:00:00 2001 From: "Miguel A. Cabrera Minagorri" Date: Wed, 13 Jan 2021 17:04:46 +0000 Subject: [PATCH] Update redmine ingress --- bitnami/redmine/Chart.yaml | 2 +- bitnami/redmine/README.md | 4 ++++ bitnami/redmine/templates/ingress.yaml | 18 ++++++++++-------- bitnami/redmine/values.yaml | 17 +++++++++++++++++ 4 files changed, 32 insertions(+), 9 deletions(-) diff --git a/bitnami/redmine/Chart.yaml b/bitnami/redmine/Chart.yaml index b0b09c3ae4..0c7386dba2 100644 --- a/bitnami/redmine/Chart.yaml +++ b/bitnami/redmine/Chart.yaml @@ -36,4 +36,4 @@ name: redmine sources: - https://github.com/bitnami/bitnami-docker-redmine - http://www.redmine.org/ -version: 15.0.3 +version: 15.1.0 diff --git a/bitnami/redmine/README.md b/bitnami/redmine/README.md index dc1287e6fc..b34474cfb5 100644 --- a/bitnami/redmine/README.md +++ b/bitnami/redmine/README.md @@ -73,6 +73,7 @@ The following table lists the configurable parameters of the Redmine chart and t | `commonLabels` | Labels to add to all deployed objects | `nil` | | `commonAnnotations` | Annotations to add to all deployed objects | `[]` | | `extraDeploy` | Array of extra objects to deploy with the release (evaluated as a template) | `nil` | +| `kubeVersion` | Force target Kubernetes version (using Helm capabilities if not set) | `nil` | ### Redmine parameters @@ -248,6 +249,9 @@ The following table lists the configurable parameters of the Redmine chart and t | `serviceAccount.name` | The name of the ServiceAccount to create | Generated using the `redmine.fullname` macro | | `service.sessionAffinity` | Session Affinity for Kubernetes service, can be "None" or "ClientIP" | `None` | | `ingress.enabled` | Enable ingress controller resource | `false` | +| `ingress.apiVersion` | Force Ingress API version (automatically detected if not set) | `` | +| `ingress.path` | Ingress path | `/` | +| `ingress.pathType` | Ingress path type | `ImplementationSpecific` | | `ingress.certManager` | Add annotations for cert-manager | `false` | | `ingress.hostname` | Default host for the ingress resource | `redmine.local` | | `ingress.tls` | Enable TLS configuration | `false` | diff --git a/bitnami/redmine/templates/ingress.yaml b/bitnami/redmine/templates/ingress.yaml index a7b3cbb576..f41cb02021 100644 --- a/bitnami/redmine/templates/ingress.yaml +++ b/bitnami/redmine/templates/ingress.yaml @@ -24,19 +24,21 @@ spec: - host: {{ .Values.ingress.hostname }} http: paths: - - path: / - backend: - serviceName: "{{ include "common.names.fullname" . }}" - servicePort: http-redmine + - path: {{ .Values.ingress.path }} + {{- if eq "true" (include "common.ingress.supportsPathType" .) }} + pathType: {{ .Values.ingress.pathType }} + {{- end }} + backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" .) "servicePort" "http-redimne" "context" $) | nindent 14 }} {{- end }} {{- range .Values.ingress.extraHosts }} - host: {{ .name }} http: paths: - - path: {{ default "/" .path }} - backend: - serviceName: "{{ template "common.names.fullname" $ }}" - servicePort: http-redmine + - path: {{ default "/" .path }} + {{- if eq "true" (include "common.ingress.supportsPathType" $) }} + pathType: {{ default "ImplementationSpecific" .pathType }} + {{- end }} + backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "http-redmine" "context" $) | nindent 14 }} {{- end }} {{- if or .Values.ingress.tls .Values.ingress.extraTls .Values.ingress.hosts }} tls: diff --git a/bitnami/redmine/values.yaml b/bitnami/redmine/values.yaml index 3ed3ce235d..a55aa676ad 100644 --- a/bitnami/redmine/values.yaml +++ b/bitnami/redmine/values.yaml @@ -8,6 +8,10 @@ # - myRegistryKeySecretName # storageClass: myStorageClass +## Force target Kubernetes version (using Helm capabilites if not set) +## +kubeVersion: + ## Bitnami Redmine image version ## ref: https://hub.docker.com/r/bitnami/redmine/tags/ ## @@ -516,6 +520,7 @@ ingress: ## extraHosts: ## - name: redmine.local ## path: / + ## pathType: ImplementationSpecific ## The tls configuration for additional hostnames to be covered with this ingress record. ## see: https://kubernetes.io/docs/concepts/services-networking/ingress/#tls @@ -539,6 +544,18 @@ ingress: ## key: ## certificate: + ## Override API Version (automatically detected if not set) + ## + apiVersion: + + ## Ingress Path + ## + path: / + + ## Ingress Path type + ## + pathType: ImplementationSpecific + ## Configure CronJob scheduler for receiving emails and converting them to tasks ## ref: http://www.redmine.org/projects/redmine/wiki/RedmineReceivingEmails ##