From 405621fa44bbad99fa9d4a78975bc8e868c87d2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Brunk?= <soeren@brunk.io>
Date: Sat, 20 Mar 2021 22:01:22 +0100
Subject: [PATCH] Helm - Trim sandbox
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Based on the following kustomize change:
- cd4a3d5a Trim sandbox (#727)

Signed-off-by: Sören Brunk <soeren@brunk.io>
Signed-off-by: Haytham Abuelfutuh <haytham@afutuh.com>
---
 helm/templates/admin/deployment.yaml    |  2 +-
 helm/templates/postgres/deployment.yaml |  3 +++
 helm/templates/propeller/configmap.yaml |  2 ++
 helm/values-sandbox.yaml                | 24 ++++++++++++++++++++----
 helm/values.yaml                        |  2 +-
 5 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/helm/templates/admin/deployment.yaml b/helm/templates/admin/deployment.yaml
index 075488534a..f5b6178a32 100644
--- a/helm/templates/admin/deployment.yaml
+++ b/helm/templates/admin/deployment.yaml
@@ -20,7 +20,7 @@ spec:
       initContainers:
       {{- if .Values.postgres.enabled }}
       - name: check-db-ready
-        image: postgres:10.1
+        image: postgres:10.16-alpine
         command:
         - sh
         - -c
diff --git a/helm/templates/postgres/deployment.yaml b/helm/templates/postgres/deployment.yaml
index 13ec8209c3..ff678d36ad 100644
--- a/helm/templates/postgres/deployment.yaml
+++ b/helm/templates/postgres/deployment.yaml
@@ -20,6 +20,9 @@ spec:
       - image: "{{ .Values.postgres.image.repository }}:{{ .Values.postgres.image.tag }}"
         imagePullPolicy: "{{ .Values.postgres.image.pullPolicy }}"
         name: postgres
+        env:
+        - name: POSTGRES_HOST_AUTH_METHOD
+          value: trust
         ports:
         - containerPort: 5432
           name: postgres
diff --git a/helm/templates/propeller/configmap.yaml b/helm/templates/propeller/configmap.yaml
index c604b5656e..70b4d58a0e 100644
--- a/helm/templates/propeller/configmap.yaml
+++ b/helm/templates/propeller/configmap.yaml
@@ -35,9 +35,11 @@ data:
 {{- with .Values.configmap.resource_manager }}
   resource_manager.yaml: | {{ toYaml . | nindent 4 }}
 {{- end }}
+{{- if .Values.sparkoperator.enabled }}
 {{- with .Values.configmap.spark }}
   spark.yaml: | {{ toYaml . | nindent 4 }}
 {{- end }}
+{{- end }}
 {{- with .Values.configmap.storage }}
   storage.yaml: | {{ toYaml . | nindent 4 }}
 {{- end }}
diff --git a/helm/values-sandbox.yaml b/helm/values-sandbox.yaml
index 148d564ba3..f1fad19694 100644
--- a/helm/values-sandbox.yaml
+++ b/helm/values-sandbox.yaml
@@ -27,13 +27,17 @@ flyteconsole: {}
 # REDIS
 #
 
-redis: {}
+redis:
+  enabled: false
 
 #
 # POSTGRES
 #
 
-postgres: {}
+postgres:
+  image:
+    # Override postgres image to use alpine based (rather smaller) docker image
+    tag: "10.16-alpine"
 
 #
 # MINIO
@@ -59,13 +63,15 @@ contour:
 # SPARKOPERATOR
 #
 
-sparkoperator: {}
+sparkoperator:
+  enabled: false
 
 #
 # PYTORCHOPERATOR
 #
 
-pytorchoperator: {}
+pytorchoperator:
+  enabled: false
 
 #
 # COMMON
@@ -132,6 +138,16 @@ configmap:
       show-source: true
       level: 5
 
+  # Disable Qubole
+  qubole: null
+
+  # Use noop resource-manager
+  resource_manager:
+    propeller:
+      resourcemanager:
+        type: noop
+        redis: null
+
   ab_project_resource_quota: |
     apiVersion: v1
     kind: ResourceQuota
diff --git a/helm/values.yaml b/helm/values.yaml
index 814f6e7b2e..f48c07c97d 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -194,7 +194,7 @@ postgres:
   image:
     # -- Docker image for Postgres deployment
     repository: postgres
-    tag: "10.1"
+    tag: "10.16"
     pullPolicy: IfNotPresent
   # -- Default resources requests and limits for Postgres deployment
   resources: