From 250bcf086f2ae182682113df3981e517d866d702 Mon Sep 17 00:00:00 2001 From: Dries De Peuter Date: Thu, 21 May 2020 13:38:24 +0200 Subject: [PATCH] Proxy: Handle multiple proxies correct --- charts/proxy/Chart.yaml | 2 +- charts/proxy/templates/endpoints.yaml | 1 + charts/proxy/templates/ingress.yaml | 1 + charts/proxy/templates/service.yaml | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/charts/proxy/Chart.yaml b/charts/proxy/Chart.yaml index 673bdeb..ff225fd 100644 --- a/charts/proxy/Chart.yaml +++ b/charts/proxy/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: proxy description: A Helm chart for Kubernetes type: application -version: 0.1.1 +version: 0.1.2 appVersion: 1.0.0 diff --git a/charts/proxy/templates/endpoints.yaml b/charts/proxy/templates/endpoints.yaml index 8d00b01..7cafe9a 100644 --- a/charts/proxy/templates/endpoints.yaml +++ b/charts/proxy/templates/endpoints.yaml @@ -1,4 +1,5 @@ {{- range .Values.proxy }} +--- apiVersion: v1 kind: Endpoints metadata: diff --git a/charts/proxy/templates/ingress.yaml b/charts/proxy/templates/ingress.yaml index a3ea800..08d0730 100644 --- a/charts/proxy/templates/ingress.yaml +++ b/charts/proxy/templates/ingress.yaml @@ -4,6 +4,7 @@ {{- $k8sVersion := .Capabilities.KubeVersion.GitVersion -}} {{- range .Values.proxy }} {{- $name := .name -}} +--- {{- if semverCompare ">=1.14-0" $k8sVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} diff --git a/charts/proxy/templates/service.yaml b/charts/proxy/templates/service.yaml index 68e6a75..d3205e3 100644 --- a/charts/proxy/templates/service.yaml +++ b/charts/proxy/templates/service.yaml @@ -1,5 +1,6 @@ {{- $servicePort := .Values.service.port -}} {{- range .Values.proxy }} +--- apiVersion: v1 kind: Service metadata: