Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add dockerSockPath to argo config map #550

Closed
wants to merge 1 commit into from
Closed

add dockerSockPath to argo config map #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions argo/base/config-map.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ data:
{
executorImage: $(executorImage),
containerRuntimeExecutor: $(containerRuntimeExecutor),
dockerSockPath: $(dockerSockPath),
artifactRepository:
{
s3: {
Expand Down
7 changes: 7 additions & 0 deletions argo/base/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,13 @@ vars:
apiVersion: v1
fieldref:
fieldpath: data.containerRuntimeExecutor
- name: dockerSockPath
objref:
kind: ConfigMap
name: workflow-controller-parameters
apiVersion: v1
fieldref:
fieldpath: data.dockerSockPath
- name: artifactRepositoryBucket
objref:
kind: ConfigMap
Expand Down
1 change: 1 addition & 0 deletions argo/base/params.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
namespace=
executorImage=argoproj/argoexec:v2.3.0
containerRuntimeExecutor=docker
dockerSockPath=/var/run/docker.sock
artifactRepositoryBucket=mlpipeline
artifactRepositoryKeyPrefix=artifacts
artifactRepositoryEndpoint=minio-service.kubeflow:9000
Expand Down
9 changes: 9 additions & 0 deletions tests/argo-base_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ data:
{
executorImage: $(executorImage),
containerRuntimeExecutor: $(containerRuntimeExecutor),
dockerSockPath: $(dockerSockPath),
Copy link
Member

@hougangliu hougangliu Oct 24, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for now, Kubeflow installs v2.3.0 argo. does dockerSockPath work for v2.3.0?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hougangliu this just adds one config to the workflow-controller-configmap which is not used in v2.3.0. It does not break argo workflow functionality. I have tested this with a fresh install of kubeflow 0.6.2 and run the sample pipeline successfully.

artifactRepository:
{
s3: {
Expand Down Expand Up @@ -329,6 +330,7 @@ varReference:
namespace=
executorImage=argoproj/argoexec:v2.3.0
containerRuntimeExecutor=docker
dockerSockPath=/var/run/docker.sock
artifactRepositoryBucket=mlpipeline
artifactRepositoryKeyPrefix=artifacts
artifactRepositoryEndpoint=minio-service.kubeflow:9000
Expand Down Expand Up @@ -379,6 +381,13 @@ vars:
apiVersion: v1
fieldref:
fieldpath: data.containerRuntimeExecutor
- name: dockerSockPath
objref:
kind: ConfigMap
name: workflow-controller-parameters
apiVersion: v1
fieldref:
fieldpath: data.dockerSockPath
- name: artifactRepositoryBucket
objref:
kind: ConfigMap
Expand Down
9 changes: 9 additions & 0 deletions tests/argo-overlays-application_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ data:
{
executorImage: $(executorImage),
containerRuntimeExecutor: $(containerRuntimeExecutor),
dockerSockPath: $(dockerSockPath),
artifactRepository:
{
s3: {
Expand Down Expand Up @@ -384,6 +385,7 @@ varReference:
namespace=
executorImage=argoproj/argoexec:v2.3.0
containerRuntimeExecutor=docker
dockerSockPath=/var/run/docker.sock
artifactRepositoryBucket=mlpipeline
artifactRepositoryKeyPrefix=artifacts
artifactRepositoryEndpoint=minio-service.kubeflow:9000
Expand Down Expand Up @@ -434,6 +436,13 @@ vars:
apiVersion: v1
fieldref:
fieldpath: data.containerRuntimeExecutor
- name: dockerSockPath
objref:
kind: ConfigMap
name: workflow-controller-parameters
apiVersion: v1
fieldref:
fieldpath: data.dockerSockPath
- name: artifactRepositoryBucket
objref:
kind: ConfigMap
Expand Down
9 changes: 9 additions & 0 deletions tests/argo-overlays-istio_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ data:
{
executorImage: $(executorImage),
containerRuntimeExecutor: $(containerRuntimeExecutor),
dockerSockPath: $(dockerSockPath),
artifactRepository:
{
s3: {
Expand Down Expand Up @@ -366,6 +367,7 @@ varReference:
namespace=
executorImage=argoproj/argoexec:v2.3.0
containerRuntimeExecutor=docker
dockerSockPath=/var/run/docker.sock
artifactRepositoryBucket=mlpipeline
artifactRepositoryKeyPrefix=artifacts
artifactRepositoryEndpoint=minio-service.kubeflow:9000
Expand Down Expand Up @@ -416,6 +418,13 @@ vars:
apiVersion: v1
fieldref:
fieldpath: data.containerRuntimeExecutor
- name: dockerSockPath
objref:
kind: ConfigMap
name: workflow-controller-parameters
apiVersion: v1
fieldref:
fieldpath: data.dockerSockPath
- name: artifactRepositoryBucket
objref:
kind: ConfigMap
Expand Down