Skip to content

Commit 24aee32

Browse files
britaniarbritaniar
authored
fix: Update controller package names (#206)
1 parent f85e0eb commit 24aee32

22 files changed

+52
-51
lines changed

‎cmd/hubagent/workload/setup.go‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@ import (
3535
placementv1beta1 "github.com/kubefleet-dev/kubefleet/apis/placement/v1beta1"
3636
fleetv1alpha1 "github.com/kubefleet-dev/kubefleet/apis/v1alpha1"
3737
"github.com/kubefleet-dev/kubefleet/cmd/hubagent/options"
38+
"github.com/kubefleet-dev/kubefleet/pkg/controllers/bindingwatcher"
3839
"github.com/kubefleet-dev/kubefleet/pkg/controllers/clusterinventory/clusterprofile"
39-
"github.com/kubefleet-dev/kubefleet/pkg/controllers/clusterresourcebindingwatcher"
40-
"github.com/kubefleet-dev/kubefleet/pkg/controllers/clusterresourceplacement"
4140
"github.com/kubefleet-dev/kubefleet/pkg/controllers/clusterresourceplacementeviction"
42-
"github.com/kubefleet-dev/kubefleet/pkg/controllers/clusterresourceplacementwatcher"
43-
"github.com/kubefleet-dev/kubefleet/pkg/controllers/clusterschedulingpolicysnapshot"
4441
"github.com/kubefleet-dev/kubefleet/pkg/controllers/memberclusterplacement"
4542
"github.com/kubefleet-dev/kubefleet/pkg/controllers/overrider"
43+
"github.com/kubefleet-dev/kubefleet/pkg/controllers/placement"
44+
"github.com/kubefleet-dev/kubefleet/pkg/controllers/placementwatcher"
4645
"github.com/kubefleet-dev/kubefleet/pkg/controllers/resourcechange"
4746
"github.com/kubefleet-dev/kubefleet/pkg/controllers/rollout"
47+
"github.com/kubefleet-dev/kubefleet/pkg/controllers/schedulingpolicysnapshot"
4848
"github.com/kubefleet-dev/kubefleet/pkg/controllers/updaterun"
4949
"github.com/kubefleet-dev/kubefleet/pkg/controllers/workgenerator"
5050
"github.com/kubefleet-dev/kubefleet/pkg/resourcewatcher"
@@ -68,6 +68,7 @@ const (
6868
crpControllerV1Alpha1Name = crpControllerName + "-v1alpha1"
6969
crpControllerV1Beta1Name = crpControllerName + "-v1beta1"
7070
rpControllerName = "resource-placement-controller"
71+
placementControllerName = "placement-controller"
7172

7273
resourceChangeControllerName = "resource-change-controller"
7374
mcPlacementControllerName = "memberCluster-placement-controller"
@@ -159,10 +160,10 @@ func SetupControllers(ctx context.Context, wg *sync.WaitGroup, mgr ctrl.Manager,
159160
validator.ResourceInformer = dynamicInformerManager // webhook needs this to check resource scope
160161
validator.RestMapper = mgr.GetRESTMapper() // webhook needs this to validate GVK of resource selector
161162

162-
// Set up a custom controller to reconcile cluster resource placement
163-
crpc := &clusterresourceplacement.Reconciler{
163+
// Set up a custom controller to reconcile placement objects
164+
pc := &placement.Reconciler{
164165
Client: mgr.GetClient(),
165-
Recorder: mgr.GetEventRecorderFor(crpControllerName),
166+
Recorder: mgr.GetEventRecorderFor(placementControllerName),
166167
RestMapper: mgr.GetRESTMapper(),
167168
InformerManager: dynamicInformerManager,
168169
ResourceConfig: resourceConfig,
@@ -186,7 +187,7 @@ func SetupControllers(ctx context.Context, wg *sync.WaitGroup, mgr ctrl.Manager,
186187
}
187188
}
188189
klog.Info("Setting up clusterResourcePlacement v1alpha1 controller")
189-
clusterResourcePlacementControllerV1Alpha1 = controller.NewController(crpControllerV1Alpha1Name, controller.NamespaceKeyFunc, crpc.ReconcileV1Alpha1, rateLimiter)
190+
clusterResourcePlacementControllerV1Alpha1 = controller.NewController(crpControllerV1Alpha1Name, controller.NamespaceKeyFunc, pc.ReconcileV1Alpha1, rateLimiter)
190191
klog.Info("Setting up member cluster change controller")
191192
mcp := &memberclusterplacement.Reconciler{
192193
InformerManager: dynamicInformerManager,
@@ -203,17 +204,17 @@ func SetupControllers(ctx context.Context, wg *sync.WaitGroup, mgr ctrl.Manager,
203204
}
204205
}
205206
klog.Info("Setting up clusterResourcePlacement v1beta1 controller")
206-
clusterResourcePlacementControllerV1Beta1 = controller.NewController(crpControllerV1Beta1Name, controller.NamespaceKeyFunc, crpc.Reconcile, rateLimiter)
207+
clusterResourcePlacementControllerV1Beta1 = controller.NewController(crpControllerV1Beta1Name, controller.NamespaceKeyFunc, pc.Reconcile, rateLimiter)
207208
klog.Info("Setting up clusterResourcePlacement watcher")
208-
if err := (&clusterresourceplacementwatcher.Reconciler{
209+
if err := (&placementwatcher.Reconciler{
209210
PlacementController: clusterResourcePlacementControllerV1Beta1,
210211
}).SetupWithManagerForClusterResourcePlacement(mgr); err != nil {
211212
klog.ErrorS(err, "Unable to set up the clusterResourcePlacement watcher")
212213
return err
213214
}
214215

215216
klog.Info("Setting up clusterResourceBinding watcher")
216-
if err := (&clusterresourcebindingwatcher.Reconciler{
217+
if err := (&bindingwatcher.Reconciler{
217218
PlacementController: clusterResourcePlacementControllerV1Beta1,
218219
Client: mgr.GetClient(),
219220
}).SetupWithManagerForClusterResourceBinding(mgr); err != nil {
@@ -222,7 +223,7 @@ func SetupControllers(ctx context.Context, wg *sync.WaitGroup, mgr ctrl.Manager,
222223
}
223224

224225
klog.Info("Setting up clusterSchedulingPolicySnapshot watcher")
225-
if err := (&clusterschedulingpolicysnapshot.Reconciler{
226+
if err := (&schedulingpolicysnapshot.Reconciler{
226227
Client: mgr.GetClient(),
227228
PlacementController: clusterResourcePlacementControllerV1Beta1,
228229
}).SetupWithManagerForClusterSchedulingPolicySnapshot(mgr); err != nil {
@@ -238,17 +239,17 @@ func SetupControllers(ctx context.Context, wg *sync.WaitGroup, mgr ctrl.Manager,
238239
}
239240
}
240241
klog.Info("Setting up resourcePlacement controller")
241-
resourcePlacementController = controller.NewController(rpControllerName, controller.NamespaceKeyFunc, crpc.Reconcile, rateLimiter)
242+
resourcePlacementController = controller.NewController(rpControllerName, controller.NamespaceKeyFunc, pc.Reconcile, rateLimiter)
242243
klog.Info("Setting up resourcePlacement watcher")
243-
if err := (&clusterresourceplacementwatcher.Reconciler{
244+
if err := (&placementwatcher.Reconciler{
244245
PlacementController: resourcePlacementController,
245246
}).SetupWithManagerForResourcePlacement(mgr); err != nil {
246247
klog.ErrorS(err, "Unable to set up the resourcePlacement watcher")
247248
return err
248249
}
249250

250251
klog.Info("Setting up resourceBinding watcher")
251-
if err := (&clusterresourcebindingwatcher.Reconciler{
252+
if err := (&bindingwatcher.Reconciler{
252253
PlacementController: resourcePlacementController,
253254
Client: mgr.GetClient(),
254255
}).SetupWithManagerForResourceBinding(mgr); err != nil {
@@ -257,7 +258,7 @@ func SetupControllers(ctx context.Context, wg *sync.WaitGroup, mgr ctrl.Manager,
257258
}
258259

259260
klog.Info("Setting up schedulingPolicySnapshot watcher")
260-
if err := (&clusterschedulingpolicysnapshot.Reconciler{
261+
if err := (&schedulingpolicysnapshot.Reconciler{
261262
Client: mgr.GetClient(),
262263
PlacementController: resourcePlacementController,
263264
}).SetupWithManagerForSchedulingPolicySnapshot(mgr); err != nil {

pkg/controllers/clusterresourcebindingwatcher/suite_test.go renamed to pkg/controllers/bindingwatcher/suite_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
16-
package clusterresourcebindingwatcher
16+
package bindingwatcher
1717

1818
import (
1919
"context"
@@ -52,7 +52,7 @@ var (
5252
func TestAPIs(t *testing.T) {
5353
RegisterFailHandler(Fail)
5454

55-
RunSpecs(t, "ClusterResourceBinding Watcher Suite")
55+
RunSpecs(t, "Binding Watcher Suite")
5656
}
5757

5858
var _ = BeforeSuite(func() {

pkg/controllers/clusterresourcebindingwatcher/watcher.go renamed to pkg/controllers/bindingwatcher/watcher.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
// Package clusterresourcebindingwatcher features a controller to watch the clusterResourceBinding and resourceBinding changes.
18-
package clusterresourcebindingwatcher
17+
// Package bindingwatcher features a controller to watch the clusterResourceBinding and resourceBinding changes.
18+
package bindingwatcher
1919

2020
import (
2121
"context"

pkg/controllers/clusterresourcebindingwatcher/watcher_integration_test.go renamed to pkg/controllers/bindingwatcher/watcher_integration_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
16-
package clusterresourcebindingwatcher
16+
package bindingwatcher
1717

1818
import (
1919
"fmt"

pkg/controllers/clusterresourceplacement/cluster_selector.go renamed to pkg/controllers/placement/cluster_selector.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package clusterresourceplacement
17+
package placement
1818

1919
import (
2020
"fmt"

pkg/controllers/clusterresourceplacement/cluster_selector_test.go renamed to pkg/controllers/placement/cluster_selector_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package clusterresourceplacement
1+
package placement
22

33
import (
44
"testing"

pkg/controllers/clusterresourceplacement/controller.go renamed to pkg/controllers/placement/controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
// Package clusterresourceplacement features a controller to reconcile the clusterResourcePlacement changes.
18-
package clusterresourceplacement
17+
// Package placement features a controller to reconcile the clusterResourcePlacement or resourcePlacement changes.
18+
package placement
1919

2020
import (
2121
"context"

pkg/controllers/clusterresourceplacement/controller_integration_test.go renamed to pkg/controllers/placement/controller_integration_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
16-
package clusterresourceplacement
16+
package placement
1717

1818
import (
1919
"fmt"

pkg/controllers/clusterresourceplacement/controller_test.go renamed to pkg/controllers/placement/controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
16-
package clusterresourceplacement
16+
package placement
1717

1818
import (
1919
"context"

pkg/controllers/clusterresourceplacement/placement_controllerv1alpha1.go renamed to pkg/controllers/placement/placement_controllerv1alpha1.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package clusterresourceplacement
17+
package placement
1818

1919
import (
2020
"context"

0 commit comments

Comments
 (0)