From 5f5426ae3a6c0c3d3d4575f67e9600cfd0916ba0 Mon Sep 17 00:00:00 2001 From: pbrzostowski <5380912+pbrzostowski@users.noreply.github.com> Date: Wed, 9 Jan 2019 00:08:37 +0100 Subject: [PATCH] argo s3 artifact repository configuration added (#2238) --- kubeflow/argo/argo.libsonnet | 34 ++++++++++++++++++++++++++- kubeflow/argo/prototypes/argo.jsonnet | 8 +++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/kubeflow/argo/argo.libsonnet b/kubeflow/argo/argo.libsonnet index f676cc02f83..bc1b6921371 100644 --- 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 index 08fea691775..eea2d10d4ab 100644 --- 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);