Allow changing all options in HelmChartConfig

README.md

@@ -304,9 +304,12 @@ rke2_agents_group_name: workers
 # rke2_kube_scheduler_arg:
 #   - "bind-address=0.0.0.0"
 
-# Configure the nginx default certificate: https://kubernetes.github.io/ingress-nginx/user-guide/tls/#default-ssl-certificate
-# Leave empty to not set `--default-ssl-certificate`
-rke2_ingress_nginx_default_certificate: ""
+# (Optional) Configure nginx via HelmChartConfig: https://docs.rke2.io/networking/networking_services#nginx-ingress-controller
+# rke2_ingress_nginx_values:
+#   controller:
+#     config:
+#       use-forwarded-headers: "true"
+rke2_ingress_nginx_values: {}
 
 # Cordon, drain the node which is being upgraded. Uncordon the node once the RKE2 upgraded
 rke2_drain_node_during_upgrade: false

defaults/main.yml

@@ -265,9 +265,12 @@ rke2_agents_group_name: workers
 # rke2_kube_scheduler_arg:
 #   - "bind-address=0.0.0.0"
 
-# Configure the nginx default certificate: https://kubernetes.github.io/ingress-nginx/user-guide/tls/#default-ssl-certificate
-# Leave empty to not set `--default-ssl-certificate`
-rke2_ingress_nginx_default_certificate: ""
+# (Optional) Configure nginx via HelmChartConfig: https://docs.rke2.io/networking/networking_services#nginx-ingress-controller
+# rke2_ingress_nginx_values:
+#   controller:
+#     config:
+#       use-forwarded-headers: "true"
+rke2_ingress_nginx_values: {}
 
 # Cordon, drain the node which is being upgraded. Uncordon the node once the RKE2 upgraded
 rke2_drain_node_during_upgrade: false

templates/ingress-nginx-config.yml.j2

@@ -5,8 +5,6 @@ metadata:
   namespace: kube-system
 spec:
   valuesContent: |-
-    controller:
-      extraArgs:
-{% if rke2_ingress_nginx_default_certificate | length > 0 %}
-        default-ssl-certificate: "{{ rke2_ingress_nginx_default_certificate }}"
-{% endif %}
+{% if rke2_ingress_nginx_values | length > 0 %}
+    {{ rke2_ingress_nginx_values | to_nice_yaml | indent(2) }}
+{% endif %}