Fix default eks storage config (#907)

* Fix default eks storage config Signed-off-by: Haytham Abuelfutuh <haytham@afutuh.com> * kustomize Signed-off-by: Haytham Abuelfutuh <haytham@afutuh.com> * bump Signed-off-by: Haytham Abuelfutuh <haytham@afutuh.com>
flyteorg · May 1, 2021 · 0acbea4 · 0acbea4
1 parent 08a9dee
commit 0acbea4
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 37 deletions.
diff --git a/deployment/eks/flyte_generated.yaml b/deployment/eks/flyte_generated.yaml
@@ -8080,14 +8080,12 @@ data:
     storage:
       type: stow
       stow:
-        kind: google
+        kind: s3
         config:
-          json: ""
-          # TODO: replace <project-id> with the GCP project ID
-          project_id: <project-id>
-          scopes: https://www.googleapis.com/auth/devstorage.read_write
-      # TODO replace with the container (bucket) in GCS used by Flyte as intermediate store
-      container: "flyte"
+          auth_type: iam
+          region: us-east-2
+      # TODO replace with the container (bucket) in s3 used by Flyte as intermediate store
+      container: "flyte-demo"
       # NOTE this cache configuration is purely for propeller. But since we are having a common storage
       # config, we are configuring this value. In production create a separate storage config for
       # propeller and increase the cache size
@@ -8098,7 +8096,7 @@ data:
         maxDownloadMBs: 10
 kind: ConfigMap
 metadata:
-  name: datacatalog-config-2bb94tc5b5
+  name: datacatalog-config-fktmhdgfk8
   namespace: flyte
 ---
 apiVersion: v1
@@ -8207,14 +8205,12 @@ data:
     storage:
       type: stow
       stow:
-        kind: google
+        kind: s3
         config:
-          json: ""
-          # TODO: replace <project-id> with the GCP project ID
-          project_id: <project-id>
-          scopes: https://www.googleapis.com/auth/devstorage.read_write
-      # TODO replace with the container (bucket) in GCS used by Flyte as intermediate store
-      container: "flyte"
+          auth_type: iam
+          region: us-east-2
+      # TODO replace with the container (bucket) in s3 used by Flyte as intermediate store
+      container: "flyte-demo"
       # NOTE this cache configuration is purely for propeller. But since we are having a common storage
       # config, we are configuring this value. In production create a separate storage config for
       # propeller and increase the cache size
@@ -8236,7 +8232,7 @@ data:
         gpu: 1
 kind: ConfigMap
 metadata:
-  name: flyte-admin-config-49kdc8f554
+  name: flyte-admin-config-4fd96h5bd6
   namespace: flyte
 ---
 apiVersion: v1
@@ -8380,14 +8376,12 @@ data:
     storage:
       type: stow
       stow:
-        kind: google
+        kind: s3
         config:
-          json: ""
-          # TODO: replace <project-id> with the GCP project ID
-          project_id: <project-id>
-          scopes: https://www.googleapis.com/auth/devstorage.read_write
-      # TODO replace with the container (bucket) in GCS used by Flyte as intermediate store
-      container: "flyte"
+          auth_type: iam
+          region: us-east-2
+      # TODO replace with the container (bucket) in s3 used by Flyte as intermediate store
+      container: "flyte-demo"
       # NOTE this cache configuration is purely for propeller. But since we are having a common storage
       # config, we are configuring this value. In production create a separate storage config for
       # propeller and increase the cache size
@@ -8409,7 +8403,7 @@ data:
         cloudwatch-log-group: <log-group>
 kind: ConfigMap
 metadata:
-  name: flyte-propeller-config-c2hh7hhkh4
+  name: flyte-propeller-config-bk6dmfc8tm
   namespace: flyte
 ---
 apiVersion: v1
@@ -8669,7 +8663,7 @@ spec:
       - emptyDir: {}
         name: shared-data
       - configMap:
-          name: datacatalog-config-2bb94tc5b5
+          name: datacatalog-config-fktmhdgfk8
         name: config-volume
       - name: db-pass
         secret:
@@ -8726,7 +8720,7 @@ spec:
       serviceAccountName: flyte-pod-webhook
       volumes:
       - configMap:
-          name: flyte-propeller-config-c2hh7hhkh4
+          name: flyte-propeller-config-bk6dmfc8tm
         name: config-volume
       - name: webhook-certs
         secret:
@@ -8870,7 +8864,7 @@ spec:
       - emptyDir: {}
         name: shared-data
       - configMap:
-          name: flyte-admin-config-49kdc8f554
+          name: flyte-admin-config-4fd96h5bd6
         name: config-volume
       - configMap:
           name: clusterresource-template-tkdkkt4cb5
@@ -8967,7 +8961,7 @@ spec:
       serviceAccountName: flytepropeller
       volumes:
       - configMap:
-          name: flyte-propeller-config-c2hh7hhkh4
+          name: flyte-propeller-config-bk6dmfc8tm
         name: config-volume
       - name: auth
         secret:
@@ -9158,7 +9152,7 @@ spec:
               name: clusterresource-template-tkdkkt4cb5
             name: resource-templates
           - configMap:
-              name: flyte-admin-config-49kdc8f554
+              name: flyte-admin-config-4fd96h5bd6
             name: config-volume
           - name: db-pass
             secret:
@@ -9201,7 +9195,7 @@ spec:
       serviceAccountName: flyte-pod-webhook
       volumes:
       - configMap:
-          name: flyte-propeller-config-c2hh7hhkh4
+          name: flyte-propeller-config-bk6dmfc8tm
         name: config-volume
   ttlSecondsAfterFinished: 0
 ---

diff --git a/kustomize/overlays/eks/flyte/config/common/storage.yaml b/kustomize/overlays/eks/flyte/config/common/storage.yaml
@@ -1,14 +1,12 @@
 storage:
   type: stow
   stow:
-    kind: google
+    kind: s3
     config:
-      json: ""
-      # TODO: replace <project-id> with the GCP project ID
-      project_id: <project-id>
-      scopes: https://www.googleapis.com/auth/devstorage.read_write
-  # TODO replace with the container (bucket) in GCS used by Flyte as intermediate store
-  container: "flyte"
+      auth_type: iam
+      region: us-east-2
+  # TODO replace with the container (bucket) in s3 used by Flyte as intermediate store
+  container: "flyte-demo"
   # NOTE this cache configuration is purely for propeller. But since we are having a common storage
   # config, we are configuring this value. In production create a separate storage config for
   # propeller and increase the cache size