Skip to content

gomod: use top level go mod for controller/sidecar #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 24, 2025
+31,970 −2,559,877
Merged

gomod: use top level go mod for controller/sidecar #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion client/config/crd/objectstorage.k8s.io_bucketaccessclasses.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change isn't ideal, but it seems to be because of #39

Dependabot updated the lib, but it doesn't know how to run make generate, so this didn't appear until my PR here. We might want to follow up with dependabot config to handle controller-gen differently in the future

name: bucketaccessclasses.objectstorage.k8s.io
spec:
group: objectstorage.k8s.io
Expand Down
2 changes: 1 addition & 1 deletion client/config/crd/objectstorage.k8s.io_bucketaccesses.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion client/config/crd/objectstorage.k8s.io_bucketclaims.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion client/config/crd/objectstorage.k8s.io_bucketclasses.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion client/config/crd/objectstorage.k8s.io_buckets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions controller/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
78 changes: 0 additions & 78 deletions controller/go.mod
View file
Open in desktop

This file was deleted.

Loading