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

feat: Update to v3 #4197

Closed
wants to merge 3 commits into from
Closed

feat: Update to v3 #4197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
17780b2
Use /v3
peterbourgon Oct 2, 2020
41837ff
Generated files should be checked in
peterbourgon Oct 2, 2020
dc60cc3
Fix test
peterbourgon Oct 2, 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
4 changes: 2 additions & 2 deletions cmd/argo/commands/archive/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"github.com/argoproj/pkg/errors"
"github.com/spf13/cobra"

client "github.com/argoproj/argo/cmd/argo/commands/client"
workflowarchivepkg "github.com/argoproj/argo/pkg/apiclient/workflowarchive"
client "github.com/argoproj/argo/v3/cmd/argo/commands/client"
workflowarchivepkg "github.com/argoproj/argo/v3/pkg/apiclient/workflowarchive"
)

func NewDeleteCommand() *cobra.Command {
Expand Down
4 changes: 2 additions & 2 deletions cmd/argo/commands/archive/get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/spf13/cobra"
"sigs.k8s.io/yaml"

"github.com/argoproj/argo/cmd/argo/commands/client"
workflowarchivepkg "github.com/argoproj/argo/pkg/apiclient/workflowarchive"
"github.com/argoproj/argo/v3/cmd/argo/commands/client"
workflowarchivepkg "github.com/argoproj/argo/v3/pkg/apiclient/workflowarchive"
)

func NewGetCommand() *cobra.Command {
Expand Down
8 changes: 4 additions & 4 deletions cmd/argo/commands/archive/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"github.com/spf13/cobra"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/argoproj/argo/cmd/argo/commands/client"
workflowarchivepkg "github.com/argoproj/argo/pkg/apiclient/workflowarchive"
wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
"github.com/argoproj/argo/util/printer"
"github.com/argoproj/argo/v3/cmd/argo/commands/client"
workflowarchivepkg "github.com/argoproj/argo/v3/pkg/apiclient/workflowarchive"
wfv1 "github.com/argoproj/argo/v3/pkg/apis/workflow/v1alpha1"
"github.com/argoproj/argo/v3/util/printer"
)

func NewListCommand() *cobra.Command {
Expand Down
2 changes: 1 addition & 1 deletion cmd/argo/commands/auth/token.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/spf13/cobra"

"github.com/argoproj/argo/cmd/argo/commands/client"
"github.com/argoproj/argo/v3/cmd/argo/commands/client"
)

func NewTokenCommand() *cobra.Command {
Expand Down
4 changes: 2 additions & 2 deletions cmd/argo/commands/client/conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/client-go/tools/clientcmd"

"github.com/argoproj/argo/pkg/apiclient"
"github.com/argoproj/argo/util/kubeconfig"
"github.com/argoproj/argo/v3/pkg/apiclient"
"github.com/argoproj/argo/v3/util/kubeconfig"
)

var argoServerOpts = apiclient.ArgoServerOpts{}
Expand Down
10 changes: 5 additions & 5 deletions cmd/argo/commands/clustertemplate/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"github.com/argoproj/pkg/json"
"github.com/spf13/cobra"

"github.com/argoproj/argo/cmd/argo/commands/client"
"github.com/argoproj/argo/pkg/apiclient/clusterworkflowtemplate"
wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
"github.com/argoproj/argo/workflow/common"
"github.com/argoproj/argo/workflow/util"
"github.com/argoproj/argo/v3/cmd/argo/commands/client"
"github.com/argoproj/argo/v3/pkg/apiclient/clusterworkflowtemplate"
wfv1 "github.com/argoproj/argo/v3/pkg/apis/workflow/v1alpha1"
"github.com/argoproj/argo/v3/workflow/common"
"github.com/argoproj/argo/v3/workflow/util"
)

type cliCreateOpts struct {
Expand Down
4 changes: 2 additions & 2 deletions cmd/argo/commands/clustertemplate/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

"github.com/argoproj/pkg/errors"

"github.com/argoproj/argo/cmd/argo/commands/client"
"github.com/argoproj/argo/pkg/apiclient/clusterworkflowtemplate"
"github.com/argoproj/argo/v3/cmd/argo/commands/client"
"github.com/argoproj/argo/v3/pkg/apiclient/clusterworkflowtemplate"
)

// NewDeleteCommand returns a new instance of an `argo delete` command
Expand Down
6 changes: 3 additions & 3 deletions cmd/argo/commands/clustertemplate/get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (

"github.com/argoproj/pkg/humanize"

"github.com/argoproj/argo/cmd/argo/commands/client"
clusterworkflowtmplpkg "github.com/argoproj/argo/pkg/apiclient/clusterworkflowtemplate"
wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
"github.com/argoproj/argo/v3/cmd/argo/commands/client"
clusterworkflowtmplpkg "github.com/argoproj/argo/v3/pkg/apiclient/clusterworkflowtemplate"
wfv1 "github.com/argoproj/argo/v3/pkg/apis/workflow/v1alpha1"
)

func NewGetCommand() *cobra.Command {
Expand Down
6 changes: 3 additions & 3 deletions cmd/argo/commands/clustertemplate/lint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (

"github.com/argoproj/pkg/errors"

"github.com/argoproj/argo/cmd/argo/commands/client"
"github.com/argoproj/argo/pkg/apiclient/clusterworkflowtemplate"
"github.com/argoproj/argo/workflow/validate"
"github.com/argoproj/argo/v3/cmd/argo/commands/client"
"github.com/argoproj/argo/v3/pkg/apiclient/clusterworkflowtemplate"
"github.com/argoproj/argo/v3/workflow/validate"
)

func NewLintCommand() *cobra.Command {
Expand Down
6 changes: 3 additions & 3 deletions cmd/argo/commands/clustertemplate/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (

"github.com/spf13/cobra"

"github.com/argoproj/argo/cmd/argo/commands/client"
"github.com/argoproj/argo/pkg/apiclient/clusterworkflowtemplate"
wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
"github.com/argoproj/argo/v3/cmd/argo/commands/client"
"github.com/argoproj/argo/v3/pkg/apiclient/clusterworkflowtemplate"
wfv1 "github.com/argoproj/argo/v3/pkg/apis/workflow/v1alpha1"
)

type listFlags struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/argo/commands/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/spf13/cobra"

wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
wfv1 "github.com/argoproj/argo/v3/pkg/apis/workflow/v1alpha1"
)

// Global variables
Expand Down
10 changes: 5 additions & 5 deletions cmd/argo/commands/cron/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import (
"github.com/argoproj/pkg/json"
"github.com/spf13/cobra"

"github.com/argoproj/argo/cmd/argo/commands/client"
cronworkflowpkg "github.com/argoproj/argo/pkg/apiclient/cronworkflow"
"github.com/argoproj/argo/v3/cmd/argo/commands/client"
cronworkflowpkg "github.com/argoproj/argo/v3/pkg/apiclient/cronworkflow"

wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
"github.com/argoproj/argo/workflow/common"
"github.com/argoproj/argo/workflow/util"
wfv1 "github.com/argoproj/argo/v3/pkg/apis/workflow/v1alpha1"
"github.com/argoproj/argo/v3/workflow/common"
"github.com/argoproj/argo/v3/workflow/util"
)

type cliCreateOpts struct {
Expand Down
4 changes: 2 additions & 2 deletions cmd/argo/commands/cron/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"github.com/argoproj/pkg/errors"
"github.com/spf13/cobra"

"github.com/argoproj/argo/cmd/argo/commands/client"
cronworkflowpkg "github.com/argoproj/argo/pkg/apiclient/cronworkflow"
"github.com/argoproj/argo/v3/cmd/argo/commands/client"
cronworkflowpkg "github.com/argoproj/argo/v3/pkg/apiclient/cronworkflow"
)

// NewDeleteCommand returns a new instance of an `argo delete` command
Expand Down
6 changes: 3 additions & 3 deletions cmd/argo/commands/cron/get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"github.com/spf13/cobra"
"sigs.k8s.io/yaml"

"github.com/argoproj/argo/cmd/argo/commands/client"
"github.com/argoproj/argo/pkg/apiclient/cronworkflow"
wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
"github.com/argoproj/argo/v3/cmd/argo/commands/client"
"github.com/argoproj/argo/v3/pkg/apiclient/cronworkflow"
wfv1 "github.com/argoproj/argo/v3/pkg/apis/workflow/v1alpha1"
)

func NewGetCommand() *cobra.Command {
Expand Down
4 changes: 2 additions & 2 deletions cmd/argo/commands/cron/get_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/stretchr/testify/assert"
"sigs.k8s.io/yaml"

"github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
"github.com/argoproj/argo/v3/pkg/apis/workflow/v1alpha1"
)

var invalidCwf = `
Expand Down Expand Up @@ -52,7 +52,7 @@ status:
`

var expectedOut = `
Conditions:
Conditions:
✖ SubmissionError Failed to submit Workflow: spec.templates[0].name: 'argosay!3' is invalid: name must consist of alpha-numeric characters or '-', and must start with an alpha-numeric character (e.g. My-name1-2, 123-NAME)`

func TestPrintCronWorkflow(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions cmd/argo/commands/cron/lint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"

"github.com/argoproj/argo/cmd/argo/commands/client"
cronworkflowpkg "github.com/argoproj/argo/pkg/apiclient/cronworkflow"
"github.com/argoproj/argo/workflow/validate"
"github.com/argoproj/argo/v3/cmd/argo/commands/client"
cronworkflowpkg "github.com/argoproj/argo/v3/pkg/apiclient/cronworkflow"
"github.com/argoproj/argo/v3/workflow/validate"
)

func NewLintCommand() *cobra.Command {
Expand Down
6 changes: 3 additions & 3 deletions cmd/argo/commands/cron/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"

"github.com/argoproj/argo/cmd/argo/commands/client"
cronworkflowpkg "github.com/argoproj/argo/pkg/apiclient/cronworkflow"
wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
"github.com/argoproj/argo/v3/cmd/argo/commands/client"
cronworkflowpkg "github.com/argoproj/argo/v3/pkg/apiclient/cronworkflow"
wfv1 "github.com/argoproj/argo/v3/pkg/apis/workflow/v1alpha1"
)

type listFlags struct {
Expand Down
4 changes: 2 additions & 2 deletions cmd/argo/commands/cron/resume.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"github.com/argoproj/pkg/errors"
"github.com/spf13/cobra"

"github.com/argoproj/argo/cmd/argo/commands/client"
cronworkflowpkg "github.com/argoproj/argo/pkg/apiclient/cronworkflow"
"github.com/argoproj/argo/v3/cmd/argo/commands/client"
cronworkflowpkg "github.com/argoproj/argo/v3/pkg/apiclient/cronworkflow"
)

// NewSuspendCommand returns a new instance of an `argo suspend` command
Expand Down
4 changes: 2 additions & 2 deletions cmd/argo/commands/cron/suspend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"github.com/argoproj/pkg/errors"
"github.com/spf13/cobra"

"github.com/argoproj/argo/cmd/argo/commands/client"
cronworkflowpkg "github.com/argoproj/argo/pkg/apiclient/cronworkflow"
"github.com/argoproj/argo/v3/cmd/argo/commands/client"
cronworkflowpkg "github.com/argoproj/argo/v3/pkg/apiclient/cronworkflow"
)

// NewSuspendCommand returns a new instance of an `argo suspend` command
Expand Down
6 changes: 3 additions & 3 deletions cmd/argo/commands/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"google.golang.org/grpc/status"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/argoproj/argo/cmd/argo/commands/client"
workflowpkg "github.com/argoproj/argo/pkg/apiclient/workflow"
wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
"github.com/argoproj/argo/v3/cmd/argo/commands/client"
workflowpkg "github.com/argoproj/argo/v3/pkg/apiclient/workflow"
wfv1 "github.com/argoproj/argo/v3/pkg/apis/workflow/v1alpha1"
)

// NewDeleteCommand returns a new instance of an `argo delete` command
Expand Down
12 changes: 6 additions & 6 deletions cmd/argo/commands/get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ import (
"k8s.io/apimachinery/pkg/fields"
"sigs.k8s.io/yaml"

"github.com/argoproj/argo/cmd/argo/commands/client"
workflowpkg "github.com/argoproj/argo/pkg/apiclient/workflow"
wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
argoutil "github.com/argoproj/argo/util"
"github.com/argoproj/argo/util/printer"
"github.com/argoproj/argo/workflow/util"
"github.com/argoproj/argo/v3/cmd/argo/commands/client"
workflowpkg "github.com/argoproj/argo/v3/pkg/apiclient/workflow"
wfv1 "github.com/argoproj/argo/v3/pkg/apis/workflow/v1alpha1"
argoutil "github.com/argoproj/argo/v3/util"
"github.com/argoproj/argo/v3/util/printer"
"github.com/argoproj/argo/v3/workflow/util"
)

const onExitSuffix = "onExit"
Expand Down
10 changes: 5 additions & 5 deletions cmd/argo/commands/get_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/stretchr/testify/assert"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
testutil "github.com/argoproj/argo/test/util"
wfv1 "github.com/argoproj/argo/v3/pkg/apis/workflow/v1alpha1"
testutil "github.com/argoproj/argo/v3/test/util"
)

func testPrintNodeImpl(t *testing.T, expected string, node wfv1.NodeStatus, nodePrefix string, getArgs getFlags) {
Expand Down Expand Up @@ -353,9 +353,9 @@ status:
startedAt: "2020-06-02T16:04:21Z"
`, &wf)
output := printWorkflowHelper(&wf, getFlags{})
assert.Contains(t, output, `
├- sleep(9:nine) sleep many-items-z26lj-2619926859 19s
├- sleep(10:ten) sleep many-items-z26lj-1052882686 23s
assert.Contains(t, output, `
├- sleep(9:nine) sleep many-items-z26lj-2619926859 19s
├- sleep(10:ten) sleep many-items-z26lj-1052882686 23s
├- sleep(11:eleven) sleep many-items-z26lj-3011405271 22s`)
})
}
6 changes: 3 additions & 3 deletions cmd/argo/commands/lint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"

"github.com/argoproj/argo/cmd/argo/commands/client"
workflowpkg "github.com/argoproj/argo/pkg/apiclient/workflow"
"github.com/argoproj/argo/workflow/validate"
"github.com/argoproj/argo/v3/cmd/argo/commands/client"
workflowpkg "github.com/argoproj/argo/v3/pkg/apiclient/workflow"
"github.com/argoproj/argo/v3/workflow/validate"
)

func NewLintCommand() *cobra.Command {
Expand Down
10 changes: 5 additions & 5 deletions cmd/argo/commands/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ import (
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/selection"

"github.com/argoproj/argo/cmd/argo/commands/client"
workflowpkg "github.com/argoproj/argo/pkg/apiclient/workflow"
wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
"github.com/argoproj/argo/util/printer"
"github.com/argoproj/argo/workflow/common"
"github.com/argoproj/argo/v3/cmd/argo/commands/client"
workflowpkg "github.com/argoproj/argo/v3/pkg/apiclient/workflow"
wfv1 "github.com/argoproj/argo/v3/pkg/apis/workflow/v1alpha1"
"github.com/argoproj/argo/v3/util/printer"
"github.com/argoproj/argo/v3/workflow/common"
)

type listFlags struct {
Expand Down
8 changes: 4 additions & 4 deletions cmd/argo/commands/list_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ import (
"testing"
"time"

"github.com/argoproj/argo/workflow/common"
"github.com/argoproj/argo/v3/workflow/common"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/argoproj/argo/pkg/apiclient/workflow"
workflowmocks "github.com/argoproj/argo/pkg/apiclient/workflow/mocks"
wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
"github.com/argoproj/argo/v3/pkg/apiclient/workflow"
workflowmocks "github.com/argoproj/argo/v3/pkg/apiclient/workflow/mocks"
wfv1 "github.com/argoproj/argo/v3/pkg/apis/workflow/v1alpha1"
)

func Test_listWorkflows(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/argo/commands/logs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"

"github.com/argoproj/argo/cmd/argo/commands/client"
workflowpkg "github.com/argoproj/argo/pkg/apiclient/workflow"
"github.com/argoproj/argo/v3/cmd/argo/commands/client"
workflowpkg "github.com/argoproj/argo/v3/pkg/apiclient/workflow"
)

func NewLogsCommand() *cobra.Command {
Expand Down
4 changes: 2 additions & 2 deletions cmd/argo/commands/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/apimachinery/pkg/fields"

"github.com/argoproj/argo/cmd/argo/commands/client"
workflowpkg "github.com/argoproj/argo/pkg/apiclient/workflow"
"github.com/argoproj/argo/v3/cmd/argo/commands/client"
workflowpkg "github.com/argoproj/argo/v3/pkg/apiclient/workflow"
)

type setOps struct {
Expand Down
4 changes: 2 additions & 2 deletions cmd/argo/commands/resubmit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"github.com/argoproj/pkg/errors"
"github.com/spf13/cobra"

"github.com/argoproj/argo/cmd/argo/commands/client"
workflowpkg "github.com/argoproj/argo/pkg/apiclient/workflow"
"github.com/argoproj/argo/v3/cmd/argo/commands/client"
workflowpkg "github.com/argoproj/argo/v3/pkg/apiclient/workflow"
)

func NewResubmitCommand() *cobra.Command {
Expand Down
4 changes: 2 additions & 2 deletions cmd/argo/commands/resume.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/apimachinery/pkg/fields"

"github.com/argoproj/argo/cmd/argo/commands/client"
workflowpkg "github.com/argoproj/argo/pkg/apiclient/workflow"
"github.com/argoproj/argo/v3/cmd/argo/commands/client"
workflowpkg "github.com/argoproj/argo/v3/pkg/apiclient/workflow"
)

type resumeOps struct {
Expand Down
Loading