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 <skitt@redhat.com>

.lichen.yaml

@@ -16,10 +16,6 @@ allow:
  - "X11"
  - "Zlib"
 
-override:
- - path: "./pkg/apis"
- licenses: ["Apache-2.0"]
-
 # https://github.com/cncf/foundation/tree/master/license-exceptions
 exceptions:
  licenseNotPermitted:

Makefile

@@ -42,7 +42,7 @@ override CLUSTERS_ARGS += $(CLUSTER_SETTINGS_FLAG)
 override DEPLOY_ARGS += $(CLUSTER_SETTINGS_FLAG)
 
 override E2E_ARGS += cluster2 cluster1
-override UNIT_TEST_ARGS += test pkg/apis
+override UNIT_TEST_ARGS += test
 override VALIDATE_ARGS += --skip-dirs pkg/client
 
 # When cross-building, we need to map Go architectures and operating systems to Docker buildx platforms:

go.mod

@@ -17,7 +17,6 @@ require (
  github.com/prometheus/client_golang v1.11.0
  github.com/submariner-io/admiral v0.12.0-m1
  github.com/submariner-io/shipyard v0.12.0-m1
- 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
@@ -42,6 +41,3 @@ replace (
  k8s.io/client-go => k8s.io/client-go v0.19.10
  k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.10
 )
-
-// Modules in this project
-replace github.com/submariner-io/submariner/pkg/apis => ./pkg/apis

go.sum

@@ -435,7 +435,6 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
 github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0=
 github.com/onsi/gomega v1.17.0 h1:9Luw4uT5HTjHTN8+aNcSThgH1vdXnmdJ8xIfZ4wyTRE=
 github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
 github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=