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

used more explicit capability check

Browse source
This commit is contained in:
chgl 2020-04-18 20:59:50 +02:00
parent e5aa1edb32
commit fba3fb4fcf
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,11 +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 semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1beta1
{{- else -}} {{ else }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
{{- end }} {{ end -}}
kind: Ingress kind: Ingress
metadata: metadata:
{{- if .Values.server.ingress.annotations }} {{- if .Values.server.ingress.annotations }}

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

@ -2,11 +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 semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
apiVersion: networking.k8s.io/v1beta1 apiVersion: networking.k8s.io/v1beta1
{{- else -}} {{ else }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
{{- end }} {{ end -}}
kind: Ingress kind: Ingress
metadata: metadata:
name: {{ .Release.Name }}-{{ .Values.server.name }} name: {{ .Release.Name }}-{{ .Values.server.name }}