Skip to content

Commit

Permalink
chore: Set Go mod to v3 (argoproj#4978)
Browse files Browse the repository at this point in the history
Signed-off-by: Simon Behar <[email protected]>
  • Loading branch information
simster7 committed Feb 2, 2021
1 parent ccd669e commit a730b4f
Show file tree
Hide file tree
Showing 337 changed files with 2,227 additions and 2,227 deletions.
38 changes: 19 additions & 19 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -84,22 +84,22 @@ endif
ALWAYS_OFFLOAD_NODE_STATUS := false

override LDFLAGS += \
-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}
-X github.com/argoproj/argo/v3.version=$(VERSION) \
-X github.com/argoproj/argo/v3.buildDate=${BUILD_DATE} \
-X github.com/argoproj/argo/v3.gitCommit=${GIT_COMMIT} \
-X github.com/argoproj/argo/v3.gitTreeState=${GIT_TREE_STATE}

ifeq ($(STATIC_BUILD), true)
override LDFLAGS += -extldflags "-static"
endif

ifneq ($(GIT_TAG),)
override LDFLAGS += -X github.com/argoproj/argo/v2.gitTag=${GIT_TAG}
override LDFLAGS += -X github.com/argoproj/argo/v3.gitTag=${GIT_TAG}
endif

ARGOEXEC_PKGS := $(shell echo cmd/argoexec && go list -f '{{ join .Deps "\n" }}' ./cmd/argoexec/ | grep 'argoproj/argo/v2/' | cut -c 29-)
CLI_PKGS := $(shell echo cmd/argo && go list -f '{{ join .Deps "\n" }}' ./cmd/argo/ | grep 'argoproj/argo/v2/' | cut -c 29-)
CONTROLLER_PKGS := $(shell echo cmd/workflow-controller && go list -f '{{ join .Deps "\n" }}' ./cmd/workflow-controller/ | grep 'argoproj/argo/v2/' | cut -c 29-)
ARGOEXEC_PKGS := $(shell echo cmd/argoexec && go list -f '{{ join .Deps "\n" }}' ./cmd/argoexec/ | grep 'argoproj/argo/v3/' | cut -c 29-)
CLI_PKGS := $(shell echo cmd/argo && go list -f '{{ join .Deps "\n" }}' ./cmd/argo/ | grep 'argoproj/argo/v3/' | cut -c 29-)
CONTROLLER_PKGS := $(shell echo cmd/workflow-controller && go list -f '{{ join .Deps "\n" }}' ./cmd/workflow-controller/ | grep 'argoproj/argo/v3/' | 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 @@ -139,7 +139,7 @@ define protoc
--grpc-gateway_out=logtostderr=true:${GOPATH}/src \
--swagger_out=logtostderr=true,fqn_for_swagger_name=true:. \
$(1)
perl -i -pe 's|argoproj/argo/|argoproj/argo/v2/|g' `echo "$(1)" | sed 's/proto/pb.go/g'`
perl -i -pe 's|argoproj/argo/|argoproj/argo/v3/|g' `echo "$(1)" | sed 's/proto/pb.go/g'`

endef
# docker_build,image_name,binary_name,marker_file_name
Expand Down Expand Up @@ -326,14 +326,14 @@ $(GOPATH)/bin/goimports:

pkg/apis/workflow/v1alpha1/generated.proto: $(GOPATH)/bin/go-to-protobuf $(PROTO_BINARIES) $(TYPES)
[ -e vendor ] || go mod vendor
[ -e v2 ] || ln -s . v2
[ -e v3 ] || ln -s . v3
${GOPATH}/bin/go-to-protobuf \
--go-header-file=./hack/custom-boilerplate.go.txt \
--packages=github.com/argoproj/argo/v2/pkg/apis/workflow/v1alpha1 \
--packages=github.com/argoproj/argo/v3/pkg/apis/workflow/v1alpha1 \
--apimachinery-packages=+k8s.io/apimachinery/pkg/util/intstr,+k8s.io/apimachinery/pkg/api/resource,k8s.io/apimachinery/pkg/runtime/schema,+k8s.io/apimachinery/pkg/runtime,k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/api/core/v1,k8s.io/api/policy/v1beta1 \
--proto-import ./vendor
touch pkg/apis/workflow/v1alpha1/generated.proto
rm -rf v2
rm -rf v3

# this target will also create a .pb.go and a .pb.gw.go file, but in Make 3 we cannot use _grouped target_, instead we must choose
# on file to represent all of them
Expand Down Expand Up @@ -523,24 +523,24 @@ clean:
# swagger

pkg/apis/workflow/v1alpha1/openapi_generated.go: $(GOPATH)/bin/openapi-gen $(TYPES)
[ -e v2 ] || ln -s . v2
[ -e v3 ] || ln -s . v3
openapi-gen \
--go-header-file ./hack/custom-boilerplate.go.txt \
--input-dirs github.com/argoproj/argo/v2/pkg/apis/workflow/v1alpha1 \
--output-package github.com/argoproj/argo/v2/pkg/apis/workflow/v1alpha1 \
--input-dirs github.com/argoproj/argo/v3/pkg/apis/workflow/v1alpha1 \
--output-package github.com/argoproj/argo/v3/pkg/apis/workflow/v1alpha1 \
--report-filename pkg/apis/api-rules/violation_exceptions.list
rm -rf v2
rm -rf v3


# generates many other files (listers, informers, client etc).
pkg/apis/workflow/v1alpha1/zz_generated.deepcopy.go: $(TYPES)
[ -e v2 ] || ln -s . v2
[ -e v3 ] || ln -s . v3
bash ${GOPATH}/pkg/mod/k8s.io/[email protected]/generate-groups.sh \
"deepcopy,client,informer,lister" \
github.com/argoproj/argo/v2/pkg/client github.com/argoproj/argo/v2/pkg/apis \
github.com/argoproj/argo/v3/pkg/client github.com/argoproj/argo/v3/pkg/apis \
workflow:v1alpha1 \
--go-header-file ./hack/custom-boilerplate.go.txt
rm -rf v2
rm -rf v3

dist/kubernetes.swagger.json:
@mkdir -p dist
Expand Down
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/v2/cmd/argo/commands/client"
workflowarchivepkg "github.com/argoproj/argo/v2/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
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/v2/cmd/argo/commands/client"
workflowarchivepkg "github.com/argoproj/argo/v2/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
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/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"
"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
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/v2/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
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/v2/pkg/apiclient"
"github.com/argoproj/argo/v2/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
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/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"
"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
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/v2/cmd/argo/commands/client"
"github.com/argoproj/argo/v2/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
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/v2/cmd/argo/commands/client"
clusterworkflowtmplpkg "github.com/argoproj/argo/v2/pkg/apiclient/clusterworkflowtemplate"
wfv1 "github.com/argoproj/argo/v2/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
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/v2/cmd/argo/commands/client"
"github.com/argoproj/argo/v2/pkg/apiclient/clusterworkflowtemplate"
"github.com/argoproj/argo/v2/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
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/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/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
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/v2/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
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/v2/cmd/argo/commands/client"
cronworkflowpkg "github.com/argoproj/argo/v2/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/v2/pkg/apis/workflow/v1alpha1"
"github.com/argoproj/argo/v2/workflow/common"
"github.com/argoproj/argo/v2/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
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/v2/cmd/argo/commands/client"
cronworkflowpkg "github.com/argoproj/argo/v2/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
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/v2/cmd/argo/commands/client"
"github.com/argoproj/argo/v2/pkg/apiclient/cronworkflow"
wfv1 "github.com/argoproj/argo/v2/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
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/v2/pkg/apis/workflow/v1alpha1"
"github.com/argoproj/argo/v3/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/v2/cmd/argo/commands/client"
cronworkflowpkg "github.com/argoproj/argo/v2/pkg/apiclient/cronworkflow"
"github.com/argoproj/argo/v2/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
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/v2/cmd/argo/commands/client"
cronworkflowpkg "github.com/argoproj/argo/v2/pkg/apiclient/cronworkflow"
wfv1 "github.com/argoproj/argo/v2/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
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/v2/cmd/argo/commands/client"
cronworkflowpkg "github.com/argoproj/argo/v2/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
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/v2/cmd/argo/commands/client"
cronworkflowpkg "github.com/argoproj/argo/v2/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
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/v2/pkg/apis/workflow/v1alpha1"
"github.com/argoproj/argo/v3/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/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/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
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/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"
"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
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/v2/pkg/apis/workflow/v1alpha1"
testutil "github.com/argoproj/argo/v2/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
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/v2/cmd/argo/commands/client"
workflowpkg "github.com/argoproj/argo/v2/pkg/apiclient/workflow"
"github.com/argoproj/argo/v2/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
Loading

0 comments on commit a730b4f

Please sign in to comment.