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

Remove unnecessary ingress variables

Browse source 
Signed-off-by: Petr Drastil <petr.drastil@gmail.com>
This commit is contained in:
Petr Drastil 2024-01-07 14:43:00 +01:00
parent 85198a7fad
commit 3a8f1e56d2
No known key found for this signature in database
GPG key ID: B147517F4051E6ED
3 changed files with 13 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
charts/argo-cd/templates/argocd-applicationset/webhook-ingress.yaml
View file

@ -1,8 +1,5 @@
{{- if and .Values.applicationSet.enabled (and .Values.applicationSet.webhook.ingress.enabled .Values.applicationSet.webhook.ingress.hosts) -}} {{- if and .Values.applicationSet.enabled (and .Values.applicationSet.webhook.ingress.enabled .Values.applicationSet.webhook.ingress.hosts) -}}
{{- $servicePort := .Values.applicationSet.service.portName -}} {{- $servicePort := .Values.applicationSet.service.portName -}}
{{- $paths := .Values.applicationSet.webhook.ingress.paths -}}
{{- $extraPaths := .Values.applicationSet.webhook.ingress.extraPaths -}}
{{- $pathType := .Values.applicationSet.webhook.ingress.pathType -}}
apiVersion: networking.k8s.io/v1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
@ -28,12 +25,12 @@ spec:
- host: {{ . }} - host: {{ . }}
http: http:
paths: paths:
{{- with $extraPaths }} {{- with $.Values.applicationSet.webhook.ingress.extraPaths }}
{{- toYaml . | nindent 10 }} {{- toYaml . | nindent 10 }}
{{- end }} {{- end }}
{{- range $p := $paths }} {{- range $.Values.applicationSet.webhook.ingress.paths }}
- path: {{ $p }} - path: {{ . }}
pathType: {{ $pathType }} pathType: {{ $.Values.applicationSet.webhook.ingress.pathType }}
backend: backend:
service: service:
name: {{ include "argo-cd.applicationSet.fullname" $ }} name: {{ include "argo-cd.applicationSet.fullname" $ }}

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

@ -1,8 +1,5 @@
{{- if and (and .Values.server.ingressGrpc.enabled .Values.server.ingressGrpc.hosts) (not .Values.server.ingressGrpc.isAWSALB) -}} {{- if and (and .Values.server.ingressGrpc.enabled .Values.server.ingressGrpc.hosts) (not .Values.server.ingressGrpc.isAWSALB) -}}
{{- $servicePort := ternary .Values.server.service.servicePortHttps .Values.server.service.servicePortHttp .Values.server.ingressGrpc.https -}} {{- $servicePort := ternary .Values.server.service.servicePortHttps .Values.server.service.servicePortHttp .Values.server.ingressGrpc.https -}}
{{- $paths := .Values.server.ingressGrpc.paths -}}
{{- $extraPaths := .Values.server.ingressGrpc.extraPaths -}}
{{- $pathType := .Values.server.ingressGrpc.pathType -}}
apiVersion: networking.k8s.io/v1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
@ -28,12 +25,12 @@ spec:
- host: {{ . }} - host: {{ . }}
http: http:
paths: paths:
{{- with $extraPaths }} {{- with $.Values.server.ingressGrpc.extraPaths }}
{{- toYaml . | nindent 10 }} {{- toYaml . | nindent 10 }}
{{- end }} {{- end }}
{{- range $p := $paths }} {{- range $.Values.server.ingressGrpc.paths }}
- path: {{ $p }} - path: {{ . }}
pathType: {{ $pathType }} pathType: {{ $.Values.server.ingressGrpc.pathType }}
backend: backend:
service: service:
name: {{ include "argo-cd.server.fullname" $ }} name: {{ include "argo-cd.server.fullname" $ }}

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

@ -1,8 +1,5 @@
{{- if and .Values.server.ingress.enabled .Values.server.ingress.hosts -}} {{- if and .Values.server.ingress.enabled .Values.server.ingress.hosts -}}
{{- $servicePort := ternary .Values.server.service.servicePortHttps .Values.server.service.servicePortHttp .Values.server.ingress.https -}} {{- $servicePort := ternary .Values.server.service.servicePortHttps .Values.server.service.servicePortHttp .Values.server.ingress.https -}}
{{- $paths := .Values.server.ingress.paths -}}
{{- $extraPaths := .Values.server.ingress.extraPaths -}}
{{- $pathType := .Values.server.ingress.pathType -}}
apiVersion: networking.k8s.io/v1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
@ -32,12 +29,12 @@ spec:
- host: {{ . }} - host: {{ . }}
http: http:
paths: paths:
{{- with $extraPaths }} {{- with $.Values.server.ingress.extraPaths }}
{{- toYaml . | nindent 10 }} {{- toYaml . | nindent 10 }}
{{- end }} {{- end }}
{{- range $p := $paths }} {{- range $.Values.server.ingress.paths }}
{{- if and $.Values.server.ingressGrpc.isAWSALB $.Values.server.ingressGrpc.enabled }} {{- if and $.Values.server.ingressGrpc.isAWSALB $.Values.server.ingressGrpc.enabled }}
- path: {{ $p }} - path: {{ . }}
pathType: {{ $.Values.server.ingressGrpc.pathType }} pathType: {{ $.Values.server.ingressGrpc.pathType }}
backend: backend:
service: service:
@ -49,8 +46,8 @@ spec:
name: {{ $servicePort }} name: {{ $servicePort }}
{{- end }} {{- end }}
{{- end }} {{- end }}
- path: {{ $p }} - path: {{ . }}
pathType: {{ $pathType }} pathType: {{ $.Values.server.ingress.pathType }}
backend: backend:
service: service:
name: {{ include "argo-cd.server.fullname" $ }} name: {{ include "argo-cd.server.fullname" $ }}