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.

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

chore: Set Go mod to /v2 #4916

Merged
merged 10 commits into from
Jan 27, 2021
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@ endif
ALWAYS_OFFLOAD_NODE_STATUS := false

override LDFLAGS += \
-X github.com/argoproj/argo.version=$(VERSION) \
-X github.com/argoproj/argo.buildDate=${BUILD_DATE} \
-X github.com/argoproj/argo.gitCommit=${GIT_COMMIT} \
-X github.com/argoproj/argo.gitTreeState=${GIT_TREE_STATE}
-X github.com/argoproj/argo/v2.version=$(VERSION) \
-X github.com/argoproj/argo/v2.buildDate=${BUILD_DATE} \
-X github.com/argoproj/argo/v2.gitCommit=${GIT_COMMIT} \
-X github.com/argoproj/argo/v2.gitTreeState=${GIT_TREE_STATE}

ifeq ($(STATIC_BUILD), true)
override LDFLAGS += -extldflags "-static"
Expand All @@ -96,9 +96,9 @@ ifneq ($(GIT_TAG),)
override LDFLAGS += -X github.com/argoproj/argo.gitTag=${GIT_TAG}
endif

ARGOEXEC_PKGS := $(shell echo cmd/argoexec && go list -f '{{ join .Deps "\n" }}' ./cmd/argoexec/ | grep 'argoproj/argo/' | cut -c 26-)
CLI_PKGS := $(shell echo cmd/argo && go list -f '{{ join .Deps "\n" }}' ./cmd/argo/ | grep 'argoproj/argo/' | cut -c 26-)
CONTROLLER_PKGS := $(shell echo cmd/workflow-controller && go list -f '{{ join .Deps "\n" }}' ./cmd/workflow-controller/ | grep 'argoproj/argo/' | cut -c 26-)
ARGOEXEC_PKGS := $(shell echo cmd/argoexec && go list -f '{{ join .Deps "\n" }}' ./cmd/argoexec/ | grep 'argoproj/argo/' | cut -c 29-)
CLI_PKGS := $(shell echo cmd/argo && go list -f '{{ join .Deps "\n" }}' ./cmd/argo/ | grep 'argoproj/argo/' | cut -c 29-)
CONTROLLER_PKGS := $(shell echo cmd/workflow-controller && go list -f '{{ join .Deps "\n" }}' ./cmd/workflow-controller/ | grep 'argoproj/argo/' | cut -c 29-)
MANIFESTS := $(shell find manifests -mindepth 2 -type f)
E2E_MANIFESTS := $(shell find test/e2e/manifests -mindepth 2 -type f)
E2E_EXECUTOR ?= pns
Expand Down Expand Up @@ -604,4 +604,4 @@ check-version-warning:

.PHONY: parse-examples
parse-examples:
go run -tags fields ./hack parseexamples
go run -tags fields ./hack parseexamples
4 changes: 2 additions & 2 deletions cmd/argo/commands/archive/delete.go
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/v2/cmd/argo/commands/client"
workflowarchivepkg "github.com/argoproj/argo/v2/pkg/apiclient/workflowarchive"
)

func NewDeleteCommand() *cobra.Command {
Expand Down
4 changes: 2 additions & 2 deletions cmd/argo/commands/archive/get.go
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/v2/cmd/argo/commands/client"
workflowarchivepkg "github.com/argoproj/argo/v2/pkg/apiclient/workflowarchive"
)

func NewGetCommand() *cobra.Command {
Expand Down
8 changes: 4 additions & 4 deletions cmd/argo/commands/archive/list.go
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/v2/cmd/argo/commands/client"
workflowarchivepkg "github.com/argoproj/argo/v2/pkg/apiclient/workflowarchive"
wfv1 "github.com/argoproj/argo/v2/pkg/apis/workflow/v1alpha1"
"github.com/argoproj/argo/v2/util/printer"
)

func NewListCommand() *cobra.Command {
Expand Down
2 changes: 1 addition & 1 deletion cmd/argo/commands/auth/token.go
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/v2/cmd/argo/commands/client"
)

func NewTokenCommand() *cobra.Command {
Expand Down
4 changes: 2 additions & 2 deletions cmd/argo/commands/client/conn.go
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/v2/pkg/apiclient"
"github.com/argoproj/argo/v2/util/kubeconfig"
)

var argoServerOpts = apiclient.ArgoServerOpts{}
Expand Down
10 changes: 5 additions & 5 deletions cmd/argo/commands/clustertemplate/create.go
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/v2/cmd/argo/commands/client"
"github.com/argoproj/argo/v2/pkg/apiclient/clusterworkflowtemplate"
wfv1 "github.com/argoproj/argo/v2/pkg/apis/workflow/v1alpha1"
"github.com/argoproj/argo/v2/workflow/common"
"github.com/argoproj/argo/v2/workflow/util"
)

type cliCreateOpts struct {
Expand Down
4 changes: 2 additions & 2 deletions cmd/argo/commands/clustertemplate/delete.go
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/v2/cmd/argo/commands/client"
"github.com/argoproj/argo/v2/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
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/v2/cmd/argo/commands/client"
clusterworkflowtmplpkg "github.com/argoproj/argo/v2/pkg/apiclient/clusterworkflowtemplate"
wfv1 "github.com/argoproj/argo/v2/pkg/apis/workflow/v1alpha1"
)

func NewGetCommand() *cobra.Command {
Expand Down
6 changes: 3 additions & 3 deletions cmd/argo/commands/clustertemplate/lint.go
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/v2/cmd/argo/commands/client"
"github.com/argoproj/argo/v2/pkg/apiclient/clusterworkflowtemplate"
"github.com/argoproj/argo/v2/workflow/validate"
)

func NewLintCommand() *cobra.Command {
Expand Down
6 changes: 3 additions & 3 deletions cmd/argo/commands/clustertemplate/list.go
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/v2/cmd/argo/commands/client"
"github.com/argoproj/argo/v2/pkg/apiclient/clusterworkflowtemplate"
wfv1 "github.com/argoproj/argo/v2/pkg/apis/workflow/v1alpha1"
)

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

log "github.com/sirupsen/logrus"

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

// Global variables
Expand Down
10 changes: 5 additions & 5 deletions cmd/argo/commands/cron/create.go
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/v2/cmd/argo/commands/client"
cronworkflowpkg "github.com/argoproj/argo/v2/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/v2/pkg/apis/workflow/v1alpha1"
"github.com/argoproj/argo/v2/workflow/common"
"github.com/argoproj/argo/v2/workflow/util"
)

type cliCreateOpts struct {
Expand Down
4 changes: 2 additions & 2 deletions cmd/argo/commands/cron/delete.go
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/v2/cmd/argo/commands/client"
cronworkflowpkg "github.com/argoproj/argo/v2/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
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/v2/cmd/argo/commands/client"
"github.com/argoproj/argo/v2/pkg/apiclient/cronworkflow"
wfv1 "github.com/argoproj/argo/v2/pkg/apis/workflow/v1alpha1"
)

func NewGetCommand() *cobra.Command {
Expand Down
2 changes: 1 addition & 1 deletion cmd/argo/commands/cron/get_test.go
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/v2/pkg/apis/workflow/v1alpha1"
)

var invalidCwf = `
Expand Down
6 changes: 3 additions & 3 deletions cmd/argo/commands/cron/lint.go
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/v2/cmd/argo/commands/client"
cronworkflowpkg "github.com/argoproj/argo/v2/pkg/apiclient/cronworkflow"
"github.com/argoproj/argo/v2/workflow/validate"
)

func NewLintCommand() *cobra.Command {
Expand Down
6 changes: 3 additions & 3 deletions cmd/argo/commands/cron/list.go
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/v2/cmd/argo/commands/client"
cronworkflowpkg "github.com/argoproj/argo/v2/pkg/apiclient/cronworkflow"
wfv1 "github.com/argoproj/argo/v2/pkg/apis/workflow/v1alpha1"
)

type listFlags struct {
Expand Down
4 changes: 2 additions & 2 deletions cmd/argo/commands/cron/resume.go
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/v2/cmd/argo/commands/client"
cronworkflowpkg "github.com/argoproj/argo/v2/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
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/v2/cmd/argo/commands/client"
cronworkflowpkg "github.com/argoproj/argo/v2/pkg/apiclient/cronworkflow"
)

// NewSuspendCommand returns a new instance of an `argo suspend` command
Expand Down
2 changes: 1 addition & 1 deletion cmd/argo/commands/cron/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/robfig/cron/v3"

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

// GetNextRuntime returns the next time the workflow should run in local time. It assumes the workflow-controller is in
Expand Down
6 changes: 3 additions & 3 deletions cmd/argo/commands/delete.go
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/v2/cmd/argo/commands/client"
workflowpkg "github.com/argoproj/argo/v2/pkg/apiclient/workflow"
wfv1 "github.com/argoproj/argo/v2/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
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/v2/cmd/argo/commands/client"
workflowpkg "github.com/argoproj/argo/v2/pkg/apiclient/workflow"
wfv1 "github.com/argoproj/argo/v2/pkg/apis/workflow/v1alpha1"
argoutil "github.com/argoproj/argo/v2/util"
"github.com/argoproj/argo/v2/util/printer"
"github.com/argoproj/argo/v2/workflow/util"
)

const onExitSuffix = "onExit"
Expand Down
4 changes: 2 additions & 2 deletions cmd/argo/commands/get_test.go
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/v2/pkg/apis/workflow/v1alpha1"
testutil "github.com/argoproj/argo/v2/test/util"
)

func testPrintNodeImpl(t *testing.T, expected string, node wfv1.NodeStatus, nodePrefix string, getArgs getFlags) {
Expand Down
6 changes: 3 additions & 3 deletions cmd/argo/commands/lint.go
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/v2/cmd/argo/commands/client"
workflowpkg "github.com/argoproj/argo/v2/pkg/apiclient/workflow"
"github.com/argoproj/argo/v2/workflow/validate"
)

func NewLintCommand() *cobra.Command {
Expand Down
10 changes: 5 additions & 5 deletions cmd/argo/commands/list.go
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/v2/cmd/argo/commands/client"
workflowpkg "github.com/argoproj/argo/v2/pkg/apiclient/workflow"
wfv1 "github.com/argoproj/argo/v2/pkg/apis/workflow/v1alpha1"
"github.com/argoproj/argo/v2/util/printer"
"github.com/argoproj/argo/v2/workflow/common"
)

type listFlags struct {
Expand Down
8 changes: 4 additions & 4 deletions cmd/argo/commands/list_test.go
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/v2/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/v2/pkg/apiclient/workflow"
workflowmocks "github.com/argoproj/argo/v2/pkg/apiclient/workflow/mocks"
wfv1 "github.com/argoproj/argo/v2/pkg/apis/workflow/v1alpha1"
)

func Test_listWorkflows(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/argo/commands/logs.go
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/v2/cmd/argo/commands/client"
workflowpkg "github.com/argoproj/argo/v2/pkg/apiclient/workflow"
)

func NewLogsCommand() *cobra.Command {
Expand Down
4 changes: 2 additions & 2 deletions cmd/argo/commands/node.go
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/v2/cmd/argo/commands/client"
workflowpkg "github.com/argoproj/argo/v2/pkg/apiclient/workflow"
)

type setOps struct {
Expand Down
Loading