Update phpmyadmin ingress

This commit is contained in:
Miguel A. Cabrera Minagorri
2021-01-13 17:19:45 +00:00
parent 5676c9b815
commit eef3d95ba3
5 changed files with 43 additions and 20 deletions
+4 -4
View File
@@ -1,9 +1,9 @@
dependencies:
- name: common
repository: https://charts.bitnami.com/bitnami
version: 1.2.3
version: 1.3.2
- name: mariadb
repository: https://charts.bitnami.com/bitnami
version: 9.2.0
digest: sha256:26fff2c7d428f3cb7b1c280c6590064fd0e27dd80e97365e2f72f19246810c19
generated: "2021-01-07T07:55:02.483570784Z"
version: 9.2.2
digest: sha256:035062e60c0318d2623584106fe859a51efdc2a6f5c8089cccfbd9ff1fd71735
generated: "2021-01-13T17:19:30.162397888Z"
+1 -1
View File
@@ -29,4 +29,4 @@ name: phpmyadmin
sources:
- https://github.com/bitnami/bitnami-docker-phpmyadmin
- https://www.phpmyadmin.net/
version: 8.0.4
version: 8.1.0
+12 -8
View File
@@ -55,14 +55,15 @@ The following tables lists the configurable parameters of the phpMyAdmin chart a
### Common parameters
| Parameter | Description | Default |
|-----------------------------------------|------------------------------------------------------------|---------------------------------------------------------|
| `nameOverride` | String to partially override common.names.fullname | `nil` |
| `fullnameOverride` | String to fully override common.names.fullname | `nil` |
| `commonLabels` | Labels to add to all deployed objects | `{}` |
| `commonAnnotations` | Annotations to add to all deployed objects | `{}` |
| `clusterDomain` | Default Kubernetes cluster domain | `cluster.local` |
| `extraDeploy` | Array of extra objects to deploy with the release | `[]` (evaluated as a template) |
| Parameter | Description | Default |
|-----------------------------------------|----------------------------------------------------------------------|---------------------------------------------------------|
| `nameOverride` | String to partially override common.names.fullname | `nil` |
| `fullnameOverride` | String to fully override common.names.fullname | `nil` |
| `commonLabels` | Labels to add to all deployed objects | `{}` |
| `commonAnnotations` | Annotations to add to all deployed objects | `{}` |
| `clusterDomain` | Default Kubernetes cluster domain | `cluster.local` |
| `extraDeploy` | Array of extra objects to deploy with the release | `[]` (evaluated as a template) |
| `kubeVersion` | Force target Kubernetes version (using Helm capabilities if not set) | `nil` |
### phpMyAdmin parameters
@@ -124,6 +125,9 @@ The following tables lists the configurable parameters of the phpMyAdmin chart a
| `service.loadBalancerSourceRanges` | Address that are allowed when service is LoadBalancer | `[]` |
| `service.annotations` | Annotations for PhpMyAdmin service | `{}` (evaluated as a template) |
| `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 | `phpmyadmin.local` |
| `ingress.tls` | Enable TLS configuration for the hostname defined at `ingress.hostname` parameter | `false` |
+9 -7
View File
@@ -25,19 +25,21 @@ spec:
- host: {{ .Values.ingress.hostname }}
http:
paths:
- path: /
backend:
serviceName: {{ include "common.names.fullname" . }}
servicePort: http
- 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" "context" $) | nindent 14 }}
{{- end }}
{{- range .Values.ingress.extraHosts }}
- host: {{ .name }}
http:
paths:
- path: {{ default "/" .path }}
backend:
serviceName: {{ include "common.names.fullname" $ }}
servicePort: http
{{- 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" "context" $) | nindent 14 }}
{{- end }}
{{- if or .Values.ingress.tls .Values.ingress.extraTls }}
tls:
+17
View File
@@ -7,6 +7,10 @@
# imagePullSecrets:
# - myRegistryKeySecretName
## Force target Kubernetes version (using Helm capabilites if not set)
##
kubeVersion:
## Bitnami WordPress image version
## ref: https://hub.docker.com/r/bitnami/phpmyadmin/tags/
##
@@ -309,6 +313,7 @@ ingress:
## extraHosts:
## - name: phpmyadmin.local
## path: /
## pathType: ImplementationSpecific
##
extraHosts: []
@@ -339,6 +344,18 @@ ingress:
##
secrets: []
## Override API Version (automatically detected if not set)
##
apiVersion:
## Ingress Path
##
path: /
## Ingress Path type
##
pathType: ImplementationSpecific
## Prometheus Exporter / Metrics
##
metrics: