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

fix(backend): updated the argo version too 2.7.7. Fixes #4392 #4498

Merged
merged 20 commits into from
Oct 23, 2020
Merged

fix(backend): updated the argo version too 2.7.7. Fixes #4392 #4498

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
313bde1
updated the version
Sep 15, 2020
4922b23
updated the serializer
Sep 15, 2020
50ae6b5
fixed test
Sep 15, 2020
a6c30da
fixed some more changes
Sep 15, 2020
9f1adef
tested to update versions of k8 packages
Sep 20, 2020
7481cb4
reverted package update
Sep 20, 2020
3a02f5d
change in API
Sep 20, 2020
7a13a00
fixed dependencies, need to fix broken tests now
Sep 21, 2020
9641f16
updated fake client and fixed test due to updates in timestam.timestamp
Sep 21, 2020
84ef7be
missed to update fake client pod
Sep 21, 2020
c2c7647
fixed issue in controller
Sep 21, 2020
286f688
tested to update
NikeNano Oct 2, 2020
976162a
updated
NikeNano Oct 2, 2020
2bb64b2
updated controller viewer
NikeNano Oct 2, 2020
305b3f8
updates to fix go mod vendor
NikeNano Oct 3, 2020
1a959f8
Updated the client
Oct 7, 2020
3331860
updated the golang versions
NikeNano Oct 13, 2020
d70e1f9
missed one docker file update, from 1.11 -> 1.13
NikeNano Oct 13, 2020
1454bd0
testing to fixe persistinace agent issues
NikeNano Oct 13, 2020
f9ef0d3
Updated after feedback
NikeNano Oct 15, 2020
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
2 changes: 1 addition & 1 deletion backend/src/apiserver/resource/resource_manager_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ func formulateRetryWorkflow(wf *util.Workflow) (*util.Workflow, []string, error)
// Do not allow retry of workflows with pods in Running/Pending phase
return nil, nil, util.NewInternalServerError(
errors.New("workflow cannot be retried"),
"Workflow cannot be retried with node %s in %s phase", node, node.Phase)
"Workflow cannot be retried with node %s in %s phase", node.ID, node.Phase)
}
if node.Type == wfv1.NodeTypePod {
podsToDelete = append(podsToDelete, node.ID)
Expand Down
6 changes: 4 additions & 2 deletions backend/src/apiserver/resource/resource_manager_util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,8 @@ spec:
arguments: {}
entrypoint: rand-fail-dag
templates:
- dag:
- arguments: {}
Copy link
Contributor

Choose a reason for hiding this comment

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

Hmm. I thought this Argo issue was fixed at some point...
Update: Turns out, not fully argoproj/argo-workflows#1686

dag:
tasks:
- arguments: {}
name: A
Expand All @@ -277,7 +278,8 @@ spec:
metadata: {}
name: rand-fail-dag
outputs: {}
- container:
- arguments: {}
container:
args:
- import random; import sys; exit_code = random.choice([0, 0, 1]); print('exiting
with code {}'.format(exit_code)); sys.exit(exit_code)
Expand Down
2 changes: 1 addition & 1 deletion backend/src/common/util/workflow_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ func TestToStringForStore(t *testing.T) {
},
})
assert.Equal(t,
"{\"metadata\":{\"name\":\"WORKFLOW_NAME\",\"creationTimestamp\":null},\"spec\":{\"templates\":null,\"entrypoint\":\"\",\"arguments\":{}},\"status\":{\"startedAt\":null,\"finishedAt\":null}}",
"{\"metadata\":{\"name\":\"WORKFLOW_NAME\",\"creationTimestamp\":null},\"spec\":{\"templates\":null,\"arguments\":{}},\"status\":{\"startedAt\":null,\"finishedAt\":null}}",
workflow.ToStringForStore())
}

Expand Down
3 changes: 1 addition & 2 deletions ...kg/client/clientset/versioned/typed/scheduledworkflow/v1beta1/scheduledworkflow_client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

71 changes: 22 additions & 49 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,92 +1,65 @@
module github.com/kubeflow/pipelines

require (
cloud.google.com/go v0.44.3 // indirect
github.com/Masterminds/squirrel v0.0.0-20190107164353-fa735ea14f09
github.com/VividCortex/mysqlerr v0.0.0-20170204212430-6c6b55f8796f
github.com/argoproj/argo v2.3.0+incompatible
github.com/argoproj/argo v0.0.0-20200506223611-54154c61eb4f
Copy link
Contributor

Choose a reason for hiding this comment

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

Is it possible to use a release version here?

Copy link
Member Author

Choose a reason for hiding this comment

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

Not sure, will check if possible.

Copy link
Member Author

Choose a reason for hiding this comment

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

The answer seems to be no, @Ark-kun argoproj/argo-workflows#2602 (comment)

Copy link
Contributor

Choose a reason for hiding this comment

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

I meant to ask whether it' possible to refer to particular GIT tag like github.com/argoproj/argo v2.7.5...

Copy link
Member Author

Choose a reason for hiding this comment

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

I will try to clean this up after I fixed some of the bugs :)

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't get it to work to specify the version as you mention @Ark-kun, agree that it would be better to have it with version.

github.com/cenkalti/backoff v2.0.0+incompatible
github.com/denisenkom/go-mssqldb v0.0.0-20181014144952-4e0d7dc8888f // indirect
github.com/docker/spdystream v0.0.0-20170912183627-bc6354cbbc29 // indirect
github.com/elazarl/goproxy v0.0.0-20181111060418-2ce16c963a8a // indirect
github.com/emicklei/go-restful v2.8.0+incompatible // indirect
github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 // indirect
github.com/fsnotify/fsnotify v1.4.7
github.com/ghodss/yaml v0.0.0-20180820084758-c7ce16629ff4
github.com/fsnotify/fsnotify v1.4.9
github.com/ghodss/yaml v1.0.0
github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 // indirect
github.com/go-ini/ini v1.38.1 // indirect
github.com/go-logr/logr v0.1.0 // indirect
github.com/go-logr/zapr v0.1.0 // indirect
github.com/go-openapi/analysis v0.17.2 // indirect
github.com/go-openapi/errors v0.17.0
github.com/go-openapi/runtime v0.0.0-20181031204026-aadb2cc7b886
github.com/go-openapi/strfmt v0.17.0
github.com/go-openapi/swag v0.17.0
github.com/go-openapi/swag v0.19.8
github.com/go-openapi/validate v0.17.2
github.com/go-sql-driver/mysql v1.4.0
github.com/gogo/protobuf v1.1.1 // indirect
github.com/go-sql-driver/mysql v1.4.1
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7 // indirect
github.com/golang/protobuf v1.3.2
github.com/golang/protobuf v1.3.5
github.com/google/addlicense v0.0.0-20200422172452-68a83edd47bc // indirect
github.com/google/go-cmp v0.3.1
github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect
github.com/google/uuid v1.0.0
github.com/googleapis/gnostic v0.2.0 // indirect
github.com/google/go-cmp v0.4.0
github.com/google/uuid v1.1.1
github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect
github.com/gorilla/websocket v1.4.0 // indirect
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.6.3
github.com/grpc-ecosystem/grpc-gateway v1.12.1
github.com/hashicorp/golang-lru v0.5.3 // indirect
github.com/imdario/mergo v0.3.5 // indirect
github.com/jinzhu/gorm v1.9.1
github.com/jinzhu/inflection v0.0.0-20180308033659-04140366298a // indirect
github.com/jinzhu/now v0.0.0-20181116074157-8ec929ed50c3 // indirect
github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be // indirect
github.com/jtolds/gls v4.2.1+incompatible // indirect
github.com/kr/pretty v0.1.0 // indirect
github.com/lib/pq v1.0.0 // indirect
github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a // indirect
github.com/mattn/go-sqlite3 v1.9.0
github.com/minio/minio-go v6.0.14+incompatible
github.com/mitchellh/go-homedir v0.0.0-20180523094522-3864e76763d9 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect
github.com/onsi/ginkgo v1.7.0 // indirect
github.com/onsi/gomega v1.4.3 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/peterhellberg/duration v0.0.0-20191119133758-ec6baeebcd10
github.com/pkg/errors v0.8.0
github.com/prometheus/client_golang v0.9.2
github.com/robfig/cron v0.0.0-20180505203441-b41be1df6967
github.com/sirupsen/logrus v1.0.6
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.0.0
github.com/robfig/cron v1.2.0
github.com/sirupsen/logrus v1.4.2
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d // indirect
github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c // indirect
github.com/spf13/viper v1.3.0
github.com/stretchr/testify v1.3.0
github.com/stretchr/testify v1.5.1
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasttemplate v0.0.0-20170224212429-dcecefd839c4 // indirect
go.uber.org/atomic v1.3.2 // indirect
go.uber.org/multierr v1.1.0 // indirect
go.uber.org/zap v1.9.1 // indirect
golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 // indirect
golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297
golang.org/x/net v0.0.0-20200301022130-244492dfa37a
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a // indirect
golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456 // indirect
google.golang.org/api v0.9.0
google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64
google.golang.org/grpc v1.23.0
google.golang.org/api v0.20.0
google.golang.org/genproto v0.0.0-20200317114155-1f3552e48f24
google.golang.org/grpc v1.28.0
gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.39.3 // indirect
gopkg.in/yaml.v2 v2.2.2
k8s.io/api v0.0.0-20180712090710-2d6f90ab1293
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0-20191219150132-17cfeff5d095
k8s.io/apiextensions-apiserver v0.0.0-20190103235604-e7617803aceb // indirect
k8s.io/apimachinery v0.0.0-20180621070125-103fd098999d
k8s.io/client-go v0.0.0-20180718001006-59698c7d9724
k8s.io/kube-openapi v0.0.0-20180719232738-d8ea2fe547a4 // indirect
k8s.io/apimachinery v0.16.7-beta.0
k8s.io/client-go v0.0.0-20191225075139-73fd2ddc9180
k8s.io/kubernetes v1.11.1
sigs.k8s.io/controller-runtime v0.0.0-20181121180216-5558165425ef
sigs.k8s.io/testing_frameworks v0.1.1 // indirect
Expand Down
Loading