K8s: Disable annotation when ingress.tls[0].secretName is null (#2724)

Signed-off-by: Viet Nguyen Duc <[email protected]>

Author: VietND96

charts/selenium-grid/CONFIGURATION.md

@@ -100,7 +100,7 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
 | ingress.nginx.proxyBuffer.number | int | `4` | Set buffer number to corresponding annotations for NGINX Ingress Controller |
 | ingress.nginx.sslPassthrough | bool | `true` | Enable corresponding annotations for NGINX Ingress Controller |
 | ingress.nginx.sslSecret | string | `""` | Specify a Secret with the certificate `tls.crt`, key `tls.key`, the name in the form "namespace/secretName" for NGINX Ingress Controller |
-| ingress.nginx.useHttp2 | bool | `true` | Enables or disables HTTP/2 support in secure connections via annotations for NGINX Ingress Controller |
+| ingress.nginx.useHttp2 | bool | `false` | Enables or disables HTTP/2 support in secure connections via annotations for NGINX Ingress Controller |
 | ingress.nginx.upstreamKeepalive | object | `{"connections":10000,"requests":10000,"time":"1h"}` | Apply upstream keepalive settings once HTTP/2 is enabled |
 | ingress.nginx.upstreamKeepalive.connections | int | `10000` | Set keepalive connections to corresponding annotations for NGINX Ingress Controller |
 | ingress.nginx.upstreamKeepalive.time | string | `"1h"` | Set keepalive timeout to corresponding annotations for NGINX Ingress Controller |

charts/selenium-grid/templates/_helpers.tpl

@@ -135,8 +135,8 @@ nginx.ingress.kubernetes.io/use-http2: {{ .useHttp2 | quote }}
 nginx.ingress.kubernetes.io/proxy-ssl-secret: {{ tpl .sslSecret $ | quote }}
     {{- else if (empty $.Values.ingress.tls) }}
 nginx.ingress.kubernetes.io/proxy-ssl-secret: {{ tpl (printf "%s/%s" $.Release.Namespace (include "seleniumGrid.tls.fullname" $)) $ | quote }}
-    {{- else }}
-nginx.ingress.kubernetes.io/proxy-ssl-secret: {{ tpl (printf "%s/%s" $.Release.Namespace (index $.Values.ingress.tls 0).secretName) $ | quote }}
+    {{- else if (index $.Values.ingress.tls 0).secretName }}
+nginx.ingress.kubernetes.io/proxy-ssl-secret: {{ tpl (printf "%s" $.Release.Namespace (index $.Values.ingress.tls 0).secretName) $ | quote }}
     {{- end }}
   {{- end }}
   {{- with .upstreamKeepalive }}

charts/selenium-grid/values.yaml

@@ -209,7 +209,7 @@ ingress:
     # -- Specify a Secret with the certificate `tls.crt`, key `tls.key`, the name in the form "namespace/secretName" for NGINX Ingress Controller
     sslSecret: ""
     # -- Enables or disables HTTP/2 support in secure connections via annotations for NGINX Ingress Controller
-    useHttp2: true
+    useHttp2: false
     # -- Apply upstream keepalive settings once HTTP/2 is enabled
     upstreamKeepalive:
       # -- Set keepalive connections to corresponding annotations for NGINX Ingress Controller

tests/charts/templates/render/dummy_solution.yaml

@@ -91,6 +91,7 @@ selenium-grid:
     tls:
       - hosts:
           - '*.my.domain.com'
+        secretName: "selenium/my-external-secret"
 
   isolateComponents: true