From 1af43ec155c140177df972dc68bde5c27c798b4d Mon Sep 17 00:00:00 2001
From: PT-ATA No One <ata-no-one@gdata.de>
Date: Fri, 1 Mar 2024 14:20:00 +0100
Subject: [PATCH] change defaults

---
 charts/vaas/Chart.yaml                         | 2 +-
 charts/vaas/templates/gdscan/_helpers.tpl      | 2 +-
 charts/vaas/templates/gdscan/deployment.yaml   | 2 --
 charts/vaas/templates/gdscan/stateful-set.yaml | 4 ----
 charts/vaas/values.yaml                        | 8 +-------
 5 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/charts/vaas/Chart.yaml b/charts/vaas/Chart.yaml
index 7ce7a1c..b72083b 100644
--- a/charts/vaas/Chart.yaml
+++ b/charts/vaas/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: vaas
-version: 1.0.9
+version: 1.1.0
 description: Deployment of a Verdict-as-a-Service on-premise instance
 maintainers:
   - name: G DATA CyberDefense AG
diff --git a/charts/vaas/templates/gdscan/_helpers.tpl b/charts/vaas/templates/gdscan/_helpers.tpl
index b0cbb2a..f980da0 100644
--- a/charts/vaas/templates/gdscan/_helpers.tpl
+++ b/charts/vaas/templates/gdscan/_helpers.tpl
@@ -44,7 +44,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 
 {{- define "gdscan.imagePullSecrets" -}}
 
-{{- $imagePullSecrets := concat (((.Values.gdscan.global | default dict).imagePullSecrets)| default list) (.Values.gdscan.imagePullSecrets | default list) -}}
+{{- $imagePullSecrets := concat (((.Values.global | default dict).imagePullSecrets)| default list) (.Values.gdscan.imagePullSecrets | default list) -}}
 {{- if gt (len $imagePullSecrets) 0 -}}
 imagePullSecrets:
   {{- range $imagePullSecrets }}
diff --git a/charts/vaas/templates/gdscan/deployment.yaml b/charts/vaas/templates/gdscan/deployment.yaml
index 930920f..9eff297 100644
--- a/charts/vaas/templates/gdscan/deployment.yaml
+++ b/charts/vaas/templates/gdscan/deployment.yaml
@@ -48,8 +48,6 @@ spec:
           volumeMounts:
             - name: samples
               mountPath: /tmp/scan
-            - name: scan-socket
-              mountPath: /var/share/run
             - name: client-tmp
               mountPath: /tmp
           resources:
diff --git a/charts/vaas/templates/gdscan/stateful-set.yaml b/charts/vaas/templates/gdscan/stateful-set.yaml
index 127295b..8ad2807 100644
--- a/charts/vaas/templates/gdscan/stateful-set.yaml
+++ b/charts/vaas/templates/gdscan/stateful-set.yaml
@@ -35,8 +35,6 @@ spec:
       volumes:
         - name: server-tmp
           emptyDir: {}
-        - name: scan-socket
-          emptyDir: {}
         - name: client-tmp
           emptyDir: {}
         - name: server-var-log
@@ -51,8 +49,6 @@ spec:
           volumeMounts:
             - name: samples
               mountPath: /tmp/scan
-            - name: scan-socket
-              mountPath: /var/share/run
             - name: client-tmp
               mountPath: /tmp
           resources:
diff --git a/charts/vaas/values.yaml b/charts/vaas/values.yaml
index 9e10f9b..dadc745 100644
--- a/charts/vaas/values.yaml
+++ b/charts/vaas/values.yaml
@@ -174,20 +174,14 @@ gdscan:
         type: RuntimeDefault
   terminationGracePeriodSeconds: 30
 
-  imagePullSecrets:
-    - gdscanregistry
-
   nameOverride: ""
   fullnameOverride: "gdscan"
 
   networkPolicy:
-    enabled: false
+    enabled: true
 
   podAnnotations: {}
 
-  secret:
-    dockerconfigjson: ""
-
   service:
     type: ""
     port: 8080