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

Merge branch 'master' into master

Browse source
This commit is contained in:
Sébastien Prud'homme 2020-04-22 21:47:11 +02:00 committed by GitHub
commit 301a7461f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 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 }}

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 }}