used ingress from argo-cd

Signed-off-by: chgl <chgl@users.noreply.github.com>

charts/argo-workflows/ci/enable-ingress-values.yaml

@@ -0,0 +1,5 @@
+server:
+  ingress:
+    enabled: true
+    hosts:
+      - argo-workflows.127.0.0.1.xip.io

charts/argo-workflows/templates/server/server-ingress.yaml

@@ -1,37 +1,88 @@
-{{- if .Values.server.enabled -}}
 {{- if .Values.server.ingress.enabled -}}
 {{- $serviceName := include "argo-workflows.server.fullname" . -}}
 {{- $servicePort := .Values.server.servicePort -}}
+{{- $paths := .Values.server.ingress.paths -}}
+{{- $extraPaths := .Values.server.ingress.extraPaths -}}
 apiVersion: {{ include "argo-workflows.ingress.apiVersion" . }}
 kind: Ingress
 metadata:
+{{- if .Values.server.ingress.annotations }}
+  annotations:
+  {{- range $key, $value := .Values.server.ingress.annotations }}
+    {{ $key }}: {{ $value | quote }}
+  {{- end }}
+{{- end }}
   name: {{ template "argo-workflows.server.fullname" . }}
   labels:
-   {{- include "argo-workflows.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
+    {{- include "argo-workflows.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
-    {{- range $key, $value := .Values.server.ingress.labels }}
+    {{- if .Values.server.ingress.labels }}
-    {{ $key }}: {{ $value | quote }}
+    {{- toYaml .Values.server.ingress.labels | nindent 4 }}
-    {{- end }}
-  annotations:
-    {{- range $key, $value := .Values.server.ingress.annotations }}
-    {{ $key }}: {{ $value | quote }}
     {{- end }}
 spec:
+  {{- if eq (include "argo-workflows.ingress.apiVersion" $) "networking.k8s.io/v1" }}
+  {{- with .Values.server.ingress.ingressClassName }}
+  ingressClassName: {{ . }}
+  {{- end }}
+  {{- end }}
   rules:
-    {{- $kubeVersion := .Capabilities.KubeVersion.GitVersion}}
+  {{- if .Values.server.ingress.hosts }}
-    {{- range .Values.server.ingress.hosts }}
+    {{- range $host := .Values.server.ingress.hosts }}
-    - host: {{ . }}
+    - host: {{ $host }}
       http:
         paths:
-          {{- if $.Values.server.ingress.paths }}
+          {{- if $extraPaths }}
-          {{- range $.Values.server.ingress.paths }}
+          {{- toYaml $extraPaths | nindent 10 }}
-          {{- include "argo-workflows.ingress.service" (dict "kubeVersion" $kubeVersion "serviceName" .serviceName "servicePort" .servicePort) | nindent 10 }}
           {{- end }}
-          {{- end }}
+          {{- range $p := $paths }}
-          {{- include "argo-workflows.ingress.service" (dict "kubeVersion" $kubeVersion "serviceName" $serviceName "servicePort" $servicePort) | nindent 10 }}
+          - path: {{ $p }}
+            {{- if eq (include "argo-workflows.ingress.apiVersion" $) "networking.k8s.io/v1" }}
+            pathType: Prefix
+            {{- end }}
+            backend:
+              {{- if eq (include "argo-workflows.ingress.apiVersion" $) "networking.k8s.io/v1" }}
+              service:
+                name: {{ $serviceName }}
+                port:
+                  {{- if kindIs "float64" $servicePort }}
+                  number: {{ $servicePort }}
+                  {{- else }}
+                  name: {{ $servicePort }}
+                  {{- end }}
+              {{- else }}
+              serviceName: {{ $serviceName }}
+              servicePort: {{ $servicePort }}
+              {{- end }}
+          {{- end -}}
     {{- end -}}
-    {{- with .Values.server.ingress.tls }}
+  {{- else }}
+    - http:
+        paths:
+          {{- if $extraPaths }}
+          {{- toYaml $extraPaths | nindent 10 }}
+          {{- end }}
+          {{- range $p := $paths }}
+          - path: {{ $p }}
+            {{- if eq (include "argo-workflows.ingress.apiVersion" $) "networking.k8s.io/v1" }}
+            pathType: Prefix
+            {{- end }}
+            backend:
+              {{- if eq (include "argo-workflows.ingress.apiVersion" $) "networking.k8s.io/v1" }}
+              service:
+                name: {{ $serviceName }}
+                port:
+                  {{- if kindIs "float64" $servicePort }}
+                  number: {{ $servicePort }}
+                  {{- else }}
+                  name: {{ $servicePort }}
+                  {{- end }}
+              {{- else }}
+              serviceName: {{ $serviceName }}
+              servicePort: {{ $servicePort }}
+              {{- end }}
+          {{- end -}}
+  {{- end -}}
+  {{- if .Values.server.ingress.tls }}
   tls:
-      {{- toYaml . | nindent 4 }}
+    {{- toYaml .Values.server.ingress.tls | nindent 4 }}
-    {{- end -}}
   {{- end -}}
 {{- end -}}

charts/argo-workflows/values.yaml

@@ -235,36 +235,32 @@ server:
   ##
   ingress:
     enabled: false
+    annotations: {}
+    labels: {}
+    ingressClassName: ""
 
-    ## Annotations to be added to the web ingress.
+    ## Argo Workflows Server Ingress.
+    ## Hostnames must be provided if Ingress is enabled.
+    ## Secrets must be manually created in the namespace
     ##
-    # annotations:
+    hosts:
-    #   kubernetes.io/ingress.class: nginx
+      []
-    #   kubernetes.io/tls-acme: "true"
+      # - argocd.example.com
+    paths:
+      - /
+    extraPaths:
+      []
+      # - path: /*
+      #   backend:
+      #     serviceName: ssl-redirect
+      #     servicePort: use-annotation
+    tls:
+      []
+      # - secretName: argocd-example-tls
+      #   hosts:
+      #     - argocd.example.com
+    https: false
 
-    ## Labels to be added to the web ingress.
-    ##
-    # labels:
-    #   use-cloudflare-solver: "true"
-
-    ## Hostnames.
-    ## Must be provided if Ingress is enabled.
-    ##
-    # hosts:
-    #   - argo.domain.com
-
-    ## Additional Paths for each host
-    # paths:
-    #   - serviceName: "ssl-redirect"
-    #     servicePort: "use-annotation"
-
-    ## TLS configuration.
-    ## Secrets must be manually created in the namespace.
-    ##
-    # tls:
-    #   - secretName: argo-ui-tls
-    #     hosts:
-    #       - argo.domain.com
   clusterWorkflowTemplates:
     # Give the server permissions to edit ClusterWorkflowTemplates.
     enableEditing: true