diff --git a/.cloudbuild.yaml b/.cloudbuild.yaml index c54f7f188b3..2d010043f24 100644 --- a/.cloudbuild.yaml +++ b/.cloudbuild.yaml @@ -211,10 +211,10 @@ steps: args: ['pull', 'gcr.io/cloudsql-docker/gce-proxy:1.14'] id: 'pullCloudsqlProxy' - name: 'gcr.io/cloud-builders/docker' - args: ['pull', 'gcr.io/ml-pipeline/argoexec:v2.3.0-license-compliance'] + args: ['pull', 'gcr.io/ml-pipeline/argoexec:v2.7.4-license-compliance'] id: 'pullArgoExecutor' - name: 'gcr.io/cloud-builders/docker' - args: ['pull', 'gcr.io/ml-pipeline/workflow-controller:v2.3.0-license-compliance'] + args: ['pull', 'gcr.io/ml-pipeline/workflow-controller:v2.7.4-license-compliance'] id: 'pullArgoWorkflowController' # Tag for Hosted - SemVersion to Major.Minor parsing diff --git a/.release.cloudbuild.yaml b/.release.cloudbuild.yaml index 7005ffd7d2f..3915a6ec04f 100644 --- a/.release.cloudbuild.yaml +++ b/.release.cloudbuild.yaml @@ -438,14 +438,14 @@ steps: docker push gcr.io/ml-pipeline/google/pipelines-test/cloudsqlproxy:$(cat /workspace/mm.ver) - name: 'gcr.io/cloud-builders/docker' - args: ['pull', 'gcr.io/ml-pipeline/argoexec:v2.3.0-license-compliance'] + args: ['pull', 'gcr.io/ml-pipeline/argoexec:v2.7.4-license-compliance'] id: 'pullArgoExecutor' - name: 'gcr.io/cloud-builders/docker' - args: ['tag', 'gcr.io/ml-pipeline/argoexec:v2.3.0-license-compliance', 'gcr.io/ml-pipeline/google/pipelines/argoexecutor:$TAG_NAME'] + args: ['tag', 'gcr.io/ml-pipeline/argoexec:v2.7.4-license-compliance', 'gcr.io/ml-pipeline/google/pipelines/argoexecutor:$TAG_NAME'] id: 'tagArgoExecutorForMarketplace' waitFor: ['pullArgoExecutor'] - name: 'gcr.io/cloud-builders/docker' - args: ['tag', 'gcr.io/ml-pipeline/argoexec:v2.3.0-license-compliance', 'gcr.io/ml-pipeline/google/pipelines-test/argoexecutor:$TAG_NAME'] + args: ['tag', 'gcr.io/ml-pipeline/argoexec:v2.7.4-license-compliance', 'gcr.io/ml-pipeline/google/pipelines-test/argoexecutor:$TAG_NAME'] id: 'tagArgoExecutorForMarketplaceTest' waitFor: ['pullArgoExecutor'] - id: 'tagArgoExecutorForMarketplaceMajorMinor' @@ -455,20 +455,20 @@ steps: args: - -ceux - | - docker tag gcr.io/ml-pipeline/argoexec:v2.3.0-license-compliance gcr.io/ml-pipeline/google/pipelines/argoexecutor:$(cat /workspace/mm.ver) - docker tag gcr.io/ml-pipeline/argoexec:v2.3.0-license-compliance gcr.io/ml-pipeline/google/pipelines-test/argoexecutor:$(cat /workspace/mm.ver) + docker tag gcr.io/ml-pipeline/argoexec:v2.7.4-license-compliance gcr.io/ml-pipeline/google/pipelines/argoexecutor:$(cat /workspace/mm.ver) + docker tag gcr.io/ml-pipeline/argoexec:v2.7.4-license-compliance gcr.io/ml-pipeline/google/pipelines-test/argoexecutor:$(cat /workspace/mm.ver) docker push gcr.io/ml-pipeline/google/pipelines/argoexecutor:$(cat /workspace/mm.ver) docker push gcr.io/ml-pipeline/google/pipelines-test/argoexecutor:$(cat /workspace/mm.ver) - name: 'gcr.io/cloud-builders/docker' - args: ['pull', 'gcr.io/ml-pipeline/workflow-controller:v2.3.0-license-compliance'] + args: ['pull', 'gcr.io/ml-pipeline/workflow-controller:v2.7.4-license-compliance'] id: 'pullArgoWorkflowController' - name: 'gcr.io/cloud-builders/docker' - args: ['tag', 'gcr.io/ml-pipeline/workflow-controller:v2.3.0-license-compliance', 'gcr.io/ml-pipeline/google/pipelines/argoworkflowcontroller:$TAG_NAME'] + args: ['tag', 'gcr.io/ml-pipeline/workflow-controller:v2.7.4-license-compliance', 'gcr.io/ml-pipeline/google/pipelines/argoworkflowcontroller:$TAG_NAME'] id: 'tagArgoWorkflowControllerForMarketplace' waitFor: ['pullArgoWorkflowController'] - name: 'gcr.io/cloud-builders/docker' - args: ['tag', 'gcr.io/ml-pipeline/workflow-controller:v2.3.0-license-compliance', 'gcr.io/ml-pipeline/google/pipelines-test/argoworkflowcontroller:$TAG_NAME'] + args: ['tag', 'gcr.io/ml-pipeline/workflow-controller:v2.7.4-license-compliance', 'gcr.io/ml-pipeline/google/pipelines-test/argoworkflowcontroller:$TAG_NAME'] id: 'tagArgoWorkflowControllerForMarketplaceTest' waitFor: ['pullArgoWorkflowController'] - id: 'tagArgoWorkflowControllerForMarketplaceMajorMinor' @@ -478,8 +478,8 @@ steps: args: - -ceux - | - docker tag gcr.io/ml-pipeline/workflow-controller:v2.3.0-license-compliance gcr.io/ml-pipeline/google/pipelines/argoworkflowcontroller:$(cat /workspace/mm.ver) - docker tag gcr.io/ml-pipeline/workflow-controller:v2.3.0-license-compliance gcr.io/ml-pipeline/google/pipelines-test/argoworkflowcontroller:$(cat /workspace/mm.ver) + docker tag gcr.io/ml-pipeline/workflow-controller:v2.7.4-license-compliance gcr.io/ml-pipeline/google/pipelines/argoworkflowcontroller:$(cat /workspace/mm.ver) + docker tag gcr.io/ml-pipeline/workflow-controller:v2.7.4-license-compliance gcr.io/ml-pipeline/google/pipelines-test/argoworkflowcontroller:$(cat /workspace/mm.ver) docker push gcr.io/ml-pipeline/google/pipelines/argoworkflowcontroller:$(cat /workspace/mm.ver) docker push gcr.io/ml-pipeline/google/pipelines-test/argoworkflowcontroller:$(cat /workspace/mm.ver) diff --git a/backend/Dockerfile b/backend/Dockerfile index cb2a3103249..ce84a4f5bfd 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -32,7 +32,7 @@ COPY backend/requirements.txt . RUN python3 -m pip install -r requirements.txt # Downloading Argo CLI so that the samples are validated -ADD https://github.com/argoproj/argo/releases/download/v2.3.0/argo-linux-amd64 /usr/local/bin/argo +ADD https://github.com/argoproj/argo/releases/download/v2.7.4/argo-linux-amd64 /usr/local/bin/argo RUN chmod +x /usr/local/bin/argo WORKDIR /go/src/github.com/kubeflow/pipelines diff --git a/manifests/kustomize/base/argo/workflow-controller-configmap.yaml b/manifests/kustomize/base/argo/workflow-controller-configmap.yaml index b40faf8a969..9353520a7ec 100644 --- a/manifests/kustomize/base/argo/workflow-controller-configmap.yaml +++ b/manifests/kustomize/base/argo/workflow-controller-configmap.yaml @@ -6,7 +6,7 @@ data: config: | { namespace: $(NAMESPACE), - executorImage: gcr.io/ml-pipeline/argoexec:v2.3.0-license-compliance, + executorImage: gcr.io/ml-pipeline/argoexec:v2.7.4-license-compliance, artifactRepository: { s3: { diff --git a/manifests/kustomize/base/argo/workflow-controller-deployment.yaml b/manifests/kustomize/base/argo/workflow-controller-deployment.yaml index 53042be577d..65de6c38b82 100644 --- a/manifests/kustomize/base/argo/workflow-controller-deployment.yaml +++ b/manifests/kustomize/base/argo/workflow-controller-deployment.yaml @@ -27,7 +27,7 @@ spec: - --configmap - workflow-controller-configmap - --executor-image - - gcr.io/ml-pipeline/argoexec:v2.3.0-license-compliance + - gcr.io/ml-pipeline/argoexec:v2.7.4-license-compliance command: - workflow-controller env: @@ -36,7 +36,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: gcr.io/ml-pipeline/workflow-controller:v2.3.0-license-compliance + image: gcr.io/ml-pipeline/workflow-controller:v2.7.4-license-compliance imagePullPolicy: IfNotPresent name: workflow-controller resources: {} diff --git a/test/install-argo.sh b/test/install-argo.sh index 7b953012434..aedee241b4a 100755 --- a/test/install-argo.sh +++ b/test/install-argo.sh @@ -25,7 +25,7 @@ ACCOUNT=$(gcloud info --format='value(config.account)') kubectl create clusterrolebinding PROW_BINDING --clusterrole=cluster-admin --user=$ACCOUNT --dry-run -o yaml | kubectl apply -f - kubectl create clusterrolebinding DEFAULT_BINDING --clusterrole=cluster-admin --serviceaccount=default:default --dry-run -o yaml | kubectl apply -f - -ARGO_VERSION=v2.3.0 +ARGO_VERSION=v2.7.4 # if argo is not installed if ! which argo; then diff --git a/test/sample-test/Dockerfile b/test/sample-test/Dockerfile index a0b1177e50f..68fc5a8297e 100644 --- a/test/sample-test/Dockerfile +++ b/test/sample-test/Dockerfile @@ -22,7 +22,7 @@ RUN cd /python/src/github.com/kubeflow/pipelines # Install argo. RUN echo "install argo" RUN mkdir -p /usr/local/bin/ -RUN ARGO_VERSION=v2.3.0 && curl -sSL -o /usr/local/bin/argo \ +RUN ARGO_VERSION=v2.7.4 && curl -sSL -o /usr/local/bin/argo \ "https://github.com/argoproj/argo/releases/download/$ARGO_VERSION/argo-linux-amd64" && \ chmod +x /usr/local/bin/argo ENV PATH $PATH:/usr/local/bin/argo diff --git a/test/tag_for_hosted.sh b/test/tag_for_hosted.sh index 5dd569c19ee..1e2af0582ab 100755 --- a/test/tag_for_hosted.sh +++ b/test/tag_for_hosted.sh @@ -112,12 +112,12 @@ docker tag gcr.io/cloudsql-docker/gce-proxy:1.14 gcr.io/$PROJECT_ID/hosted/$COMM docker push gcr.io/$PROJECT_ID/hosted/$COMMIT_SHA/cloudsqlproxy:$SEM_VER docker push gcr.io/$PROJECT_ID/hosted/$COMMIT_SHA/cloudsqlproxy:$MM_VER -docker tag gcr.io/ml-pipeline/argoexec:v2.3.0-license-compliance gcr.io/$PROJECT_ID/hosted/$COMMIT_SHA/argoexecutor:$SEM_VER -docker tag gcr.io/ml-pipeline/argoexec:v2.3.0-license-compliance gcr.io/$PROJECT_ID/hosted/$COMMIT_SHA/argoexecutor:$MM_VER +docker tag gcr.io/ml-pipeline/argoexec:v2.7.4-license-compliance gcr.io/$PROJECT_ID/hosted/$COMMIT_SHA/argoexecutor:$SEM_VER +docker tag gcr.io/ml-pipeline/argoexec:v2.7.4-license-compliance gcr.io/$PROJECT_ID/hosted/$COMMIT_SHA/argoexecutor:$MM_VER docker push gcr.io/$PROJECT_ID/hosted/$COMMIT_SHA/argoexecutor:$SEM_VER docker push gcr.io/$PROJECT_ID/hosted/$COMMIT_SHA/argoexecutor:$MM_VER -docker tag gcr.io/ml-pipeline/workflow-controller:v2.3.0-license-compliance gcr.io/$PROJECT_ID/hosted/$COMMIT_SHA/argoworkflowcontroller:$SEM_VER -docker tag gcr.io/ml-pipeline/workflow-controller:v2.3.0-license-compliance gcr.io/$PROJECT_ID/hosted/$COMMIT_SHA/argoworkflowcontroller:$MM_VER +docker tag gcr.io/ml-pipeline/workflow-controller:v2.7.4-license-compliance gcr.io/$PROJECT_ID/hosted/$COMMIT_SHA/argoworkflowcontroller:$SEM_VER +docker tag gcr.io/ml-pipeline/workflow-controller:v2.7.4-license-compliance gcr.io/$PROJECT_ID/hosted/$COMMIT_SHA/argoworkflowcontroller:$MM_VER docker push gcr.io/$PROJECT_ID/hosted/$COMMIT_SHA/argoworkflowcontroller:$SEM_VER docker push gcr.io/$PROJECT_ID/hosted/$COMMIT_SHA/argoworkflowcontroller:$MM_VER diff --git a/third_party/argo/Dockerfile.argoexec b/third_party/argo/Dockerfile.argoexec index d40210c8811..196d2658d60 100644 --- a/third_party/argo/Dockerfile.argoexec +++ b/third_party/argo/Dockerfile.argoexec @@ -23,7 +23,7 @@ RUN sh /third_party/download_source.sh