gomod: use top level go mod for controller/sidecar

To help with dependency management, shift from using separate go mods
for controller and sidecar, and instead use a top level go mod for these
buildable components. client and proto still have separate go (sub)mods
because they are pulled in by drivers or other operators, and keeping
their dependency lists small is important.

This also allows us to deduplicate the vendor dir that was previously
kept separately for both components.

Signed-off-by: Blaine Gardner <[email protected]>

Author: BlaineEXE

client/config/crd/objectstorage.k8s.io_bucketaccessclasses.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.4
+    controller-gen.kubebuilder.io/version: v0.17.3
   name: bucketaccessclasses.objectstorage.k8s.io
 spec:
   group: objectstorage.k8s.io

client/config/crd/objectstorage.k8s.io_bucketaccesses.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.4
+    controller-gen.kubebuilder.io/version: v0.17.3
   name: bucketaccesses.objectstorage.k8s.io
 spec:
   group: objectstorage.k8s.io

client/config/crd/objectstorage.k8s.io_bucketclaims.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.4
+    controller-gen.kubebuilder.io/version: v0.17.3
   name: bucketclaims.objectstorage.k8s.io
 spec:
   group: objectstorage.k8s.io

client/config/crd/objectstorage.k8s.io_bucketclasses.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.4
+    controller-gen.kubebuilder.io/version: v0.17.3
   name: bucketclasses.objectstorage.k8s.io
 spec:
   group: objectstorage.k8s.io

client/config/crd/objectstorage.k8s.io_buckets.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.4
+    controller-gen.kubebuilder.io/version: v0.17.3
   name: buckets.objectstorage.k8s.io
 spec:
   group: objectstorage.k8s.io

controller/Dockerfile

@@ -12,11 +12,12 @@ WORKDIR /buildroot
 COPY client/ client/
 COPY proto/ proto/
 COPY internal/ internal/
+COPY vendor/ vendor/
 
-COPY controller/go.mod controller/go.mod
-COPY controller/go.sum controller/go.sum
+COPY go.mod go.mod
+COPY go.sum go.sum
 
-RUN cd controller && go mod download
+RUN go mod download
 
 COPY controller/cmd/ controller/cmd/
 COPY controller/pkg/ controller/pkg/