github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[stable/phpmyadmin] Fix PHPMyAdmin Ingress (#18072)

Browse Source 
* Fix PHPMyAdmin Ingress

Signed-off-by: Alejandro Moreno <amoreno@bitnami.com>

* [stable/phpmyadmin] Update components versions

Signed-off-by: Bitnami Containers <containers@bitnami.com>

* Indentation

Signed-off-by: Alejandro Moreno <amoreno@bitnami.com>
This commit is contained in:
Alejandro Moreno
2019-10-18 01:44:05 -07:00
committed by Kubernetes Prow Robot
parent a386ba294b
commit 47ad557243
5 changed files with 101 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/phpmyadmin/Chart.yaml
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: phpmyadmin
version: 3.0.7
version: 4.0.0
appVersion: 4.9.1
description: phpMyAdmin is an mysql administration frontend
keywords:
stable/phpmyadmin/README.md
+38 -35
View File
@@ -44,41 +44,44 @@ The command removes all the Kubernetes components associated with the chart and
The following table lists the configurable parameters of the phpMyAdmin chart and their default values.
| Parameter | Description | Default |
|-----------------------------|---------------------------------------------------|---------------------------------------------------------|
| `global.imageRegistry` | Global Docker image registry | `nil` |
| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) |
| `image.registry` | phpMyAdmin image registry | `docker.io` |
| `image.repository` | phpMyAdmin image name | `bitnami/phpmyadmin` |
| `image.tag` | phpMyAdmin image tag | `{TAG_NAME}` |
| `image.pullPolicy` | Image pull policy | `IfNotPresent` |
| `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) |
| `nameOverride` | String to partially override phpmyadmin.fullname template with a string (will prepend the release name) | `nil` |
| `fullnameOverride` | String to fully override phpmyadmin.fullname template with a string | `nil` |
| `service.type` | Type of service for phpMyAdmin frontend | `ClusterIP` |
| `service.port` | Port to expose service | `80` |
| `db.port` | Database port to use to connect | `3306` |
| `db.chartName` | Database suffix if included in the same release | `nil` |
| `db.host` | Database host to connect to | `nil` |
| `db.bundleTestDB` | Deploy a MariaDB instance for testing purposes | `false` |
| `ingress.enabled` | Ingress resource to be added | `false` |
| `ingress.annotations` | Ingress annotations | `{ingress.kubernetes.io/rewrite-target: /, nginx.ingress.kubernetes.io/rewrite-target: /}` |
| `ingress.path` | Path to access frontend | `/` |
| `ingress.host` | Ingress host | `nil` |
| `ingress.tls` | TLS for ingress | `[]` |
| `resources` | CPU/Memory resource requests/limits | `{}` |
| `nodeSelector` | Node labels for pod assignment | `{}` |
| `tolerations` | List of node taints to tolerate | `[]` |
| `affinity` | Map of node/pod affinities | `{}` |
| `podAnnotations` | Pod annotations | `{}` |
| `metrics.enabled` | Start a side-car prometheus exporter | `false` |
| `metrics.image.registry` | Apache exporter image registry | `docker.io` |
| `metrics.image.repository` | Apache exporter image name | `bitnami/apache-exporter` |
| `metrics.image.tag` | Apache exporter image tag | `{TAG_NAME}` |
| `metrics.image.pullPolicy` | Image pull policy | `IfNotPresent` |
| `metrics.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) |
| `metrics.podAnnotations` | Additional annotations for Metrics exporter pod | `{prometheus.io/scrape: "true", prometheus.io/port: "9117"}` |
| `metrics.resources` | Exporter resource requests/limit | {} |
| Parameter | Description | Default |
| ---------------------------- | ------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- |
| `global.imageRegistry` | Global Docker image registry | `nil` |
| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) |
| `image.registry` | phpMyAdmin image registry | `docker.io` |
| `image.repository` | phpMyAdmin image name | `bitnami/phpmyadmin` |
| `image.tag` | phpMyAdmin image tag | `{TAG_NAME}` |
| `image.pullPolicy` | Image pull policy | `IfNotPresent` |
| `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) |
| `nameOverride` | String to partially override phpmyadmin.fullname template with a string (will prepend the release name) | `nil` |
| `fullnameOverride` | String to fully override phpmyadmin.fullname template with a string | `nil` |
| `service.type` | Type of service for phpMyAdmin frontend | `ClusterIP` |
| `service.port` | Port to expose service | `80` |
| `db.port` | Database port to use to connect | `3306` |
| `db.chartName` | Database suffix if included in the same release | `nil` |
| `db.host` | Database host to connect to | `nil` |
| `db.bundleTestDB` | Deploy a MariaDB instance for testing purposes | `false` |
| `ingress.enabled` | Enable ingress controller resource | `false` |
| `ingress.certManager` | Add annotations for cert-manager | `false` |
| `ingress.annotations` | Ingress annotations | `{ingress.kubernetes.io/rewrite-target: /, nginx.ingress.kubernetes.io/rewrite-target: /}` |
| `ingress.hosts[0].name` | Hostname to your PHPMyAdmin installation | `phpmyadmin.local` |
| `ingress.hosts[0].path` | Path within the url structure | `/` |
| `ingress.hosts[0].tls` | Utilize TLS backend in ingress | `false` |
| `ingress.hosts[0].tlsHosts` | Array of TLS hosts for ingress record (defaults to `ingress.hosts[0].name` if `nil`) | `nil` |
| `ingress.hosts[0].tlsSecret` | TLS Secret (certificates) | `phpmyadmin.local-tls-secret` |
| `resources` | CPU/Memory resource requests/limits | `{}` |
| `nodeSelector` | Node labels for pod assignment | `{}` |
| `tolerations` | List of node taints to tolerate | `[]` |
| `affinity` | Map of node/pod affinities | `{}` |
| `podAnnotations` | Pod annotations | `{}` |
| `metrics.enabled` | Start a side-car prometheus exporter | `false` |
| `metrics.image.registry` | Apache exporter image registry | `docker.io` |
| `metrics.image.repository` | Apache exporter image name | `bitnami/apache-exporter` |
| `metrics.image.tag` | Apache exporter image tag | `{TAG_NAME}` |
| `metrics.image.pullPolicy` | Image pull policy | `IfNotPresent` |
| `metrics.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) |
| `metrics.podAnnotations` | Additional annotations for Metrics exporter pod | `{prometheus.io/scrape: "true", prometheus.io/port: "9117"}` |
| `metrics.resources` | Exporter resource requests/limit | {} |
For more information please refer to the [bitnami/phpmyadmin](http://github.com/bitnami/bitnami-docker-Phpmyadmin) image documentation.
stable/phpmyadmin/requirements.lock
+4 -4
View File
@@ -1,6 +1,6 @@
dependencies:
- name: mariadb
repository: https://kubernetes-charts.storage.googleapis.com/
version: 6.9.1
- name: mariadb
repository: https://kubernetes-charts.storage.googleapis.com/
version: 6.12.0
digest: sha256:a5bab50185c0373da803c6b86abc0e27ed0be1053fe1b560bc8de5a8054e8101
generated: "2019-09-20T15:22:53.423533+02:00"
generated: 2019-10-17T10:36:02.483266043Z
stable/phpmyadmin/templates/ingress.yaml
+27 -25
View File
@@ -1,41 +1,43 @@
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "phpmyadmin.fullname" . -}}
{{- $servicePort := .Values.service.port -}}
{{- $ingressPath := .Values.ingress.path -}}
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
name: {{ $fullName }}
name: {{ template "phpmyadmin.fullname" . }}
labels:
app: {{ template "phpmyadmin.name" . }}
chart: {{ template "phpmyadmin.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
{{- with .Values.ingress.annotations }}
annotations:
{{ toYaml . | indent 4 }}
{{- end }}
{{- if .Values.ingress.certManager }}
kubernetes.io/tls-acme: "true"
{{- end }}
{{- range $key, $value := .Values.ingress.annotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
spec:
{{- if .Values.ingress.tls }}
tls:
{{- range .Values.ingress.tls }}
- hosts:
{{- range .hosts }}
- {{ . }}
{{- end }}
secretName: {{ .secretName }}
{{- end }}
{{- end }}
rules:
{{ if .Values.ingress.host -}}
- host: {{ .Values.ingress.host }}
http:
{{- else -}}
- http:
{{- end }}
{{- range .Values.ingress.hosts }}
- host: {{ .name }}
http:
paths:
- path: {{ $ingressPath }}
- path: {{ default "/" .path }}
backend:
serviceName: {{ $fullName }}
serviceName: {{ template "phpmyadmin.fullname" $ }}
servicePort: http
{{- end }}
tls:
{{- range .Values.ingress.hosts }}
{{- if .tls }}
- hosts:
{{- if .tlsHosts }}
{{- range $host := .tlsHosts }}
- {{ $host }}
{{- end }}
{{- else }}
- {{ .name }}
{{- end }}
secretName: {{ .tlsSecret }}
{{- end }}
{{- end }}
{{- end }}
stable/phpmyadmin/values.yaml
+31 -9
View File
@@ -13,7 +13,7 @@
image:
registry: docker.io
repository: bitnami/phpmyadmin
tag: 4.9.1-debian-9-r0
tag: 4.9.1-debian-9-r16
## Specify a imagePullPolicy
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.
@@ -51,20 +51,42 @@ db:
bundleTestDB: false
ingress:
## Set to true to enable ingress record generation
##
enabled: false
## Set this to true in order to add the corresponding annotations for cert-manager
certManager: false
## Ingress annotations done as key:value pairs
## If certManager is set to true, annotation kubernetes.io/tls-acme: "true" will automatically be set
## ref: https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/nginx-configuration/annotations.md
##
annotations:
ingress.kubernetes.io/rewrite-target: /
nginx.ingress.kubernetes.io/rewrite-target: /
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
## path you want to map the phpmyadmin interface to
path: /
# host: foo
tls: []
# - secretName: chart-example-tls
# hosts:
# - chart-example.local
## 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
##
hosts:
- name: phpmyadmin.local
path: /
## Set this to true in order to enable TLS on the ingress record
tls: false
## Optionally specify the TLS hosts for the ingress record
## Useful when the Ingress controller supports www-redirection
## If not specified, the above host name will be used
# tlsHosts:
# - www.phpmyadmin.local
# - phpmyadmin.local
## If TLS is set to true, you must declare what secret will store the key/certificate for TLS
tlsSecret: phpmyadmin.local-tls
## Enable liveness and readiness probes
probesEnabled: true
@@ -106,7 +128,7 @@ metrics:
image:
registry: docker.io
repository: bitnami/apache-exporter
tag: 0.7.0-debian-9-r64
tag: 0.7.0-debian-9-r85
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.
## Secrets must be manually created in the namespace.