1
0
Fork 0

fix(*/ingress-nginx): use values instead of valuesObject

- see previous commit
This commit is contained in:
Vojtěch Mareš 2023-10-03 01:50:38 +02:00
parent 7368335c45
commit 75df685636
Signed by: vojtech.mares
GPG key ID: C6827B976F17240D
2 changed files with 55 additions and 15 deletions

View file

@ -20,21 +20,41 @@ spec:
targetRevision: 4.8.0 targetRevision: 4.8.0
helm: helm:
releaseName: ingress-nginx 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: ingressClassResource:
default: "true" default: true
# TODO: enable proxy protocol # TODO: enable proxy protocol
controller: controller:
kind: "DaemonSet" kind: DaemonSet
updateStrategy: updateStrategy:
type: "RollingUpdate" type: RollingUpdate
rollingUpdate: rollingUpdate:
maxUnavailable: "1" maxUnavailable: 1
service: service:
# TODO: use Service .spec.type: NodePort # TODO: use Service .spec.type: NodePort
type: "ClusterIP" type: ClusterIP
hostPort: hostPort:
enabled: "true" enabled: true
config: config:
allow-snippet-annotations: "true" allow-snippet-annotations: "true"
generate-request-id: "true" generate-request-id: "true"

View file

@ -22,20 +22,40 @@ spec:
targetRevision: 4.8.0 targetRevision: 4.8.0
helm: helm:
releaseName: ingress-nginx 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: ingressClassResource:
default: "true" default: true
controller: controller:
kind: "DaemonSet" kind: DaemonSet
updateStrategy: updateStrategy:
type: "RollingUpdate" type: RollingUpdate
rollingUpdate: rollingUpdate:
maxUnavailable: "1" maxUnavailable: 1
service: service:
type: "NodePort" type: NodePort
nodePorts: nodePorts:
http: "32080" http: 32080
https: "32443" https: 32443
config: config:
allow-snippet-annotations: "true" allow-snippet-annotations: "true"
generate-request-id: "true" generate-request-id: "true"