diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index b020b70..c2702fc 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -33,7 +33,7 @@ rules: - update - watch - apiGroups: - - ipam.ironcore.dev + - ipam.metal.ironcore.dev resources: - ips verbs: @@ -41,7 +41,7 @@ rules: - list - watch - apiGroups: - - ipam.ironcore.dev + - ipam.metal.ironcore.dev resources: - ips/status verbs: diff --git a/controllers/controllers_test.go b/controllers/controllers_test.go index 05f6232..d26ed23 100644 --- a/controllers/controllers_test.go +++ b/controllers/controllers_test.go @@ -64,7 +64,7 @@ var _ = BeforeSuite(func() { //+kubebuilder:scaffold:scheme testEnv := &envtest.Environment{ - CRDDirectoryPaths: []string{filepath.Join("..", "config", "crd", "bases"), filepath.Join("..", "test", "ipam.ironcore.dev_ips.yaml")}, + CRDDirectoryPaths: []string{filepath.Join("..", "config", "crd", "bases"), filepath.Join("..", "test", "ipam.metal.ironcore.dev_ips.yaml")}, ErrorIfCRDPathMissing: true, } var cfg *rest.Config diff --git a/controllers/ip_controller.go b/controllers/ip_controller.go index f6d63f0..b846eb8 100644 --- a/controllers/ip_controller.go +++ b/controllers/ip_controller.go @@ -23,8 +23,8 @@ import ( "github.com/ironcore-dev/oob/internal/rand" ) -//+kubebuilder:rbac:groups=ipam.ironcore.dev,resources=ips,verbs=get;list;watch -//+kubebuilder:rbac:groups=ipam.ironcore.dev,resources=ips/status,verbs=get +//+kubebuilder:rbac:groups=ipam.metal.ironcore.dev,resources=ips,verbs=get;list;watch +//+kubebuilder:rbac:groups=ipam.metal.ironcore.dev,resources=ips/status,verbs=get func NewIPReconciler(namespace string, subnetLabelName string, subnetLabelValue string) (*IPReconciler, error) { return &IPReconciler{ diff --git a/go.mod b/go.mod index 3509cbb..a42012b 100644 --- a/go.mod +++ b/go.mod @@ -11,9 +11,9 @@ require ( github.com/google/uuid v1.6.0 github.com/gorilla/mux v1.8.1 github.com/hashicorp/go-multierror v1.1.1 - github.com/ironcore-dev/ipam v0.1.1 + github.com/ironcore-dev/ipam v0.2.0 github.com/ironcore-dev/vgopath v0.1.4 - github.com/onsi/ginkgo/v2 v2.15.0 + github.com/onsi/ginkgo/v2 v2.16.0 github.com/onsi/gomega v1.31.1 github.com/rs/zerolog v1.32.0 github.com/sethvargo/go-password v0.2.0 diff --git a/go.sum b/go.sum index a3346d9..83af784 100644 --- a/go.sum +++ b/go.sum @@ -126,8 +126,8 @@ github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/ironcore-dev/ipam v0.1.1 h1:L9b1w9EViKNh+6MafM3ot8m12MvrqkvQUW1ogwwSo3w= -github.com/ironcore-dev/ipam v0.1.1/go.mod h1:RnYx8OOvp2E2CEoDTA6N4/Wvpd5Ur/yi+0vQvzI1FFA= +github.com/ironcore-dev/ipam v0.2.0 h1:2iqZYK0nLWTx0jj7o/W+G3TT1WV+NXURZpRAxYbwz6A= +github.com/ironcore-dev/ipam v0.2.0/go.mod h1:2RWFJu00UHjN9viwx4JazqVeYRrgo3plKyXCYm/V7es= github.com/ironcore-dev/ironcore v0.1.2-0.20240227221311-63910df3d5cc h1:1nWPYemQo3rH6D4Hr0vtjMXjzJgmVC7NLFJx+6J9Oyc= github.com/ironcore-dev/ironcore v0.1.2-0.20240227221311-63910df3d5cc/go.mod h1:SftQmDcsMKACWYvRJwlW5R4WgGW5EKzXuq+1zh0YKOA= github.com/ironcore-dev/vgopath v0.1.4 h1:hBMuv7+wnZp5JHkVfdg4mtP8hsIGvuv42+l+F2wmQxk= @@ -178,8 +178,8 @@ github.com/olekukonko/tablewriter v0.0.4 h1:vHD/YYe1Wolo78koG299f7V/VAS08c6IpCLn github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY= -github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM= +github.com/onsi/ginkgo/v2 v2.16.0 h1:7q1w9frJDzninhXxjZd+Y/x54XNjG/UlRLIYPZafsPM= +github.com/onsi/ginkgo/v2 v2.16.0/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs= github.com/onsi/gomega v1.31.1 h1:KYppCUK+bUgAZwHOu7EXVBKyQA6ILvOESHkn/tgoqvo= github.com/onsi/gomega v1.31.1/go.mod h1:y40C95dwAD1Nz36SsEnxvfFe8FFfNxzI5eJ0EYGyAy0= github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= diff --git a/test/ipam.ironcore.dev_ips.yaml b/test/ipam.metal.ironcore.dev_ips.yaml similarity index 98% rename from test/ipam.ironcore.dev_ips.yaml rename to test/ipam.metal.ironcore.dev_ips.yaml index 891c681..e9bc0f2 100644 --- a/test/ipam.ironcore.dev_ips.yaml +++ b/test/ipam.metal.ironcore.dev_ips.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.14.0 - name: ips.ipam.ironcore.dev + name: ips.ipam.metal.ironcore.dev spec: - group: ipam.ironcore.dev + group: ipam.metal.ironcore.dev names: kind: IP listKind: IPList