home/charts
2
0
Fork 0
mirror of https://github.com/wahyd4/charts.git synced 2026-08-22 03:25:53 +10:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/dokuwiki] fix: wrong ingress.annotations reference (#4743)

Browse Source 
* fix(dokuwiki): wrong ingress.annotations reference

Signed-off-by: darteaga <darteaga@vmware.com>

* fix(dokuwiki): update readme

Signed-off-by: darteaga <darteaga@vmware.com>
This commit is contained in:
Daniel Arteaga
2020-12-16 11:36:15 +01:00
committed by GitHub
parent a0db323c35
commit 74b079cce2
4 changed files with 28 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitnami/dokuwiki/Chart.yaml
+1 -1
View File
@@ -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
bitnami/dokuwiki/README.md
+2 -2
View File
@@ -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` |
bitnami/dokuwiki/templates/ingress.yaml
+13 -13
View File
@@ -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 }}
bitnami/dokuwiki/values.yaml
+12 -18
View File
@@ -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