Skip to content

Commit 8b4d060

Browse files
michi-covalentmichi-covalent
committed
cilium-cli: Remove go.mod
Remove go.mod from cilium-cli directory, and fix import paths to truly unite cilium-cli with cilium repo. Signed-off-by: Michi Mutsuzaki <[email protected]>
1 parent 521dd80 commit 8b4d060

File tree

9,733 files changed

+2948
-2337278
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

9,733 files changed

+2948
-2337278
lines changed

‎cilium-cli/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ STRIP_DEBUG=-w -s
1212
ifdef DEBUG
1313
STRIP_DEBUG=
1414
endif
15-
GO_BUILD_LDFLAGS ?= $(STRIP_DEBUG) -X 'github.com/cilium/cilium-cli/defaults.CLIVersion=$(VERSION)'
15+
GO_BUILD_LDFLAGS ?= $(STRIP_DEBUG) -X 'github.com/cilium/cilium/cilium-cli/defaults.CLIVersion=$(VERSION)'
1616

1717
TEST_TIMEOUT ?= 5s
1818
RELEASE_UID ?= $(shell id -u)

‎cilium-cli/api/api.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import (
99
"github.com/spf13/cobra"
1010
"github.com/spf13/pflag"
1111

12-
"github.com/cilium/cilium-cli/connectivity"
13-
"github.com/cilium/cilium-cli/connectivity/check"
14-
"github.com/cilium/cilium-cli/k8s"
15-
"github.com/cilium/cilium-cli/sysdump"
12+
"github.com/cilium/cilium/cilium-cli/connectivity"
13+
"github.com/cilium/cilium/cilium-cli/connectivity/check"
14+
"github.com/cilium/cilium/cilium-cli/k8s"
15+
"github.com/cilium/cilium/cilium-cli/sysdump"
1616
)
1717

1818
// key is a context.Context value key type. It's unexported to avoid key collisions.

‎cilium-cli/api/api_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
"github.com/stretchr/testify/assert"
1111

12-
"github.com/cilium/cilium-cli/k8s"
12+
"github.com/cilium/cilium/cilium-cli/k8s"
1313
)
1414

1515
func TestNamespaceContextValues(t *testing.T) {

‎cilium-cli/bgp/bgp.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
corev1 "k8s.io/api/core/v1"
1313
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1414

15-
"github.com/cilium/cilium-cli/k8s"
15+
"github.com/cilium/cilium/cilium-cli/k8s"
1616
)
1717

1818
// Parameters contains options for CLI

‎cilium-cli/bgp/peers.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ import (
1616
"text/tabwriter"
1717
"time"
1818

19-
"github.com/cilium/cilium/api/v1/models"
2019
corev1 "k8s.io/api/core/v1"
2120

22-
"github.com/cilium/cilium-cli/defaults"
23-
"github.com/cilium/cilium-cli/status"
21+
"github.com/cilium/cilium/api/v1/models"
22+
"github.com/cilium/cilium/cilium-cli/defaults"
23+
"github.com/cilium/cilium/cilium-cli/status"
2424
)
2525

2626
const (

‎cilium-cli/bgp/routes.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,10 @@ import (
2222
corev1 "k8s.io/api/core/v1"
2323

2424
"github.com/cilium/cilium/api/v1/models"
25+
"github.com/cilium/cilium/cilium-cli/defaults"
26+
"github.com/cilium/cilium/cilium-cli/status"
2527
"github.com/cilium/cilium/pkg/bgpv1/api"
2628
"github.com/cilium/cilium/pkg/bgpv1/types"
27-
28-
"github.com/cilium/cilium-cli/defaults"
29-
"github.com/cilium/cilium-cli/status"
3029
)
3130

3231
const (

‎cilium-cli/cli/bgp.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99

1010
"github.com/spf13/cobra"
1111

12-
"github.com/cilium/cilium-cli/bgp"
13-
"github.com/cilium/cilium-cli/defaults"
14-
"github.com/cilium/cilium-cli/status"
12+
"github.com/cilium/cilium/cilium-cli/bgp"
13+
"github.com/cilium/cilium/cilium-cli/defaults"
14+
"github.com/cilium/cilium/cilium-cli/status"
1515
)
1616

1717
func newCmdBgp() *cobra.Command {

‎cilium-cli/cli/clustermesh.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import (
1010
"strings"
1111
"time"
1212

13-
k8sConst "github.com/cilium/cilium/pkg/k8s/apis/cilium.io"
1413
"github.com/spf13/cobra"
1514

16-
"github.com/cilium/cilium-cli/clustermesh"
17-
"github.com/cilium/cilium-cli/status"
15+
"github.com/cilium/cilium/cilium-cli/clustermesh"
16+
"github.com/cilium/cilium/cilium-cli/status"
17+
k8sConst "github.com/cilium/cilium/pkg/k8s/apis/cilium.io"
1818
)
1919

2020
func newCmdClusterMesh() *cobra.Command {

‎cilium-cli/cli/cmd.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010

1111
"github.com/spf13/cobra"
1212

13-
"github.com/cilium/cilium-cli/api"
14-
"github.com/cilium/cilium-cli/k8s"
13+
"github.com/cilium/cilium/cilium-cli/api"
14+
"github.com/cilium/cilium/cilium-cli/k8s"
1515
)
1616

1717
var (

‎cilium-cli/cli/cmd_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/spf13/cobra"
1010
"github.com/stretchr/testify/assert"
1111

12-
"github.com/cilium/cilium-cli/api"
12+
"github.com/cilium/cilium/cilium-cli/api"
1313
)
1414

1515
const usage = "override usage"

0 commit comments

Comments
 (0)