diff --git a/internal/controller/cloud-resources/awsnfsvolume_controller.go b/internal/controller/cloud-resources/awsnfsvolume_controller.go index 5edb3b20e..1dc0eb23e 100644 --- a/internal/controller/cloud-resources/awsnfsvolume_controller.go +++ b/internal/controller/cloud-resources/awsnfsvolume_controller.go @@ -21,7 +21,6 @@ import ( "github.com/kyma-project/cloud-manager/pkg/skr/awsnfsvolume" skrruntime "github.com/kyma-project/cloud-manager/pkg/skr/runtime" reconcile2 "github.com/kyma-project/cloud-manager/pkg/skr/runtime/reconcile" - "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" cloudresourcesv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-resources/v1beta1" @@ -59,14 +58,6 @@ func (r *AwsNfsVolumeReconciler) Reconcile(ctx context.Context, req ctrl.Request } func SetupAwsNfsVolumeReconciler(reg skrruntime.SkrRegistry) error { - reg.IndexField(&cloudresourcesv1beta1.AwsNfsVolume{}, cloudresourcesv1beta1.IpRangeField, func(object client.Object) []string { - nfsVol := object.(*cloudresourcesv1beta1.AwsNfsVolume) - if nfsVol.Spec.IpRange.Name == "" { - return []string{"default"} - } - return []string{nfsVol.Spec.IpRange.Name} - }) - return reg.Register(). WithFactory(&AwsNfsVolumeReconcilerFactory{}). For(&cloudresourcesv1beta1.AwsNfsVolume{}). diff --git a/internal/controller/cloud-resources/awsredisinstance_controller.go b/internal/controller/cloud-resources/awsredisinstance_controller.go index 684a248e6..00447f1cd 100644 --- a/internal/controller/cloud-resources/awsredisinstance_controller.go +++ b/internal/controller/cloud-resources/awsredisinstance_controller.go @@ -18,8 +18,6 @@ package cloudresources import ( "context" - "sigs.k8s.io/controller-runtime/pkg/client" - ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/reconcile" @@ -60,14 +58,6 @@ func (r *AwsRedisInstanceReconciler) Reconcile(ctx context.Context, req ctrl.Req } func SetupAwsRedisInstanceReconciler(reg skrruntime.SkrRegistry) error { - reg.IndexField(&cloudresourcesv1beta1.AwsRedisInstance{}, cloudresourcesv1beta1.IpRangeField, func(object client.Object) []string { - redisInstance := object.(*cloudresourcesv1beta1.AwsRedisInstance) - if redisInstance.Spec.IpRange.Name == "" { - return []string{"default"} - } - return []string{redisInstance.Spec.IpRange.Name} - }) - return reg.Register(). WithFactory(&AwsRedisInstanceReconcilerFactory{}). For(&cloudresourcesv1beta1.AwsRedisInstance{}). diff --git a/internal/controller/cloud-resources/gcpnfsvolume_controller.go b/internal/controller/cloud-resources/gcpnfsvolume_controller.go index 6b5ea69f5..fa851597c 100644 --- a/internal/controller/cloud-resources/gcpnfsvolume_controller.go +++ b/internal/controller/cloud-resources/gcpnfsvolume_controller.go @@ -23,7 +23,6 @@ import ( reconcile2 "github.com/kyma-project/cloud-manager/pkg/skr/runtime/reconcile" v1 "k8s.io/api/core/v1" "k8s.io/klog/v2" - "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/cluster" "sigs.k8s.io/controller-runtime/pkg/reconcile" @@ -72,14 +71,6 @@ func (r *GcpNfsVolumeReconciler) Reconcile(ctx context.Context, req ctrl.Request } func SetupGcpNfsVolumeReconciler(reg skrruntime.SkrRegistry) error { - reg.IndexField(&cloudresourcesv1beta1.GcpNfsVolume{}, cloudresourcesv1beta1.IpRangeField, func(object client.Object) []string { - nfsVol := object.(*cloudresourcesv1beta1.GcpNfsVolume) - if nfsVol.Spec.IpRange.Name == "" { - return []string{"default"} - } - return []string{nfsVol.Spec.IpRange.Name} - }) - return reg.Register(). WithFactory(&GcpNfsVolumeReconcilerFactory{}). For(&cloudresourcesv1beta1.GcpNfsVolume{}). diff --git a/internal/controller/cloud-resources/gcpredisinstance_controller.go b/internal/controller/cloud-resources/gcpredisinstance_controller.go index 6732c0a00..3f04d9273 100644 --- a/internal/controller/cloud-resources/gcpredisinstance_controller.go +++ b/internal/controller/cloud-resources/gcpredisinstance_controller.go @@ -18,8 +18,6 @@ package cloudresources import ( "context" - "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kyma-project/cloud-manager/pkg/skr/gcpredisinstance" skrruntime "github.com/kyma-project/cloud-manager/pkg/skr/runtime" skrreconciler "github.com/kyma-project/cloud-manager/pkg/skr/runtime/reconcile" @@ -61,14 +59,6 @@ func (r *GcpRedisInstanceReconciler) Reconcile(ctx context.Context, req ctrl.Req } func SetupGcpRedisInstanceReconciler(reg skrruntime.SkrRegistry) error { - reg.IndexField(&cloudresourcesv1beta1.GcpRedisInstance{}, cloudresourcesv1beta1.IpRangeField, func(object client.Object) []string { - redisInstance := object.(*cloudresourcesv1beta1.GcpRedisInstance) - if redisInstance.Spec.IpRange.Name == "" { - return []string{"default"} - } - return []string{redisInstance.Spec.IpRange.Name} - }) - return reg.Register(). WithFactory(&GcpRedisInstanceReconcilerFactory{}). For(&cloudresourcesv1beta1.GcpRedisInstance{}). diff --git a/internal/controller/cloud-resources/iprange_controller.go b/internal/controller/cloud-resources/iprange_controller.go index 1e63244dd..83e4463ab 100644 --- a/internal/controller/cloud-resources/iprange_controller.go +++ b/internal/controller/cloud-resources/iprange_controller.go @@ -18,6 +18,7 @@ package cloudresources import ( "context" + "sigs.k8s.io/controller-runtime/pkg/client" cloudresourcesv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-resources/v1beta1" "github.com/kyma-project/cloud-manager/pkg/skr/iprange" @@ -60,6 +61,35 @@ func (r *IpRangeReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct } func SetupIpRangeReconciler(reg skrruntime.SkrRegistry) error { + reg.IndexField(&cloudresourcesv1beta1.AwsNfsVolume{}, cloudresourcesv1beta1.IpRangeField, func(object client.Object) []string { + nfsVol := object.(*cloudresourcesv1beta1.AwsNfsVolume) + if nfsVol.Spec.IpRange.Name == "" { + return []string{"default"} + } + return []string{nfsVol.Spec.IpRange.Name} + }) + reg.IndexField(&cloudresourcesv1beta1.GcpNfsVolume{}, cloudresourcesv1beta1.IpRangeField, func(object client.Object) []string { + nfsVol := object.(*cloudresourcesv1beta1.GcpNfsVolume) + if nfsVol.Spec.IpRange.Name == "" { + return []string{"default"} + } + return []string{nfsVol.Spec.IpRange.Name} + }) + reg.IndexField(&cloudresourcesv1beta1.GcpRedisInstance{}, cloudresourcesv1beta1.IpRangeField, func(object client.Object) []string { + redisInstance := object.(*cloudresourcesv1beta1.GcpRedisInstance) + if redisInstance.Spec.IpRange.Name == "" { + return []string{"default"} + } + return []string{redisInstance.Spec.IpRange.Name} + }) + reg.IndexField(&cloudresourcesv1beta1.AwsRedisInstance{}, cloudresourcesv1beta1.IpRangeField, func(object client.Object) []string { + redisInstance := object.(*cloudresourcesv1beta1.AwsRedisInstance) + if redisInstance.Spec.IpRange.Name == "" { + return []string{"default"} + } + return []string{redisInstance.Spec.IpRange.Name} + }) + return reg.Register(). WithFactory(&IpRangeReconcilerFactory{}). For(&cloudresourcesv1beta1.IpRange{}).