Merge pull request #108 from GDATASoftwareAG/ingress-annotations

Ingress annotations

Author: doxthree

README.md

@@ -150,12 +150,13 @@ The `allowlistLookup` is a request of the hash to the G DATA Cloud, against a li
 <!-- tag::FileSize[] -->
 
 ### File size limit
-
-If you want to scan larger files, you have to adjust the deployments body size limit in `vaas.gateway.ingress.annotations`. Should look like this:
+The current file size limit is set to 2G. If you want to adjust the file size for your use case, you have to set the deployments body size limit in `vaas.gateway.ingress.annotations`:
 
 ```yaml
-nginx.ingress.kubernetes.io/proxy-body-size: <your maximum filesize>
-nginx.ingress.kubernetes.io/proxy-request-buffering: "off"
+gateway:
+  ingress:
+    annotations:
+      nginx.ingress.kubernetes.io/proxy-body-size: <your maximum filesize>
 ```
 
 <!-- end::FileSize[] -->

charts/vaas/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: vaas
-version: 2.8.1
+version: 2.9.0
 description: Deployment of a Verdict-as-a-Service on-premise instance
 maintainers:
   - name: G DATA CyberDefense AG

charts/vaas/templates/gateway/ingress.yaml

@@ -1,28 +1,17 @@
 {{- if .Values.gateway.ingress.enabled -}}
 {{- $fullName := include "gateway.fullname" . -}}
-{{- if and .Values.gateway.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
-  {{- if not (hasKey .Values.gateway.ingress.annotations "kubernetes.io/ingress.class") }}
-  {{- $_ := set .Values.gateway.ingress.annotations "kubernetes.io/ingress.class" .Values.gateway.ingress.className}}
-  {{- end }}
-{{- end }}
-{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- $defaultAnnotations := dict "nginx.ingress.kubernetes.io/proxy-body-size" "2G" "nginx.ingress.kubernetes.io/proxy-request-buffering" "off" }}
+{{- $mergedAnnotations := merge (.Values.gateway.ingress.annotations | default dict) $defaultAnnotations }}
 apiVersion: networking.k8s.io/v1
-{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
-apiVersion: extensions/v1beta1
-{{- end }}
 kind: Ingress
 metadata:
   name: {{ $fullName }}
   labels:
     {{- include "gateway.labels" . | nindent 4 }}
-  {{- with .Values.gateway.ingress.annotations }}
   annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
+    {{- toYaml $mergedAnnotations | nindent 4 }}
 spec:
-  {{- if and .Values.gateway.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
+  {{- if .Values.gateway.ingress.className }}
   ingressClassName: {{ .Values.gateway.ingress.className }}
   {{- end }}
   {{- if .Values.gateway.ingress.tls }}
@@ -42,19 +31,14 @@ spec:
         paths:
           {{- range .paths }}
           - path: {{ .path }}
-            {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
+            {{- if .pathType }}
             pathType: {{ .pathType }}
             {{- end }}
             backend:
-              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
               service:
                 name: {{ .service.name }}
                 port:
                   number: {{ .service.port }}
-              {{- else }}
-              serviceName: {{ .service.name }}
-              servicePort: {{ .service.port }}
-              {{- end }}
           {{- end }}
     {{- end }}
 {{- end }}