From 74b079cce2bc3efbd2c97cb473e0e5480ed9bc5e Mon Sep 17 00:00:00 2001 From: Daniel Arteaga Date: Wed, 16 Dec 2020 11:36:15 +0100 Subject: [PATCH] [bitnami/dokuwiki] fix: wrong ingress.annotations reference (#4743) * fix(dokuwiki): wrong ingress.annotations reference Signed-off-by: darteaga * fix(dokuwiki): update readme Signed-off-by: darteaga --- bitnami/dokuwiki/Chart.yaml | 2 +- bitnami/dokuwiki/README.md | 4 ++-- bitnami/dokuwiki/templates/ingress.yaml | 26 ++++++++++----------- bitnami/dokuwiki/values.yaml | 30 ++++++++++--------------- 4 files changed, 28 insertions(+), 34 deletions(-) diff --git a/bitnami/dokuwiki/Chart.yaml b/bitnami/dokuwiki/Chart.yaml index 3f737c023..38e708d0e 100644 --- a/bitnami/dokuwiki/Chart.yaml +++ b/bitnami/dokuwiki/Chart.yaml @@ -24,4 +24,4 @@ name: dokuwiki sources: - https://github.com/bitnami/bitnami-docker-dokuwiki - http://www.dokuwiki.org/ -version: 10.0.3 +version: 10.0.4 diff --git a/bitnami/dokuwiki/README.md b/bitnami/dokuwiki/README.md index a38687ee3..88b7b71d0 100644 --- a/bitnami/dokuwiki/README.md +++ b/bitnami/dokuwiki/README.md @@ -136,12 +136,12 @@ The following table lists the configurable parameters of the DokuWiki chart and | `service.nodePorts.http` | Kubernetes http node port | `""` | | `service.nodePorts.https` | Kubernetes https node port | `""` | | `ingress.enabled` | Enable ingress controller resource | `false` | +| `ingress.annotations` | Annotations for this ingress record | `[]` | +| `ingress.certManager` | Add annotations for cert-manager | `false` | | `ingress.hosts[0].name` | Hostname to your DokuWiki installation | `dokuwiki.local` | | `ingress.hosts[0].path` | Path within the url structure | `/` | | `ingress.hosts[0].tls` | Utilize TLS backend in ingress | `false` | -| `ingress.hosts[0].certManager` | Add annotations for cert-manager | `false` | | `ingress.hosts[0].tlsSecret` | TLS Secret (certificates) | `dokuwiki.local-tls` | -| `ingress.hosts[0].annotations` | Annotations for this host's ingress record | `[]` | | `ingress.secrets[0].name` | TLS Secret Name | `nil` | | `ingress.secrets[0].certificate` | TLS Secret Certificate | `nil` | | `ingress.secrets[0].key` | TLS Secret Key | `nil` | diff --git a/bitnami/dokuwiki/templates/ingress.yaml b/bitnami/dokuwiki/templates/ingress.yaml index bea853003..9f05a96f3 100644 --- a/bitnami/dokuwiki/templates/ingress.yaml +++ b/bitnami/dokuwiki/templates/ingress.yaml @@ -4,22 +4,22 @@ kind: Ingress metadata: name: {{ template "dokuwiki.fullname" $ }} labels: {{- include "common.labels.standard" $ | nindent 4 }} - {{- if $.Values.commonLabels }} - {{- include "common.tplvalues.render" ( dict "value" $.Values.commonLabels "context" $ ) | nindent 4 }} - {{- end }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} annotations: - {{- if .tls }} + {{- if .tls }} ingress.kubernetes.io/secure-backends: "true" - {{- end }} - {{- if .certManager }} + {{- end }} + {{- if .Values.ingress.certManager }} kubernetes.io/tls-acme: "true" - {{- end }} - {{- if .annotations }} - {{- include "common.tplvalues.render" ( dict "value" .annotations "context" $ ) | nindent 4 }} - {{- end }} - {{- if $.Values.commonAnnotations }} - {{- include "common.tplvalues.render" ( dict "value" $.Values.commonAnnotations "context" $ ) | nindent 4 }} - {{- end }} + {{- end }} + {{- if .Values.ingress.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.ingress.annotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: rules: {{- $tls := false }} diff --git a/bitnami/dokuwiki/values.yaml b/bitnami/dokuwiki/values.yaml index 3c8e1d868..2c9dacb0f 100644 --- a/bitnami/dokuwiki/values.yaml +++ b/bitnami/dokuwiki/values.yaml @@ -107,36 +107,30 @@ ingress: ## Set to true to enable ingress record generation ## enabled: false - + ## Ingress annotations done as key:value pairs + ## For a full list of possible ingress annotations, please see + ## ref: https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/nginx-configuration/annotations.md + ## + ## If tls is set to true, annotation ingress.kubernetes.io/secure-backends: "true" will automatically be set + ## If certManager is set to true, annotation kubernetes.io/tls-acme: "true" will automatically be set + ## + annotations: + # kubernetes.io/tls-acme: true ## The list of hostnames to be covered with this ingress record. ## Most likely this will be just one host, but in the event more hosts are needed, this is an array ## + ## Set this to true in order to add the corresponding annotations for cert-manager + ## + certManager: false hosts: - name: dokuwiki.local - ## Set this to true in order to enable TLS on the ingress record ## A side effect of this will be that the backend dokuwiki service will be connected at port 443 ## tls: false - - ## Set this to true in order to add the corresponding annotations for cert-manager - ## - certManager: false - ## If TLS is set to true, you must declare what secret will store the key/certificate for TLS ## tlsSecret: dokuwiki.local-tls - - ## Ingress annotations done as key:value pairs - ## For a full list of possible ingress annotations, please see - ## ref: https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/nginx-configuration/annotations.md - ## - ## If tls is set to true, annotation ingress.kubernetes.io/secure-backends: "true" will automatically be set - ## If certManager is set to true, annotation kubernetes.io/tls-acme: "true" will automatically be set - ## - annotations: - # kubernetes.io/tls-acme: true - secrets: ## If you're providing your own certificates, please use this to add the certificates as secrets ## key and certificate should start with -----BEGIN CERTIFICATE----- or