fix argo configs

e2fyi · Jul 29, 2020 · 3dd6fb1 · 3dd6fb1
1 parent bf2c626
commit 3dd6fb1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/pipelines/base/aws-configurations-patch.yaml b/pipelines/base/aws-configurations-patch.yaml
@@ -5,15 +5,15 @@ metadata:
 data:
   config: |
     {
-    namespace: $(namespace),
+    namespace: $(kfp-namespace),
     artifactRepository:
     {
         archiveLogs: true,
         s3: {
             bucket: $(artifactRepositoryBucket),
             keyPrefix: $(artifactRepositoryKeyPrefix),
             endpoint: s3.amazonaws.com,
-            region: ap-southeast-1
+            region: $(awsRegion),
             insecure: false
         }
     }
@@ -68,6 +68,8 @@ spec:
             # management taking precedence of env vars over config.json
             # currently, minio client will init a static client if access keys and secret
             # are not empty.
+            - $patch: delete
+              name: OBJECTSTORECONFIG_BUCKETNAME
             - $patch: delete
               name: OBJECTSTORECONFIG_ACCESSKEY
             - $patch: delete

diff --git a/pipelines/overlay/accesskey/aws-configurations-patch.yaml b/pipelines/overlay/accesskey/aws-configurations-patch.yaml
@@ -2,18 +2,18 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: workflow-controller-configmap
-  namespace: kubeflow
 data:
   config: |
     {
-    executorImage: $(executorImage),
+    namespace: $(kfp-namespace),
     artifactRepository:
     {
         archiveLogs: true,
         s3: {
             bucket: $(artifactRepositoryBucket),
             keyPrefix: $(artifactRepositoryKeyPrefix),
             endpoint: s3.amazonaws.com,
+            region: $(awsRegion),
             insecure: false,
             accessKeySecret: {
                 name: $(awsSecretName),