Add ingress extra rules

Signed-off-by: Petr Drastil <petr.drastil@gmail.com>

charts/argo-cd/Chart.yaml

@@ -30,3 +30,5 @@ annotations:
       description: Support for deprecated features
     - kind: removed
       description: Wildcard catch all ingress rule
+    - kind: added
+      description: Ingress extra rules to allow explicit configuration of catch all rule

charts/argo-cd/README.md

@@ -757,6 +757,7 @@ NAME: my-release
 | server.ingress.annotations | object | `{}` | Additional ingress annotations |
 | server.ingress.enabled | bool | `false` | Enable an ingress resource for the Argo CD server |
 | server.ingress.extraPaths | list | `[]` | Additional ingress paths |
+| server.ingress.extraRules | list | `[]` (See [values.yaml]) | Additional ingress rules |
 | server.ingress.hosts | list | `[]` | List of ingress hosts |
 | server.ingress.https | bool | `false` | Uses `server.service.servicePortHttps` instead `server.service.servicePortHttp` |
 | server.ingress.ingressClassName | string | `""` | Defines which ingress controller will implement the resource |
@@ -769,6 +770,7 @@ NAME: my-release
 | server.ingressGrpc.awsALB.serviceType | string | `"NodePort"` | Service type for the AWS ALB gRPC service |
 | server.ingressGrpc.enabled | bool | `false` | Enable an ingress resource for the Argo CD server for dedicated [gRPC-ingress] |
 | server.ingressGrpc.extraPaths | list | `[]` | Additional ingress paths for dedicated [gRPC-ingress] |
+| server.ingressGrpc.extraRules | list | `[]` (See [values.yaml]) | Additional ingress rules |
 | server.ingressGrpc.hosts | list | `[]` | List of ingress hosts for dedicated [gRPC-ingress] |
 | server.ingressGrpc.https | bool | `false` | Uses `server.service.servicePortHttps` instead `server.service.servicePortHttp` |
 | server.ingressGrpc.ingressClassName | string | `""` | Defines which ingress controller will implement the resource [gRPC-ingress] |
@@ -1179,6 +1181,7 @@ If you want to use an existing Redis (eg. a managed service from a cloud provide
 | applicationSet.webhook.ingress.annotations | object | `{}` | Additional ingress annotations |
 | applicationSet.webhook.ingress.enabled | bool | `false` | Enable an ingress resource for Webhooks |
 | applicationSet.webhook.ingress.extraPaths | list | `[]` | Additional ingress paths |
+| applicationSet.webhook.ingress.extraRules | list | `[]` (See [values.yaml]) | Additional ingress rules |
 | applicationSet.webhook.ingress.hosts | list | `[]` | List of ingress hosts |
 | applicationSet.webhook.ingress.ingressClassName | string | `""` | Defines which ingress ApplicationSet controller will implement the resource |
 | applicationSet.webhook.ingress.labels | object | `{}` | Additional ingress labels |

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

@@ -45,6 +45,9 @@ spec:
                   {{- end }}
           {{- end }}
     {{- end }}
+    {{- with .Values.applicationSet.webhook.ingress.extraRules }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
   {{- with .Values.applicationSet.webhook.ingress.tls }}
   tls:
     {{- toYaml . | nindent 4 }}

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

@@ -45,6 +45,9 @@ spec:
                   {{- end }}
           {{- end }}
     {{- end }}
+    {{- with .Values.server.ingressGrpc.extraRules }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
   {{- with .Values.server.ingressGrpc.tls }}
   tls:
     {{- toYaml . | nindent 4 }}

charts/argo-cd/templates/argocd-server/ingress.yaml

@@ -62,6 +62,9 @@ spec:
                   {{- end }}
           {{- end }}
     {{- end }}
+    {{- with .Values.server.ingress.extraRules }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
   {{- with .Values.server.ingress.tls }}
   tls:
     {{- toYaml . | nindent 4 }}

charts/argo-cd/values.yaml

@@ -1922,6 +1922,7 @@ server:
       - /
     # -- Ingress path type. One of `Exact`, `Prefix` or `ImplementationSpecific`
     pathType: Prefix
+
     # -- Additional ingress paths
     extraPaths: []
       # - path: /*
@@ -1932,6 +1933,18 @@ server:
       #       port:
       #         name: use-annotation
 
+    # -- Additional ingress rules
+    # @default -- `[]` (See [values.yaml])
+    extraRules: []
+      # - host: example.server.local
+      #   http:
+      #       path: /
+      #       backend:
+      #         service:
+      #           name: example-svc
+      #           port:
+      #             name: http
+
     # -- Ingress TLS configuration
     tls: []
       # - secretName: your-certificate-name
@@ -1990,6 +2003,18 @@ server:
       #       port:
       #         name: use-annotation
 
+    # -- Additional ingress rules
+    # @default -- `[]` (See [values.yaml])
+    extraRules: []
+      # - host: example.server.local
+      #   http:
+      #       path: /
+      #       backend:
+      #         service:
+      #           name: example-svc
+      #           port:
+      #             name: http
+
     # -- Ingress TLS configuration for dedicated [gRPC-ingress]
     tls: []
       # - secretName: your-certificate-name
@@ -2697,11 +2722,6 @@ applicationSet:
       pathType: Prefix
       # -- Additional ingress paths
       extraPaths: []
-        # - path: /*
-        #   backend:
-        #     serviceName: ssl-redirect
-        #     servicePort: use-annotation
-        ## for Kubernetes >=1.19 (when "networking.k8s.io/v1" is used)
         # - path: /*
         #   pathType: Prefix
         #   backend:
@@ -2710,6 +2730,18 @@ applicationSet:
         #       port:
         #         name: use-annotation
 
+      # -- Additional ingress rules
+      # @default -- `[]` (See [values.yaml])
+      extraRules: []
+        # - host: example.server.local
+        #   http:
+        #       path: /
+        #       backend:
+        #         service:
+        #           name: example-svc
+        #           port:
+        #             name: http
+
       # -- Ingress TLS configuration
       tls: []
         # - secretName: argocd-applicationset-tls