Add ingress extra rules
Signed-off-by: Petr Drastil <petr.drastil@gmail.com>
This commit is contained in:
parent
f8dd7e0a4d
commit
031fca8cad
6 changed files with 51 additions and 5 deletions
|
@ -28,3 +28,5 @@ annotations:
|
||||||
artifacthub.io/changes: |
|
artifacthub.io/changes: |
|
||||||
- kind: removed
|
- kind: removed
|
||||||
description: Wildcard catch all ingress rule
|
description: Wildcard catch all ingress rule
|
||||||
|
- kind: added
|
||||||
|
description: Ingress extra rules to allow explicit configuration of catch all rule
|
||||||
|
|
|
@ -738,6 +738,7 @@ NAME: my-release
|
||||||
| server.ingress.annotations | object | `{}` | Additional ingress annotations |
|
| server.ingress.annotations | object | `{}` | Additional ingress annotations |
|
||||||
| server.ingress.enabled | bool | `false` | Enable an ingress resource for the Argo CD server |
|
| server.ingress.enabled | bool | `false` | Enable an ingress resource for the Argo CD server |
|
||||||
| server.ingress.extraPaths | list | `[]` | Additional ingress paths |
|
| 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.hosts | list | `[]` | List of ingress hosts |
|
||||||
| server.ingress.https | bool | `false` | Uses `server.service.servicePortHttps` instead `server.service.servicePortHttp` |
|
| 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 |
|
| server.ingress.ingressClassName | string | `""` | Defines which ingress controller will implement the resource |
|
||||||
|
@ -750,6 +751,7 @@ NAME: my-release
|
||||||
| server.ingressGrpc.awsALB.serviceType | string | `"NodePort"` | Service type for the AWS ALB gRPC service |
|
| 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.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.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.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.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] |
|
| server.ingressGrpc.ingressClassName | string | `""` | Defines which ingress controller will implement the resource [gRPC-ingress] |
|
||||||
|
@ -1161,6 +1163,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.annotations | object | `{}` | Additional ingress annotations |
|
||||||
| applicationSet.webhook.ingress.enabled | bool | `false` | Enable an ingress resource for Webhooks |
|
| applicationSet.webhook.ingress.enabled | bool | `false` | Enable an ingress resource for Webhooks |
|
||||||
| applicationSet.webhook.ingress.extraPaths | list | `[]` | Additional ingress paths |
|
| 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.hosts | list | `[]` | List of ingress hosts |
|
||||||
| applicationSet.webhook.ingress.ingressClassName | string | `""` | Defines which ingress ApplicationSet controller will implement the resource |
|
| applicationSet.webhook.ingress.ingressClassName | string | `""` | Defines which ingress ApplicationSet controller will implement the resource |
|
||||||
| applicationSet.webhook.ingress.labels | object | `{}` | Additional ingress labels |
|
| applicationSet.webhook.ingress.labels | object | `{}` | Additional ingress labels |
|
||||||
|
|
|
@ -45,6 +45,9 @@ spec:
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- with .Values.applicationSet.webhook.ingress.extraRules }}
|
||||||
|
{{- toYaml . | nindent 4 }}
|
||||||
|
{{- end }}
|
||||||
{{- with .Values.applicationSet.webhook.ingress.tls }}
|
{{- with .Values.applicationSet.webhook.ingress.tls }}
|
||||||
tls:
|
tls:
|
||||||
{{- toYaml . | nindent 4 }}
|
{{- toYaml . | nindent 4 }}
|
||||||
|
|
|
@ -45,6 +45,9 @@ spec:
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- with .Values.server.ingressGrpc.extraRules }}
|
||||||
|
{{- toYaml . | nindent 4 }}
|
||||||
|
{{- end }}
|
||||||
{{- with .Values.server.ingressGrpc.tls }}
|
{{- with .Values.server.ingressGrpc.tls }}
|
||||||
tls:
|
tls:
|
||||||
{{- toYaml . | nindent 4 }}
|
{{- toYaml . | nindent 4 }}
|
||||||
|
|
|
@ -62,6 +62,9 @@ spec:
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- with .Values.server.ingress.extraRules }}
|
||||||
|
{{- toYaml . | nindent 4 }}
|
||||||
|
{{- end }}
|
||||||
{{- with .Values.server.ingress.tls }}
|
{{- with .Values.server.ingress.tls }}
|
||||||
tls:
|
tls:
|
||||||
{{- toYaml . | nindent 4 }}
|
{{- toYaml . | nindent 4 }}
|
||||||
|
|
|
@ -1946,6 +1946,7 @@ server:
|
||||||
- /
|
- /
|
||||||
# -- Ingress path type. One of `Exact`, `Prefix` or `ImplementationSpecific`
|
# -- Ingress path type. One of `Exact`, `Prefix` or `ImplementationSpecific`
|
||||||
pathType: Prefix
|
pathType: Prefix
|
||||||
|
|
||||||
# -- Additional ingress paths
|
# -- Additional ingress paths
|
||||||
extraPaths: []
|
extraPaths: []
|
||||||
# - path: /*
|
# - path: /*
|
||||||
|
@ -1956,6 +1957,18 @@ server:
|
||||||
# port:
|
# port:
|
||||||
# name: use-annotation
|
# 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
|
# -- Ingress TLS configuration
|
||||||
tls: []
|
tls: []
|
||||||
# - secretName: your-certificate-name
|
# - secretName: your-certificate-name
|
||||||
|
@ -2014,6 +2027,18 @@ server:
|
||||||
# port:
|
# port:
|
||||||
# name: use-annotation
|
# 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]
|
# -- Ingress TLS configuration for dedicated [gRPC-ingress]
|
||||||
tls: []
|
tls: []
|
||||||
# - secretName: your-certificate-name
|
# - secretName: your-certificate-name
|
||||||
|
@ -2712,11 +2737,6 @@ applicationSet:
|
||||||
pathType: Prefix
|
pathType: Prefix
|
||||||
# -- Additional ingress paths
|
# -- Additional ingress paths
|
||||||
extraPaths: []
|
extraPaths: []
|
||||||
# - path: /*
|
|
||||||
# backend:
|
|
||||||
# serviceName: ssl-redirect
|
|
||||||
# servicePort: use-annotation
|
|
||||||
## for Kubernetes >=1.19 (when "networking.k8s.io/v1" is used)
|
|
||||||
# - path: /*
|
# - path: /*
|
||||||
# pathType: Prefix
|
# pathType: Prefix
|
||||||
# backend:
|
# backend:
|
||||||
|
@ -2725,6 +2745,18 @@ applicationSet:
|
||||||
# port:
|
# port:
|
||||||
# name: use-annotation
|
# 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
|
# -- Ingress TLS configuration
|
||||||
tls: []
|
tls: []
|
||||||
# - secretName: argocd-applicationset-tls
|
# - secretName: argocd-applicationset-tls
|
||||||
|
|
Loading…
Reference in a new issue