Synchronize upstreamed folder to 15d6617

upstreamed/mariadb/Chart.yaml

@@ -1,5 +1,5 @@
 name: mariadb
-version: 4.0.0
+version: 4.0.1
 appVersion: 10.1.32
 description: Fast, reliable, scalable, and easy to use open-source relational database system. MariaDB Server is intended for mission-critical, heavy-load production systems as well as for embedding into mass-deployed software. Highly available MariaDB cluster.
 keywords:

upstreamed/mariadb/templates/_helpers.tpl

@@ -16,8 +16,13 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- end -}}
 
 {{- define "master.fullname" -}}
+{{- if .Values.replication.enabled -}}
 {{- printf "%s-%s" .Release.Name "mariadb-master" | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name "mariadb" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+{{- end -}}
+
 
 {{- define "slave.fullname" -}}
 {{- printf "%s-%s" .Release.Name "mariadb-slave" | trunc 63 | trimSuffix "-" -}}

upstreamed/phpmyadmin/Chart.yaml

@@ -1,5 +1,5 @@
 name: phpmyadmin
-version: 0.1.0
+version: 0.1.1
 appVersion: 4.8.0
 description: phpMyAdmin is an mysql administration frontend
 keywords:

upstreamed/phpmyadmin/README.md

@@ -55,7 +55,7 @@ The following table lists the configurable parameters of the Phpmyadmin chart an
 | `db.chartName`                | Database suffix if included in the same release                  | `nil`                                          |
 | `db.host`            | database host to connect to               | `nil`          |
 | `ingress.enabled`            | ingress resource to be added              | `false`          |
-| `ingress.annotations`            | ingress annotations              | `{}`          |
+| `ingress.annotations`            | ingress annotations              | `ingress.kubernetes.io/rewrite-target: /`          |
 | `ingress.path`            | path to access frontend               | `/`          |
 | `ingress.host`            | ingress host               | `nil`          |
 | `ingress.tls`            | tls for ingress               | `[]`          |

upstreamed/phpmyadmin/values.yaml

@@ -32,7 +32,8 @@ db:
 
 ingress:
   enabled: false
-  annotations: {}
+  annotations:
+    ingress.kubernetes.io/rewrite-target: /
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
   ## path you want to map the phpmyadmin interface to