argo s3 artifact repository configuration added (kubeflow#2238)

StatCan · Jan 8, 2019 · 5f5426a · 5f5426a
1 parent 51a3a81
commit 5f5426a
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 1 deletion.
diff --git a/kubeflow/argo/argo.libsonnet b/kubeflow/argo/argo.libsonnet
@@ -229,7 +229,39 @@
     local workflowControllerConfigmap = {
       apiVersion: "v1",
       data: {
-        config: @"executorImage: " + params.executorImage,
+        config: std.format(|||
+                             {
+                             executorImage: %s,
+                             artifactRepository:
+                             {
+                                 s3: {
+                                     bucket: %s,
+                                     keyPrefix: %s,
+                                     endpoint: %s,
+                                     insecure: %s,
+                                     accessKeySecret: {
+                                         name: %s,
+                                         key: %s
+                                     },
+                                     secretKeySecret: {
+                                         name: %s,
+                                         key: %s
+                                     }
+                                 }
+                             }
+                             }
+                           |||,
+                           [
+                             params.executorImage,
+                             params.artifactRepositoryBucket,
+                             params.artifactRepositoryKeyPrefix,
+                             params.artifactRepositoryEndpoint,
+                             params.artifactRepositoryInsecure,
+                             params.artifactRepositoryAccessKeySecretName,
+                             params.artifactRepositoryAccessKeySecretKey,
+                             params.artifactRepositorySecretKeySecretName,
+                             params.artifactRepositorySecretKeySecretKey,
+                           ]),
       },
       kind: "ConfigMap",
       metadata: {

diff --git a/kubeflow/argo/prototypes/argo.jsonnet b/kubeflow/argo/prototypes/argo.jsonnet
@@ -6,6 +6,14 @@
 // @optionalParam workflowControllerImage string argoproj/workflow-controller:v2.2.0 workflowControllerImage
 // @optionalParam uiImage string argoproj/argoui:v2.2.0 uiImage
 // @optionalParam executorImage string argoproj/argoexec:v2.2.0 executorImage
+// @optionalParam artifactRepositoryKeyPrefix string artifacts artifactRepositoryKeyPrefix
+// @optionalParam artifactRepositoryEndpoint string minio-service.kubeflow:9000 artifactRepositoryEndpoint
+// @optionalParam artifactRepositoryBucket string mlpipeline artifactRepositoryBucket
+// @optionalParam artifactRepositoryInsecure string true artifactRepositoryInsecure
+// @optionalParam artifactRepositoryAccessKeySecretName string mlpipeline-minio-artifact artifactRepositoryAccessKeySecretName
+// @optionalParam artifactRepositoryAccessKeySecretKey string accesskey artifactRepositoryAccessKeySecretKey
+// @optionalParam artifactRepositorySecretKeySecretName string mlpipeline-minio-artifact artifactRepositorySecretKeySecretName
+// @optionalParam artifactRepositorySecretKeySecretKey string secretkey artifactRepositorySecretKeySecretKey
 
 local argo = import "kubeflow/argo/argo.libsonnet";
 local instance = argo.new(env, params);