Skip to content

Commit f73677d

Browse files
authored
Merge pull request #49 from BlaineEXE/gomod-use-top-level-gomod-for-controller-and-sidecar
gomod: use top level go mod for controller/sidecar
2 parents fed4e52 + 19e639b commit f73677d

File tree

12,775 files changed

+31970
-2559877
lines changed

Some content is hidden

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

12,775 files changed

+31970
-2559877
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.4
6+
controller-gen.kubebuilder.io/version: v0.17.3
77
name: bucketaccessclasses.objectstorage.k8s.io
88
spec:
99
group: objectstorage.k8s.io

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.4
6+
controller-gen.kubebuilder.io/version: v0.17.3
77
name: bucketaccesses.objectstorage.k8s.io
88
spec:
99
group: objectstorage.k8s.io

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.4
6+
controller-gen.kubebuilder.io/version: v0.17.3
77
name: bucketclaims.objectstorage.k8s.io
88
spec:
99
group: objectstorage.k8s.io

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.4
6+
controller-gen.kubebuilder.io/version: v0.17.3
77
name: bucketclasses.objectstorage.k8s.io
88
spec:
99
group: objectstorage.k8s.io

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.4
6+
controller-gen.kubebuilder.io/version: v0.17.3
77
name: buckets.objectstorage.k8s.io
88
spec:
99
group: objectstorage.k8s.io

controller/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ WORKDIR /buildroot
1212
COPY client/ client/
1313
COPY proto/ proto/
1414
COPY internal/ internal/
15+
COPY vendor/ vendor/
1516

16-
COPY controller/go.mod controller/go.mod
17-
COPY controller/go.sum controller/go.sum
17+
COPY go.mod go.mod
18+
COPY go.sum go.sum
1819

19-
RUN cd controller && go mod download
20+
RUN go mod download
2021

2122
COPY controller/cmd/ controller/cmd/
2223
COPY controller/pkg/ controller/pkg/

controller/go.mod

Lines changed: 0 additions & 78 deletions
This file was deleted.

0 commit comments

Comments
 (0)