feat: update ingress (#180)

* update ingress

Author: ypoplavs

charts/testkube-cloud-api/templates/ingress-grpc.yaml

@@ -21,10 +21,14 @@ metadata:
     {{- toYaml . | nindent 4 }}
     {{- end }}
   annotations:
+    {{- if eq .Values.ingress.className "nginx"}}
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+    nginx.ingress.kubernetes.io/preserve-trailing-slash: "true"
     nginx.ingress.kubernetes.io/backend-protocol: {{ if .Values.api.tls.serveHTTPS }}GRPCS{{ else }}GRPC{{ end }}
     nginx.ingress.kubernetes.io/proxy-body-size: {{ .Values.grpcIngress.maxPayloadSize }}
     nginx.ingress.kubernetes.io/client-header-timeout: "10800"
     nginx.ingress.kubernetes.io/client-body-timeout: "10800"
+    {{- end }}
     {{- if and (not .Values.api.tls.serveHTTPS) (eq .Values.global.certificateProvider "cert-manager") }}
     cert-manager.io/cluster-issuer: {{ required ".Values.global.certManager.issuerRef must be provided if provider is cert-manager" .Values.global.certManager.issuerRef }}
     {{- end }}

charts/testkube-cloud-api/templates/ingress-rest.yaml

@@ -21,8 +21,12 @@ metadata:
     {{- toYaml . | nindent 4 }}
     {{- end }}
   annotations:
+    {{- if eq .Values.ingress.className "nginx"}}
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+    nginx.ingress.kubernetes.io/preserve-trailing-slash: "true"
     nginx.ingress.kubernetes.io/backend-protocol: {{ if .Values.api.tls.serveHTTPS }}HTTPS{{ else }}HTTP{{ end }}
     {{- if and (not .Values.api.tls.serveHTTPS) (eq .Values.global.certificateProvider "cert-manager") }}
+    {{- end }}
     cert-manager.io/cluster-issuer: {{ required ".Values.global.certManager.issuerRef must be provided if provider is cert-manager" .Values.global.certManager.issuerRef }}
     {{- end }}
     {{- with .Values.ingress.annotations }}

charts/testkube-cloud-api/templates/ingress-ws.yaml

@@ -21,10 +21,14 @@ metadata:
     {{- toYaml . | nindent 4 }}
     {{- end }}
   annotations:
+    {{- if eq .Values.ingress.className "nginx"}}
     nginx.ingress.kubernetes.io/proxy-read-timeout: "3600"
     nginx.ingress.kubernetes.io/proxy-send-timeout: "3600"
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+    nginx.ingress.kubernetes.io/preserve-trailing-slash: "true"
     nginx.ingress.kubernetes.io/proxy-body-size: 8m
     nginx.ingress.kubernetes.io/backend-protocol: {{ if .Values.api.tls.serveHTTPS }}HTTPS{{ else }}HTTP{{ end }}
+    {{- end }}
     {{- if and (not .Values.api.tls.serveHTTPS) (eq .Values.global.certificateProvider "cert-manager") }}
     cert-manager.io/cluster-issuer: {{ required ".Values.global.certManager.issuerRef must be provided if provider is cert-manager" .Values.global.certManager.issuerRef }}
     {{- end }}

charts/testkube-cloud-api/values.yaml

@@ -325,10 +325,6 @@ service:
   # -- Metrics port
   metricsPort: 9000
 ingress:
-  # -- Common annotations which will be added to all Ingress resources
-  annotations:
-    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
-    nginx.ingress.kubernetes.io/preserve-trailing-slash: "true"
   # -- Common Ingress class name (NGINX is the only officially supported ingress controller and should not be changed)
   className: nginx
 restIngress:

charts/testkube-cloud-ui/templates/ingress-redirect.yaml

@@ -22,6 +22,7 @@ metadata:
     {{- toYaml .Values.ingressRedirect.labels | nindent 4 }}
   {{- end }}
   annotations:
+    {{- if eq .Values.ingress.className "nginx"}}
     nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
     nginx.ingress.kubernetes.io/preserve-trailing-slash: "true"
     nginx.ingress.kubernetes.io/configuration-snippet: |
@@ -30,6 +31,7 @@ metadata:
       add_header X-Content-Type-Options nosniff;
       add_header Referrer-Policy 'same-origin';
       add_header Permissions-Policy "accelerometer=(), camera=(), geolocation=(), gyroscope=(), magnetometer=(), microphone=(), payment=(), usb=()";
+    {{- end }}
     {{- if (eq .Values.global.certificateProvider "cert-manager") }}
     cert-manager.io/cluster-issuer: {{ required ".Values.global.certManager.issuerRef must be provided if provider is cert-manager" .Values.global.certManager.issuerRef }}
     {{- end }}

charts/testkube-cloud-ui/templates/ingress.yaml

@@ -22,6 +22,7 @@ metadata:
     {{- toYaml .Values.ingress.labels | nindent 4 }}
   {{- end }}
   annotations:
+    {{- if eq .Values.ingress.className "nginx"}}
     nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
     nginx.ingress.kubernetes.io/preserve-trailing-slash: "true"
     nginx.ingress.kubernetes.io/configuration-snippet: |
@@ -30,6 +31,7 @@ metadata:
       add_header X-Content-Type-Options nosniff;
       add_header Referrer-Policy 'same-origin';
       add_header Permissions-Policy "accelerometer=(), camera=(), geolocation=(), gyroscope=(), magnetometer=(), microphone=(), payment=(), usb=()";
+    {{- end }}
     {{- if (eq .Values.global.certificateProvider "cert-manager") }}
     cert-manager.io/cluster-issuer: {{ required ".Values.global.certManager.issuerRef must be provided if provider is cert-manager" .Values.global.certManager.issuerRef }}
     {{- end }}

charts/testkube-enterprise/templates/ingress-minio.yaml

@@ -20,7 +20,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   annotations:
+    {{- if eq .Values.minio.customIngress.className "nginx"}}
     nginx.ingress.kubernetes.io/backend-protocol: {{ if .Values.minio.tls.enabled }}HTTPS{{ else }}HTTP{{ end }}
+    {{- end }}
     {{- if eq .Values.global.certificateProvider "cert-manager" }}
     cert-manager.io/cluster-issuer: {{ required ".Values.global.certManager.issuerRef must be provided if provider is cert-manager" .Values.global.certManager.issuerRef }}
     {{- end }}

charts/testkube-enterprise/values.yaml

@@ -361,6 +361,8 @@ testkube-cloud-ui:
   ingress:
     # -- Name of the TLS secret which contains the certificate files
     tlsSecretName: testkube-enterprise-ui-tls
+    # -- Ingress classname
+    className: nginx
   # -- Toggle whether to enable redirect Ingress which allows having a different subdomain redirecting to the actual Dashboard UI Ingress URL
   ingressRedirect:
     enabled: false