From aca30c9f33657122112bbd04beb29dca942ab453 Mon Sep 17 00:00:00 2001 From: Marco Kilchhofer Date: Wed, 3 Jun 2020 09:36:48 +0200 Subject: [PATCH] [bitnami/phpmyadmin] Migrate ingress to networking.k8s.io/v1beta1 (#2694) * Migrate phpmyadmin ingress to networking.k8s.io/v1beta1 Signed-off-by: Marco Kilchhofer --- bitnami/phpmyadmin/Chart.yaml | 2 +- bitnami/phpmyadmin/requirements.lock | 9 ++++++--- bitnami/phpmyadmin/requirements.yaml | 5 +++++ bitnami/phpmyadmin/templates/ingress.yaml | 2 +- bitnami/phpmyadmin/values.yaml | 4 ++-- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/bitnami/phpmyadmin/Chart.yaml b/bitnami/phpmyadmin/Chart.yaml index 14bfdef83e..6555d52faf 100644 --- a/bitnami/phpmyadmin/Chart.yaml +++ b/bitnami/phpmyadmin/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: phpmyadmin -version: 6.0.0 +version: 6.1.0 appVersion: 5.0.2 description: phpMyAdmin is an mysql administration frontend keywords: diff --git a/bitnami/phpmyadmin/requirements.lock b/bitnami/phpmyadmin/requirements.lock index 3d13769f6d..f7e4fffcdb 100644 --- a/bitnami/phpmyadmin/requirements.lock +++ b/bitnami/phpmyadmin/requirements.lock @@ -1,6 +1,9 @@ dependencies: +- name: common + repository: https://charts.bitnami.com/bitnami + version: 0.3.0 - name: mariadb repository: https://charts.bitnami.com/bitnami - version: 7.4.2 -digest: sha256:056e401ab654cad72350e1083b4309fcc43aa9d4eb7c9cab9c45432957170650 -generated: "2020-05-14T17:08:36.143742667Z" + version: 7.4.3 +digest: sha256:4af7bb2ed2521abbfc12c46d8b3f940165bfaee82cbc9616c39e6e6060dac484 +generated: "2020-06-03T06:35:43.861448336Z" diff --git a/bitnami/phpmyadmin/requirements.yaml b/bitnami/phpmyadmin/requirements.yaml index 5f33cb9290..66d83e3fc3 100644 --- a/bitnami/phpmyadmin/requirements.yaml +++ b/bitnami/phpmyadmin/requirements.yaml @@ -1,4 +1,9 @@ dependencies: + - name: common + version: "^0.3.0" + repository: https://charts.bitnami.com/bitnami + tags: + - bitnami-common - name: mariadb version: 7.x.x repository: https://charts.bitnami.com/bitnami diff --git a/bitnami/phpmyadmin/templates/ingress.yaml b/bitnami/phpmyadmin/templates/ingress.yaml index 49b36d8fbe..6205820706 100644 --- a/bitnami/phpmyadmin/templates/ingress.yaml +++ b/bitnami/phpmyadmin/templates/ingress.yaml @@ -1,5 +1,5 @@ {{- if .Values.ingress.enabled -}} -apiVersion: extensions/v1beta1 +apiVersion: {{ include "common.capabilities.ingress.apiVersion" . }} kind: Ingress metadata: name: {{ template "phpmyadmin.fullname" . }} diff --git a/bitnami/phpmyadmin/values.yaml b/bitnami/phpmyadmin/values.yaml index fb3f4fac6f..d5151b4f95 100644 --- a/bitnami/phpmyadmin/values.yaml +++ b/bitnami/phpmyadmin/values.yaml @@ -13,7 +13,7 @@ image: registry: docker.io repository: bitnami/phpmyadmin - tag: 5.0.2-debian-10-r73 + tag: 5.0.2-debian-10-r74 ## Specify a imagePullPolicy pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. @@ -184,7 +184,7 @@ metrics: image: registry: docker.io repository: bitnami/apache-exporter - tag: 0.8.0-debian-10-r62 + tag: 0.8.0-debian-10-r63 pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace.