From c80f38d40ac768620e5e1712c59bb30094b233e8 Mon Sep 17 00:00:00 2001 From: Alex Voloshyn Date: Fri, 15 May 2020 16:45:37 +0300 Subject: [PATCH] [stable/docker-registry] Update apiVersion for Kubernetes 1.16 support (#22316) * Update apiVersion for Kubernetes 1.16 support Signed-off-by: Alex Voloshyn * Add support for Kubernetes older than 1.16 Signed-off-by: Alex Voloshyn * Update according to the review comment Signed-off-by: Alex Voloshyn * Simplified check Signed-off-by: Alex Voloshyn --- stable/docker-registry/Chart.yaml | 2 +- stable/docker-registry/templates/ingress.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stable/docker-registry/Chart.yaml b/stable/docker-registry/Chart.yaml index 3462fb1c2f..032fa6d822 100644 --- a/stable/docker-registry/Chart.yaml +++ b/stable/docker-registry/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: A Helm chart for Docker Registry name: docker-registry -version: 1.9.2 +version: 1.9.3 appVersion: 2.7.1 home: https://hub.docker.com/_/registry/ icon: https://hub.docker.com/public/images/logos/mini-logo.svg diff --git a/stable/docker-registry/templates/ingress.yaml b/stable/docker-registry/templates/ingress.yaml index 6fdf784c08..58ab5fa22e 100644 --- a/stable/docker-registry/templates/ingress.yaml +++ b/stable/docker-registry/templates/ingress.yaml @@ -2,7 +2,7 @@ {{- $serviceName := include "docker-registry.fullname" . -}} {{- $servicePort := .Values.service.port -}} {{- $path := .Values.ingress.path -}} -apiVersion: extensions/v1beta1 +apiVersion: {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }} networking.k8s.io/v1beta1 {{- else }} extensions/v1beta1 {{- end }} kind: Ingress metadata: name: {{ template "docker-registry.fullname" . }}