diff --git a/clusters/cherry/apps/ingress-nginx.yaml b/clusters/cherry/apps/ingress-nginx.yaml index 58679d7..04d94c4 100644 --- a/clusters/cherry/apps/ingress-nginx.yaml +++ b/clusters/cherry/apps/ingress-nginx.yaml @@ -20,21 +20,41 @@ spec: targetRevision: 4.8.0 helm: releaseName: ingress-nginx - valuesObject: + # !!! BUG !!! + # See: https://github.com/argoproj/argo-cd/issues/15126 + # valuesObject: + # ingressClassResource: + # default: true + # # TODO: enable proxy protocol + # controller: + # kind: DaemonSet + # updateStrategy: + # type: RollingUpdate + # rollingUpdate: + # maxUnavailable: 1 + # service: + # # TODO: use Service .spec.type: NodePort + # type: ClusterIP + # hostPort: + # enabled: true + # config: + # allow-snippet-annotations: "true" + # generate-request-id: "true" + values: | ingressClassResource: - default: "true" + default: true # TODO: enable proxy protocol controller: - kind: "DaemonSet" + kind: DaemonSet updateStrategy: - type: "RollingUpdate" + type: RollingUpdate rollingUpdate: - maxUnavailable: "1" + maxUnavailable: 1 service: # TODO: use Service .spec.type: NodePort - type: "ClusterIP" + type: ClusterIP hostPort: - enabled: "true" + enabled: true config: allow-snippet-annotations: "true" generate-request-id: "true" diff --git a/clusters/lychee/ingress-nginx.yaml b/clusters/lychee/ingress-nginx.yaml index 5b5e921..dc4ce9b 100644 --- a/clusters/lychee/ingress-nginx.yaml +++ b/clusters/lychee/ingress-nginx.yaml @@ -22,20 +22,40 @@ spec: targetRevision: 4.8.0 helm: releaseName: ingress-nginx - valuesObject: + # !!! BUG !!! + # See: https://github.com/argoproj/argo-cd/issues/15126 + # valuesObject: + # ingressClassResource: + # default: true + # controller: + # kind: DaemonSet + # updateStrategy: + # type: RollingUpdate + # rollingUpdate: + # maxUnavailable: 1 + # service: + # type: NodePort + # nodePorts: + # http: 32080 + # https: 32443 + # config: + # allow-snippet-annotations: "true" + # generate-request-id: "true" + # use-proxy-protocol: "true" + values: | ingressClassResource: - default: "true" + default: true controller: - kind: "DaemonSet" + kind: DaemonSet updateStrategy: - type: "RollingUpdate" + type: RollingUpdate rollingUpdate: - maxUnavailable: "1" + maxUnavailable: 1 service: - type: "NodePort" + type: NodePort nodePorts: - http: "32080" - https: "32443" + http: 32080 + https: 32443 config: allow-snippet-annotations: "true" generate-request-id: "true"