From 9c007c1af94d210811c2a04107f83c2047bce0ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Brunk?= <soeren@brunk.io>
Date: Tue, 7 Jul 2020 22:08:01 +0200
Subject: [PATCH] Add flyte-data-config ConfigMap to sandbox kustomization

---
 deployment/sandbox/flyte_generated.yaml       | 25 ++++++++++++++++---
 deployment/test/flyte_generated.yaml          | 25 ++++++++++++++++---
 .../admindeployment/kustomization.yaml        |  1 +
 3 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/deployment/sandbox/flyte_generated.yaml b/deployment/sandbox/flyte_generated.yaml
index c5385f4898..4a8d0572b8 100644
--- a/deployment/sandbox/flyte_generated.yaml
+++ b/deployment/sandbox/flyte_generated.yaml
@@ -496,9 +496,28 @@ data:
   ab_project-resource-quota.yaml: "apiVersion: v1\nkind: ResourceQuota\nmetadata:\n
     \ name: project-quota\n  namespace: {{ namespace }} \nspec:\n  hard:\n    limits.cpu:
     {{ projectQuotaCpu }} \n    limits.memory: {{ projectQuotaMemory }}\n\n"
+  ac_project-copilot-dataconfig.yaml: |
+    kind: ConfigMap
+    apiVersion: v1
+    metadata:
+      name: flyte-data-config
+      namespace: {{ namespace }}
+    data:
+      config.yaml: |
+        storage:
+          connection:
+            access-key: minio
+            auth-type: accesskey
+            disable-ssl: true
+            endpoint: http://minio.flyte.svc.cluster.local:9000
+            region: us-east-1
+            secret-key: miniostorage
+          type: minio
+          container: my-s3-bucket
+          enable-multicontainer: true
 kind: ConfigMap
 metadata:
-  name: clusterresource-template-m2kccc465f
+  name: clusterresource-template-9mbg4b2fhc
   namespace: flyte
 ---
 apiVersion: v1
@@ -1129,7 +1148,7 @@ spec:
       serviceAccountName: flyteadmin
       volumes:
       - configMap:
-          name: clusterresource-template-m2kccc465f
+          name: clusterresource-template-9mbg4b2fhc
         name: resource-templates
       - emptyDir: {}
         name: shared-data
@@ -1538,7 +1557,7 @@ spec:
           serviceAccountName: flyteadmin
           volumes:
           - configMap:
-              name: clusterresource-template-m2kccc465f
+              name: clusterresource-template-9mbg4b2fhc
             name: resource-templates
           - configMap:
               name: flyte-admin-config-dtcg25hb22
diff --git a/deployment/test/flyte_generated.yaml b/deployment/test/flyte_generated.yaml
index 74f1315596..0f83a8b95f 100644
--- a/deployment/test/flyte_generated.yaml
+++ b/deployment/test/flyte_generated.yaml
@@ -370,9 +370,28 @@ data:
   ab_project-resource-quota.yaml: "apiVersion: v1\nkind: ResourceQuota\nmetadata:\n
     \ name: project-quota\n  namespace: {{ namespace }} \nspec:\n  hard:\n    limits.cpu:
     {{ projectQuotaCpu }} \n    limits.memory: {{ projectQuotaMemory }}\n\n"
+  ac_project-copilot-dataconfig.yaml: |
+    kind: ConfigMap
+    apiVersion: v1
+    metadata:
+      name: flyte-data-config
+      namespace: {{ namespace }}
+    data:
+      config.yaml: |
+        storage:
+          connection:
+            access-key: minio
+            auth-type: accesskey
+            disable-ssl: true
+            endpoint: http://minio.flyte.svc.cluster.local:9000
+            region: us-east-1
+            secret-key: miniostorage
+          type: minio
+          container: my-s3-bucket
+          enable-multicontainer: true
 kind: ConfigMap
 metadata:
-  name: clusterresource-template-m2kccc465f
+  name: clusterresource-template-9mbg4b2fhc
   namespace: flyte
 ---
 apiVersion: v1
@@ -750,7 +769,7 @@ spec:
       serviceAccountName: flyteadmin
       volumes:
       - configMap:
-          name: clusterresource-template-m2kccc465f
+          name: clusterresource-template-9mbg4b2fhc
         name: resource-templates
       - emptyDir: {}
         name: shared-data
@@ -1049,7 +1068,7 @@ spec:
           serviceAccountName: flyteadmin
           volumes:
           - configMap:
-              name: clusterresource-template-m2kccc465f
+              name: clusterresource-template-9mbg4b2fhc
             name: resource-templates
           - configMap:
               name: flyte-admin-config-dtcg25hb22
diff --git a/kustomize/overlays/sandbox/admindeployment/kustomization.yaml b/kustomize/overlays/sandbox/admindeployment/kustomization.yaml
index 6f612c126a..85674cd696 100644
--- a/kustomize/overlays/sandbox/admindeployment/kustomization.yaml
+++ b/kustomize/overlays/sandbox/admindeployment/kustomization.yaml
@@ -17,6 +17,7 @@ configMapGenerator:
 # Files are read in alphabetical order. To ensure that we create the namespace first, prefix the file name with "aa".
     - clusterresource-templates/aa_namespace.yaml
     - clusterresource-templates/ab_project-resource-quota.yaml
+    - clusterresource-templates/ac_project-copilot-dataconfig.yaml
 
 patches:
 - admindeployment.yaml