Skip to content

Commit 715f2e1

Browse files
gmfrascaaniketpatilaniketpati1121
authored
chore: Upgrade to Argo Workflows v3.7.3 (#12312)
* chore: Update Argo Workflows references to v3.7 Signed-off-by: aniketpatil <[email protected]> * chore: update Argo Workflows to v3.7.0 Signed-off-by: aniketpatil <[email protected]> * chore: update go.mod and go.sum for Argo v3.7 upgrade Signed-off-by: Aniket Patil <[email protected]> * chore: Update backend code to use argo 3.7 library Signed-off-by: Giulio Frasca <[email protected]> * chore: Improve argo upgrade Makefile to update all other refs Signed-off-by: Giulio Frasca <[email protected]> * chore: Update CI to check Argo v3.7.0, keep v3.6.7 as legacy check Signed-off-by: Giulio Frasca <[email protected]> * chore: Update Argo upgrade procedure documentation Signed-off-by: Giulio Frasca <[email protected]> * test: Update backend tests to include runid in workflow metadata Signed-off-by: Giulio Frasca <[email protected]> * chore: Upgrade to Argo v3.7.2 Signed-off-by: Giulio Frasca <[email protected]> * chore: Centralize Argo Upgrade Makefile and documentation Signed-off-by: Giulio Frasca <[email protected]> * chore: Upgrade to Argo Workflows v3.7.3 Signed-off-by: Giulio Frasca <[email protected]> --------- Signed-off-by: aniketpatil <[email protected]> Signed-off-by: Aniket Patil <[email protected]> Signed-off-by: Giulio Frasca <[email protected]> Co-authored-by: aniketpatil <[email protected]> Co-authored-by: Aniket Patil <[email protected]>
1 parent c6ab8c1 commit 715f2e1

File tree

26 files changed

+444
-488
lines changed

26 files changed

+444
-488
lines changed

‎.github/resources/scripts/deploy-kfp.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ fi
9494
if [ -n "${AWF_VERSION}" ]; then
9595
echo "NOTE: Argo version ${AWF_VERSION} specified, updating Argo Workflow manifests..."
9696
echo "${AWF_VERSION}" > third_party/argo/VERSION
97-
make -C ./manifests/kustomize/third-party/argo update
97+
make -C ./third_party/argo update_manifests
9898
echo "Manifests updated for Argo version ${AWF_VERSION}."
9999
fi
100100

‎.github/workflows/api-server-tests.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,16 @@ jobs:
5858
k8s_version: [ "v1.31.0" ]
5959
cache_enabled: [ "true", "false" ]
6060
proxy: [ "true", "false" ]
61-
argo_version: [ "v3.7.1", "v3.6.10" ]
61+
argo_version: [ "v3.7.3", "v3.6.7" ]
6262
pipeline_store: [ "database" ]
6363
pod_to_pod_tls_enabled: [ "false" ]
6464
include:
6565
- k8s_version: "v1.29.2"
6666
cache_enabled: "true"
67-
argo_version: "v3.6.10"
67+
argo_version: "v3.6.7"
6868
- k8s_version: "v1.29.2"
6969
cache_enabled: "true"
70-
argo_version: "v3.5.15"
70+
argo_version: "v3.5.14"
7171
- k8s_version: "v1.31.0"
7272
cache_enabled: "true"
7373
pod_to_pod_tls_enabled: "true"
@@ -162,7 +162,7 @@ jobs:
162162
k8s_version: [ "v1.31.0", "v1.29.2" ]
163163
cache_enabled: [ "true" ]
164164
uploadPipelinesWithKubernetesClient: [ "true", "false" ]
165-
argo_version: [ "v3.7.1", "v3.6.10" ]
165+
argo_version: [ "v3.7.3", "v3.6.7" ]
166166
pipeline_store: [ "kubernetes" ]
167167
pod_to_pod_tls_enabled: [ "false" ]
168168
include:
@@ -274,4 +274,4 @@ jobs:
274274
shell: bash
275275
if: ${{ steps.test-run.outcome == 'success' }}
276276
run: |
277-
echo "::notice title=Test Summary and HTML Report is now available in the Summary Tab"
277+
echo "::notice title=Test Summary and HTML Report is now available in the Summary Tab"

‎.github/workflows/e2e-test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@ jobs:
5656
matrix:
5757
k8s_version: ["v1.31.0"]
5858
cache_enabled: ["true", "false"]
59-
argo_version: [ "v3.7.1", "v3.6.10", "v3.5.15"]
59+
argo_version: [ "v3.7.3", "v3.6.7", "v3.5.14"]
6060
storage: [ "seaweedfs", "minio"]
6161
proxy: [ "false" ]
6262
test_label: [ "E2ECritical" ]
6363
pod_to_pod_tls_enabled: [ "false" ]
6464
include:
6565
- k8s_version: "v1.29.2"
6666
cache_enabled: "false"
67-
argo_version: "v3.5.15"
67+
argo_version: "v3.5.14"
6868
test_label: "E2ECritical"
6969
- k8s_version: "v1.31.0"
7070
cache_enabled: "false"
@@ -264,4 +264,4 @@ jobs:
264264
shell: bash
265265
if: ${{ steps.test-run.outcome == 'success' }}
266266
run: |
267-
echo "::notice title=Test Summary and HTML Report is now available in the Summary Tab"
267+
echo "::notice title=Test Summary and HTML Report is now available in the Summary Tab"

‎backend/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ ARG TARGETARCH
3838
RUN echo "Building for architecture: ${TARGETARCH}"
3939

4040
# Downloading Argo CLI so that the samples are validated
41-
ENV ARGO_VERSION=v3.6.7
41+
ENV ARGO_VERSION=v3.7.3
4242
RUN curl -sLO https://github.com/argoproj/argo-workflows/releases/download/${ARGO_VERSION}/argo-linux-$TARGETARCH.gz && \
4343
gunzip argo-linux-$TARGETARCH.gz && \
4444
chmod +x argo-linux-$TARGETARCH && \

‎backend/src/apiserver/server/run_server_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ func TestCreateRunV1Patch(t *testing.T) {
451451
},
452452
},
453453
PipelineRuntime: &apiv1beta1.PipelineRuntime{
454-
WorkflowManifest: "{\"kind\":\"Workflow\",\"apiVersion\":\"argoproj.io/v1alpha1\",\"metadata\":{\"name\":\"workflow-name\",\"namespace\":\"ns1\",\"uid\":\"workflow2\",\"creationTimestamp\":null,\"labels\":{\"pipeline/runid\":\"123e4567-e89b-12d3-a456-426655440000\"},\"annotations\":{\"pipelines.kubeflow.org/run_name\":\"run1\"}},\"spec\":{\"templates\":[{\"name\":\"testy\",\"inputs\":{},\"outputs\":{},\"metadata\":{\"annotations\":{\"sidecar.istio.io/inject\":\"false\"},\"labels\":{\"pipelines.kubeflow.org/cache_enabled\":\"true\"}},\"container\":{\"name\":\"\",\"image\":\"docker/whalesay\",\"command\":[\"cowsay\"],\"args\":[\"hello world\"],\"resources\":{}}}],\"entrypoint\":\"testy\",\"arguments\":{\"parameters\":[{\"name\":\"param1\",\"value\":\"test-default-bucket\"},{\"name\":\"param2\",\"value\":\"test-project-id\"}]},\"serviceAccountName\":\"pipeline-runner\",\"podMetadata\":{\"labels\":{\"pipeline/runid\":\"123e4567-e89b-12d3-a456-426655440000\"}}},\"status\":{\"startedAt\":null,\"finishedAt\":null}}",
454+
WorkflowManifest: "{\"kind\":\"Workflow\",\"apiVersion\":\"argoproj.io/v1alpha1\",\"metadata\":{\"name\":\"workflow-name\",\"namespace\":\"ns1\",\"uid\":\"workflow2\",\"creationTimestamp\":null,\"labels\":{\"pipeline/runid\":\"123e4567-e89b-12d3-a456-426655440000\"},\"annotations\":{\"pipelines.kubeflow.org/run_name\":\"run1\"}},\"spec\":{\"templates\":[{\"name\":\"testy\",\"inputs\":{},\"outputs\":{},\"metadata\":{\"annotations\":{\"sidecar.istio.io/inject\":\"false\"},\"labels\":{\"pipeline/runid\":\"123e4567-e89b-12d3-a456-426655440000\",\"pipelines.kubeflow.org/cache_enabled\":\"true\"}},\"container\":{\"name\":\"\",\"image\":\"docker/whalesay\",\"command\":[\"cowsay\"],\"args\":[\"hello world\"],\"resources\":{}}}],\"entrypoint\":\"testy\",\"arguments\":{\"parameters\":[{\"name\":\"param1\",\"value\":\"test-default-bucket\"},{\"name\":\"param2\",\"value\":\"test-project-id\"}]},\"serviceAccountName\":\"pipeline-runner\",\"podMetadata\":{\"labels\":{\"pipeline/runid\":\"123e4567-e89b-12d3-a456-426655440000\"}}},\"status\":{\"startedAt\":null,\"finishedAt\":null}}",
455455
},
456456
}
457457

‎backend/src/apiserver/template/argo_template.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ func ValidateWorkflow(template []byte) (*util.Workflow, error) {
217217
if wf.Kind != argoK8sResource {
218218
return nil, util.NewInvalidInputError("Unexpected resource type. Expected: %v. Received: %v", argoK8sResource, wf.Kind)
219219
}
220-
err = validate.ValidateWorkflow(nil, nil, &wf, validate.ValidateOpts{
220+
err = validate.ValidateWorkflow(nil, nil, &wf, nil, validate.ValidateOpts{
221221
Lint: true,
222222
IgnoreEntrypoint: true,
223223
WorkflowTemplateValidation: false, // not used by kubeflow
@@ -231,6 +231,6 @@ func ValidateWorkflow(template []byte) (*util.Workflow, error) {
231231
func AddRuntimeMetadata(wf *workflowapi.Workflow) {
232232
template := wf.Spec.Templates[0]
233233
template.Metadata.Annotations = map[string]string{"sidecar.istio.io/inject": "false"}
234-
template.Metadata.Labels = map[string]string{"pipelines.kubeflow.org/cache_enabled": "true"}
234+
template.Metadata.Labels = map[string]string{util.LabelKeyWorkflowRunId: "123e4567-e89b-12d3-a456-426655440000", "pipelines.kubeflow.org/cache_enabled": "true"}
235235
wf.Spec.Templates[0] = template
236236
}

‎backend/src/common/types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ package common
2121
type ExecutionPhase string
2222

2323
// borrow from Workflow.Status.Phase:
24-
// https://pkg.go.dev/github.com/argoproj/argo-workflows/v3@v3.6.7/pkg/apis/workflow/v1alpha1#WorkflowPhase
24+
// https://pkg.go.dev/github.com/argoproj/argo-workflows/v3@v3.7.3/pkg/apis/workflow/v1alpha1#WorkflowPhase
2525
const (
2626
ExecutionUnknown ExecutionPhase = ""
2727
ExecutionPending ExecutionPhase = "Pending" // pending some set-up - rarely used

‎backend/src/common/util/workflow.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,7 @@ func (w *Workflow) IsV2Compatible() bool {
773773
}
774774

775775
func (w *Workflow) Validate(lint, ignoreEntrypoint bool) error {
776-
err := validate.ValidateWorkflow(nil, nil, w.Workflow, validate.ValidateOpts{
776+
err := validate.ValidateWorkflow(nil, nil, w.Workflow, nil, validate.ValidateOpts{
777777
Lint: lint,
778778
IgnoreEntrypoint: ignoreEntrypoint,
779779
WorkflowTemplateValidation: false, // not used by kubeflow

‎backend/test/compiler/matchers/workflow_matcher.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ func CompareWorkflows(actual *v1alpha1.Workflow, expected *v1alpha1.Workflow) {
103103
gomega.Expect(actual.Spec.Templates[index].SecurityContext).To(gomega.Equal(template.SecurityContext), "SecurityContext is not same")
104104
gomega.Expect(actual.Spec.Templates[index].SchedulerName).To(gomega.Equal(template.SchedulerName), "SchedulerName is not same")
105105
gomega.Expect(actual.Spec.Templates[index].RetryStrategy).To(gomega.Equal(template.RetryStrategy), "RetryStrategy is not same")
106-
gomega.Expect(actual.Spec.Templates[index].Priority).To(gomega.Equal(template.Priority), "Priority is not same")
107106
gomega.Expect(actual.Spec.Templates[index].Parallelism).To(gomega.Equal(template.Parallelism), "Parallelism is not same")
108107
gomega.Expect(actual.Spec.Templates[index].NodeSelector).To(gomega.Equal(template.NodeSelector), "NodeSelector is not same")
109108
gomega.Expect(actual.Spec.Templates[index].Metrics).To(gomega.Equal(template.Metrics), "Metrics is not same")

0 commit comments

Comments
 (0)