Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions cmd/manager/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -663,18 +663,18 @@ func main() {
os.Exit(1)
}
if err = (&parameterscontrollers.ComponentParameterReconciler{
Client: client,
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("component-parameter-controller"),
}).SetupWithManager(mgr, multiClusterMgr); err != nil {
}).SetupWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "ComponentParameter")
os.Exit(1)
}
if err = (&parameterscontrollers.ReconfigureReconciler{
Client: client,
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("reconfigure-controller"),
}).SetupWithManager(mgr, multiClusterMgr); err != nil {
}).SetupWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "ReconfigureRequest")
os.Exit(1)
}
Expand Down
2 changes: 1 addition & 1 deletion controllers/operations/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ var _ = BeforeSuite(func() {
Client: k8sManager.GetClient(),
Scheme: k8sManager.GetScheme(),
Recorder: k8sManager.GetEventRecorderFor("component-parameter"),
}).SetupWithManager(k8sManager, nil)
}).SetupWithManager(k8sManager)
Expect(err).ToNot(HaveOccurred())

/* err = (&apps.ServiceDescriptorReconciler{
Expand Down
97 changes: 0 additions & 97 deletions controllers/parameters/combine_upgrade_policy_test.go

This file was deleted.

12 changes: 4 additions & 8 deletions controllers/parameters/componentparameter_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ import (
parametersv1alpha1 "github.com/apecloud/kubeblocks/apis/parameters/v1alpha1"
"github.com/apecloud/kubeblocks/pkg/constant"
"github.com/apecloud/kubeblocks/pkg/controller/model"
"github.com/apecloud/kubeblocks/pkg/controller/multicluster"
intctrlutil "github.com/apecloud/kubeblocks/pkg/controllerutil"
"github.com/apecloud/kubeblocks/pkg/parameters"
viper "github.com/apecloud/kubeblocks/pkg/viperx"
Expand Down Expand Up @@ -84,17 +83,14 @@ func (r *ComponentParameterReconciler) Reconcile(ctx context.Context, req ctrl.R
}

// SetupWithManager sets up the controller with the Manager.
func (r *ComponentParameterReconciler) SetupWithManager(mgr ctrl.Manager, multiClusterMgr multicluster.Manager) error {
builder := intctrlutil.NewControllerManagedBy(mgr).
func (r *ComponentParameterReconciler) SetupWithManager(mgr ctrl.Manager) error {
return intctrlutil.NewControllerManagedBy(mgr).
For(&parametersv1alpha1.ComponentParameter{}).
WithOptions(controller.Options{
MaxConcurrentReconciles: viper.GetInt(constant.CfgKBReconcileWorkers) / 4,
}).
Owns(&corev1.ConfigMap{})
if multiClusterMgr != nil {
multiClusterMgr.Own(builder, &corev1.ConfigMap{}, &parametersv1alpha1.ComponentParameter{})
}
return builder.Complete(r)
Owns(&corev1.ConfigMap{}).
Complete(r)
}

func (r *ComponentParameterReconciler) reconcile(reqCtx intctrlutil.RequestCtx, componentParameter *parametersv1alpha1.ComponentParameter) (ctrl.Result, error) {
Expand Down
4 changes: 2 additions & 2 deletions controllers/parameters/config_annotation.go
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ func updateConfigPhaseWithResult(cli client.Client, ctx intctrlutil.RequestCtx,
config.ObjectMeta.Annotations[core.GenerateRevisionPhaseKey(revision)] = string(b)
}

if err := cli.Patch(ctx.Ctx, config, patch, inDataContextUnspecified()); err != nil {
if err := cli.Patch(ctx.Ctx, config, patch); err != nil {
return intctrlutil.RequeueWithError(err, ctx.Log, "")
}
if result.Retry {
Expand Down Expand Up @@ -184,7 +184,7 @@ func updateAppliedConfigs(cli client.Client, ctx intctrlutil.RequestCtx, config

// delete reconfigure-policy
delete(config.ObjectMeta.Annotations, constant.UpgradePolicyAnnotationKey)
if err := cli.Patch(ctx.Ctx, config, patch, inDataContextUnspecified()); err != nil {
if err := cli.Patch(ctx.Ctx, config, patch); err != nil {
return false, err
}

Expand Down
Loading