Merge the api module back into the main module

Go dependencies are handled by package, not by module, and per-package splits are handled correctly. Having a separate package makes it easier to track dependencies, but it can cause friction when handling sub-module updates, and it leads to difficulties with go install (see <golang/go#44840>). Signed-off-by: Stephen Kitt <[email protected]>
skitt · Dec 7, 2021 · 5538386 · 5538386
1 parent 555fdb0
commit 5538386
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 417 deletions.
diff --git a/go.mod b/go.mod
@@ -17,7 +17,6 @@ require (
 	github.com/prometheus/client_golang v1.11.0
 	github.com/submariner-io/admiral v0.12.0-m0
 	github.com/submariner-io/shipyard v0.12.0-m0
-	github.com/submariner-io/submariner/pkg/apis v0.0.0-20210816112556-6e4bb78fab88
 	github.com/uw-labs/lichen v0.1.4
 	github.com/vishvananda/netlink v1.1.0
 	golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e // indirect
@@ -50,6 +49,3 @@ replace (
 	// CVE-2020-14040
 	golang.org/x/text => golang.org/x/text v0.3.6
 )
-
-// Modules in this project
-replace github.com/submariner-io/submariner/pkg/apis => ./pkg/apis
diff --git a/pkg/apis/LICENSE b/pkg/apis/LICENSE
diff --git a/pkg/apis/go.mod b/pkg/apis/go.mod