diff --git a/operator/cmd/operator/app/options/options.go b/operator/cmd/operator/app/options/options.go index 684e881c3..f65c15668 100644 --- a/operator/cmd/operator/app/options/options.go +++ b/operator/cmd/operator/app/options/options.go @@ -73,9 +73,9 @@ func (o *Options) AddFlags(fs *pflag.FlagSet, allControllers []string, disabledB fs.Int32Var(&o.KubeAPIBurst, "kube-api-burst", o.KubeAPIBurst, "Burst to use while talking with kubernetes apiserver.") fs.StringSliceVar(&o.Controllers, "controllers", o.Controllers, fmt.Sprintf(""+ "A list of controllers to enable. '*' enables all on-by-default controllers, 'foo' enables the controller "+ - "named 'foo', '-foo' disables the controller named 'foo'.\nAll controllers: %s\nDisabled-by-default controllers: %s", + "named 'foo', '-foo' disables the controller named 'foo'.\nAll controllers: %s .\nDisabled-by-default controllers: %s .", strings.Join(allControllers, ", "), strings.Join(disabledByDefaultControllers, ", "))) - fs.IntVar(&o.ConcurrentKarmadaSyncs, "concurrent-karmada-syncs", o.ConcurrentKarmadaSyncs, "The number of karmada objects that are allowed to sync concurrently..") + fs.IntVar(&o.ConcurrentKarmadaSyncs, "concurrent-karmada-syncs", o.ConcurrentKarmadaSyncs, "The number of karmada objects that are allowed to sync concurrently.") options.BindLeaderElectionFlags(&o.LeaderElection, fs) } diff --git a/operator/pkg/controlplane/manifests.go b/operator/pkg/controlplane/manifests.go index f57f30d12..07dd88947 100644 --- a/operator/pkg/controlplane/manifests.go +++ b/operator/pkg/controlplane/manifests.go @@ -16,11 +16,6 @@ spec: selector: matchLabels: karmada-app: kube-controller-manager - strategy: - rollingUpdate: - maxSurge: 1 - maxUnavailable: 1 - type: RollingUpdate template: metadata: labels: diff --git a/operator/pkg/deinit.go b/operator/pkg/deinit.go index 4dc5317e4..c2e9cb0a6 100644 --- a/operator/pkg/deinit.go +++ b/operator/pkg/deinit.go @@ -22,7 +22,7 @@ type DeInitOptions struct { } // DeInitOpt defines a type of function to set DeInitOptions values. -type DeInitOpt func(opt *DeInitOptions) +type DeInitOpt func(o *DeInitOptions) var _ tasks.DeInitData = &deInitData{} @@ -103,19 +103,19 @@ func defaultJobDeInitOptions() *DeInitOptions { // NewDeInitOptWithKarmada returns a DeInitOpt function to initialize DeInitOptions with karmada resource func NewDeInitOptWithKarmada(karmada *operatorv1alpha1.Karmada) DeInitOpt { - return func(opt *DeInitOptions) { - opt.Name = karmada.GetName() - opt.Namespace = karmada.GetNamespace() + return func(o *DeInitOptions) { + o.Name = karmada.GetName() + o.Namespace = karmada.GetNamespace() if karmada.Spec.HostCluster != nil { - opt.HostCluster = karmada.Spec.HostCluster + o.HostCluster = karmada.Spec.HostCluster } } } // NewDeInitOptWithKubeconfig returns a DeInitOpt function to set kubeconfig to DeInitOptions with rest config func NewDeInitOptWithKubeconfig(config *rest.Config) DeInitOpt { - return func(options *DeInitOptions) { - options.Kubeconfig = config + return func(o *DeInitOptions) { + o.Kubeconfig = config } } diff --git a/operator/pkg/init.go b/operator/pkg/init.go index d3e83fde0..24a60926b 100644 --- a/operator/pkg/init.go +++ b/operator/pkg/init.go @@ -37,7 +37,7 @@ type InitOptions struct { } // InitOpt defines a type of function to set InitOptions values. -type InitOpt func(opt *InitOptions) +type InitOpt func(o *InitOptions) var _ tasks.InitData = &initData{} @@ -234,16 +234,16 @@ func defaultJobInitOptions() *InitOptions { // NewInitOptWithKarmada returns a InitOpt function to initialize InitOptions with karmada resource func NewInitOptWithKarmada(karmada *operatorv1alpha1.Karmada) InitOpt { - return func(opt *InitOptions) { - opt.Karmada = karmada - opt.Name = karmada.GetName() - opt.Namespace = karmada.GetNamespace() + return func(o *InitOptions) { + o.Karmada = karmada + o.Name = karmada.GetName() + o.Namespace = karmada.GetNamespace() } } // NewInitOptWithKubeconfig returns a InitOpt function to set kubeconfig to InitOptions with rest config func NewInitOptWithKubeconfig(config *rest.Config) InitOpt { - return func(options *InitOptions) { - options.Kubeconfig = config + return func(o *InitOptions) { + o.Kubeconfig = config } }