Skip to content
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

Jump to bottom

Syncing latest changes from upstream main for kubernetes-csi-addons #193

Merged
merged 4 commits into from
Sep 4, 2024
Merged

Syncing latest changes from upstream main for kubernetes-csi-addons #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6cb1ef7
vendor: Bump sigs.k8s.io/controller-tools
dependabot[bot] Sep 2, 2024
a74feed
template: changes for new kubebuilder
Madhu-1 Sep 3, 2024
67b231c
vendor: Bump the github-dependencies group across 1 directory with 3 …
dependabot[bot] Sep 2, 2024
bd88536
rebase: update go version to 1.22.6
Madhu-1 Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/crd/bases/csiaddons.openshift.io_csiaddonsnodes.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.1
controller-gen.kubebuilder.io/version: v0.16.2
name: csiaddonsnodes.csiaddons.openshift.io
spec:
group: csiaddons.openshift.io
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/csiaddons.openshift.io_encryptionkeyrotationcronjobs.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.1
controller-gen.kubebuilder.io/version: v0.16.2
name: encryptionkeyrotationcronjobs.csiaddons.openshift.io
spec:
group: csiaddons.openshift.io
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/csiaddons.openshift.io_encryptionkeyrotationjobs.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.1
controller-gen.kubebuilder.io/version: v0.16.2
name: encryptionkeyrotationjobs.csiaddons.openshift.io
spec:
group: csiaddons.openshift.io
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/csiaddons.openshift.io_networkfences.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.1
controller-gen.kubebuilder.io/version: v0.16.2
name: networkfences.csiaddons.openshift.io
spec:
group: csiaddons.openshift.io
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/csiaddons.openshift.io_reclaimspacecronjobs.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.1
controller-gen.kubebuilder.io/version: v0.16.2
name: reclaimspacecronjobs.csiaddons.openshift.io
spec:
group: csiaddons.openshift.io
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/csiaddons.openshift.io_reclaimspacejobs.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.1
controller-gen.kubebuilder.io/version: v0.16.2
name: reclaimspacejobs.csiaddons.openshift.io
spec:
group: csiaddons.openshift.io
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/replication.storage.openshift.io_volumegroupreplicationclasses.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.1
controller-gen.kubebuilder.io/version: v0.16.2
name: volumegroupreplicationclasses.replication.storage.openshift.io
spec:
group: replication.storage.openshift.io
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/replication.storage.openshift.io_volumegroupreplicationcontents.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.1
controller-gen.kubebuilder.io/version: v0.16.2
name: volumegroupreplicationcontents.replication.storage.openshift.io
spec:
group: replication.storage.openshift.io
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/replication.storage.openshift.io_volumegroupreplications.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.1
controller-gen.kubebuilder.io/version: v0.16.2
name: volumegroupreplications.replication.storage.openshift.io
spec:
group: replication.storage.openshift.io
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/replication.storage.openshift.io_volumereplicationclasses.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.1
controller-gen.kubebuilder.io/version: v0.16.2
name: volumereplicationclasses.replication.storage.openshift.io
spec:
group: replication.storage.openshift.io
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/replication.storage.openshift.io_volumereplications.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.1
controller-gen.kubebuilder.io/version: v0.16.2
name: volumereplications.replication.storage.openshift.io
spec:
group: replication.storage.openshift.io
Expand Down
35 changes: 10 additions & 25 deletions config/rbac/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,11 @@ kind: ClusterRole
metadata:
name: manager-role
rules:
- apiGroups:
- ""
resources:
- persistentvolumeclaims
verbs:
- get
- list
- update
- watch
- apiGroups:
- ""
resources:
- persistentvolumes
verbs:
- get
- list
- watch
- apiGroups:
- coordination.k8s.io
resources:
- leases
verbs:
- get
- list
- watch
- apiGroups:
- ""
resources:
- namespaces
- persistentvolumes
- pods
verbs:
- get
Expand All @@ -46,13 +22,22 @@ rules:
- get
- list
- patch
- update
- watch
- apiGroups:
- ""
resources:
- persistentvolumeclaims/finalizers
verbs:
- update
- apiGroups:
- coordination.k8s.io
resources:
- leases
verbs:
- get
- list
- watch
- apiGroups:
- csiaddons.openshift.io
resources:
Expand Down
22 changes: 11 additions & 11 deletions deploy/controller/crds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.1
controller-gen.kubebuilder.io/version: v0.16.2
name: csiaddonsnodes.csiaddons.openshift.io
spec:
group: csiaddons.openshift.io
Expand Down Expand Up @@ -127,7 +127,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.1
controller-gen.kubebuilder.io/version: v0.16.2
name: encryptionkeyrotationcronjobs.csiaddons.openshift.io
spec:
group: csiaddons.openshift.io
Expand Down Expand Up @@ -367,7 +367,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.1
controller-gen.kubebuilder.io/version: v0.16.2
name: encryptionkeyrotationjobs.csiaddons.openshift.io
spec:
group: csiaddons.openshift.io
Expand Down Expand Up @@ -554,7 +554,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.1
controller-gen.kubebuilder.io/version: v0.16.2
name: networkfences.csiaddons.openshift.io
spec:
group: csiaddons.openshift.io
Expand Down Expand Up @@ -748,7 +748,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.1
controller-gen.kubebuilder.io/version: v0.16.2
name: reclaimspacecronjobs.csiaddons.openshift.io
spec:
group: csiaddons.openshift.io
Expand Down Expand Up @@ -986,7 +986,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.1
controller-gen.kubebuilder.io/version: v0.16.2
name: reclaimspacejobs.csiaddons.openshift.io
spec:
group: csiaddons.openshift.io
Expand Down Expand Up @@ -1181,7 +1181,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.1
controller-gen.kubebuilder.io/version: v0.16.2
name: volumegroupreplicationclasses.replication.storage.openshift.io
spec:
group: replication.storage.openshift.io
Expand Down Expand Up @@ -1257,7 +1257,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.1
controller-gen.kubebuilder.io/version: v0.16.2
name: volumegroupreplicationcontents.replication.storage.openshift.io
spec:
group: replication.storage.openshift.io
Expand Down Expand Up @@ -1430,7 +1430,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.1
controller-gen.kubebuilder.io/version: v0.16.2
name: volumegroupreplications.replication.storage.openshift.io
spec:
group: replication.storage.openshift.io
Expand Down Expand Up @@ -1695,7 +1695,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.1
controller-gen.kubebuilder.io/version: v0.16.2
name: volumereplicationclasses.replication.storage.openshift.io
spec:
group: replication.storage.openshift.io
Expand Down Expand Up @@ -1779,7 +1779,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.1
controller-gen.kubebuilder.io/version: v0.16.2
name: volumereplications.replication.storage.openshift.io
spec:
group: replication.storage.openshift.io
Expand Down
35 changes: 10 additions & 25 deletions deploy/controller/rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,35 +47,11 @@ kind: ClusterRole
metadata:
name: csi-addons-manager-role
rules:
- apiGroups:
- ""
resources:
- persistentvolumeclaims
verbs:
- get
- list
- update
- watch
- apiGroups:
- ""
resources:
- persistentvolumes
verbs:
- get
- list
- watch
- apiGroups:
- coordination.k8s.io
resources:
- leases
verbs:
- get
- list
- watch
- apiGroups:
- ""
resources:
- namespaces
- persistentvolumes
- pods
verbs:
- get
Expand All @@ -89,13 +65,22 @@ rules:
- get
- list
- patch
- update
- watch
- apiGroups:
- ""
resources:
- persistentvolumeclaims/finalizers
verbs:
- update
- apiGroups:
- coordination.k8s.io
resources:
- leases
verbs:
- get
- list
- watch
- apiGroups:
- csiaddons.openshift.io
resources:
Expand Down
12 changes: 6 additions & 6 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
module github.com/csi-addons/kubernetes-csi-addons

go 1.22.0
go 1.22.6

require (
github.com/container-storage-interface/spec v1.10.0
github.com/csi-addons/spec v0.2.1-0.20240730084235-3958a5b17d24
github.com/go-logr/logr v1.4.2
github.com/kubernetes-csi/csi-lib-utils v0.18.1
github.com/onsi/ginkgo/v2 v2.20.0
github.com/onsi/gomega v1.34.1
github.com/kubernetes-csi/csi-lib-utils v0.19.0
github.com/onsi/ginkgo/v2 v2.20.2
github.com/onsi/gomega v1.34.2
github.com/robfig/cron/v3 v3.0.1
github.com/stretchr/testify v1.9.0

Expand Down Expand Up @@ -47,7 +47,7 @@ require (
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/josharian/intern v1.0.0 // indirect
Expand All @@ -71,7 +71,7 @@ require (
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/sys v0.24.0 // indirect
golang.org/x/term v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/time v0.3.0 // indirect
Expand Down
Loading
Loading