DevFW-CICD/argocd-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: use networking.k8s.io/v1beta1 apiVersion for ingress if supported (#312)

Browse source 
* use networking.k8s.io/v1beta1 apiVersion for ingress if supported
* updated chart version
* used more explicit capability check
This commit is contained in:
Chris 2020-04-21 08:52:13 +02:00 committed by GitHub
parent a5070f5f07
commit ac44f2d7e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
charts/argo-cd/templates/argocd-server/ingress.yaml
View file

@ -2,7 +2,11 @@
{{- $serviceName := include "argo-cd.server.fullname" . -}} {{- $serviceName := include "argo-cd.server.fullname" . -}}
{{- $servicePort := .Values.server.service.servicePortHttp -}} {{- $servicePort := .Values.server.service.servicePortHttp -}}
{{- $paths := .Values.server.ingress.paths -}} {{- $paths := .Values.server.ingress.paths -}}
{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
apiVersion: networking.k8s.io/v1beta1
{{ else }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
{{ end -}}
kind: Ingress kind: Ingress
metadata: metadata:
{{- if .Values.server.ingress.annotations }} {{- if .Values.server.ingress.annotations }}

2
charts/argo/Chart.yaml
View file

@ -2,7 +2,7 @@ apiVersion: v1
appVersion: "v2.6.1" appVersion: "v2.6.1"
description: A Helm chart for Argo Workflows description: A Helm chart for Argo Workflows
name: argo name: argo
version: 0.7.3 version: 0.7.4
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
maintainers: maintainers:

4
charts/argo/templates/server-ingress.yaml
View file

@ -2,7 +2,11 @@
{{- if .Values.server.ingress.enabled -}} {{- if .Values.server.ingress.enabled -}}
{{- $serviceName := printf "%s-%s" .Release.Name .Values.server.name -}} {{- $serviceName := printf "%s-%s" .Release.Name .Values.server.name -}}
{{- $servicePort := .Values.server.servicePort -}} {{- $servicePort := .Values.server.servicePort -}}
{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
apiVersion: networking.k8s.io/v1beta1
{{ else }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
{{ end -}}
kind: Ingress kind: Ingress
metadata: metadata:
name: {{ .Release.Name }}-{{ .Values.server.name }} name: {{ .Release.Name }}-{{ .Values.server.name }}