diff --git a/artifacts/deploy/karmada-controller-manager.yaml b/artifacts/deploy/karmada-controller-manager.yaml index ee091e8a85a5..6e5afc50856d 100644 --- a/artifacts/deploy/karmada-controller-manager.yaml +++ b/artifacts/deploy/karmada-controller-manager.yaml @@ -26,7 +26,6 @@ spec: command: - /bin/karmada-controller-manager - --kubeconfig=/etc/kubeconfig - - --bind-address=0.0.0.0 - --metrics-bind-address=:8080 - --cluster-status-update-frequency=10s - --failover-eviction-timeout=30s diff --git a/charts/karmada/templates/karmada-controller-manager.yaml b/charts/karmada/templates/karmada-controller-manager.yaml index 88b816f63165..41585c54a59a 100644 --- a/charts/karmada/templates/karmada-controller-manager.yaml +++ b/charts/karmada/templates/karmada-controller-manager.yaml @@ -52,10 +52,10 @@ spec: command: - /bin/karmada-controller-manager - --kubeconfig=/etc/kubeconfig - - --bind-address=0.0.0.0 - --cluster-status-update-frequency=10s - - --secure-port=10357 - --leader-elect-resource-namespace={{ $systemNamespace }} + - --health-probe-bind-address=0.0.0.0:10357 + - --metrics-bind-address=:8080 - --v=2 {{- if .Values.controllerManager.controllers }} - --controllers={{ .Values.controllerManager.controllers }} diff --git a/cmd/controller-manager/app/controllermanager.go b/cmd/controller-manager/app/controllermanager.go index 134634b0b80b..3429981480b4 100644 --- a/cmd/controller-manager/app/controllermanager.go +++ b/cmd/controller-manager/app/controllermanager.go @@ -100,10 +100,6 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command { The controllers watch Karmada objects and then talk to the underlying clusters' API servers to create regular Kubernetes resources.`, RunE: func(_ *cobra.Command, _ []string) error { - // complete options - if err := opts.Complete(); err != nil { - return err - } // validate options if errs := opts.Validate(); len(errs) != 0 { return errs.ToAggregate() diff --git a/cmd/controller-manager/app/options/options.go b/cmd/controller-manager/app/options/options.go index a22dcd206e04..933a78aab34c 100644 --- a/cmd/controller-manager/app/options/options.go +++ b/cmd/controller-manager/app/options/options.go @@ -18,9 +18,7 @@ package options import ( "fmt" - "net" "regexp" - "strconv" "strings" "time" @@ -36,11 +34,6 @@ import ( "github.com/karmada-io/karmada/pkg/util" ) -const ( - defaultBindAddress = "0.0.0.0" - defaultPort = 10357 -) - var ( defaultElectionLeaseDuration = metav1.Duration{Duration: 15 * time.Second} defaultElectionRenewDeadline = metav1.Duration{Duration: 10 * time.Second} @@ -57,13 +50,6 @@ type Options struct { Controllers []string // LeaderElection defines the configuration of leader election client. LeaderElection componentbaseconfig.LeaderElectionConfiguration - // BindAddress is the IP address on which to listen for the --secure-port port. - // Deprecated: Use HealthProbeBindAddress instead. This will be removed in release 1.12+. - BindAddress string - // SecurePort is the port that the the server serves at. - // Note: We hope support https in the future once controller-runtime provides the functionality. - // Deprecated: Use HealthProbeBindAddress instead. This will be removed in release 1.12+. - SecurePort int // ClusterStatusUpdateFrequency is the frequency that controller computes and report cluster status. // It must work with ClusterMonitorGracePeriod(--cluster-monitor-grace-period) in karmada-controller-manager. ClusterStatusUpdateFrequency metav1.Duration @@ -177,14 +163,6 @@ func (o *Options) AddFlags(flags *pflag.FlagSet, allControllers, disabledByDefau "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", strings.Join(allControllers, ", "), strings.Join(disabledByDefaultControllers, ", "), )) - flags.StringVar(&o.BindAddress, "bind-address", defaultBindAddress, - "The IP address on which to listen for the --secure-port port.") - flags.IntVar(&o.SecurePort, "secure-port", defaultPort, - "The secure port on which to serve HTTPS.") - // nolint: errcheck - flags.MarkDeprecated("bind-address", "This flag is deprecated and will be removed in release 1.12+. Use --health-probe-bind-address instead.") - // nolint: errcheck - flags.MarkDeprecated("secure-port", "This flag is deprecated and will be removed in release 1.12+. Use --health-probe-bind-address instead.") flags.DurationVar(&o.ClusterStatusUpdateFrequency.Duration, "cluster-status-update-frequency", 10*time.Second, "Specifies how often karmada-controller-manager posts cluster status to karmada-apiserver.") flags.BoolVar(&o.LeaderElection.LeaderElect, "leader-elect", true, "Start a leader election client and gain leadership before executing the main loop. Enable this when running replicated components for high availability.") @@ -232,7 +210,7 @@ func (o *Options) AddFlags(flags *pflag.FlagSet, allControllers, disabledByDefau flags.DurationVar(&o.ClusterCacheSyncTimeout.Duration, "cluster-cache-sync-timeout", util.CacheSyncTimeout, "Timeout period waiting for cluster cache to sync.") flags.DurationVar(&o.ResyncPeriod.Duration, "resync-period", 0, "Base frequency the informers are resynced.") flags.StringVar(&o.MetricsBindAddress, "metrics-bind-address", ":8080", "The TCP address that the controller should bind to for serving prometheus metrics(e.g. 127.0.0.1:8080, :8080). It can be set to \"0\" to disable the metrics serving.") - flags.StringVar(&o.HealthProbeBindAddress, "health-probe-bind-address", "", "The TCP address that the controller should bind to for serving health probes(e.g. 127.0.0.1:10357, :10357). It can be set to \"0\" to disable serving the health probe. Defaults to 0.0.0.0:10357.") + flags.StringVar(&o.HealthProbeBindAddress, "health-probe-bind-address", ":10357", "The TCP address that the controller should bind to for serving health probes(e.g. 127.0.0.1:10357, :10357). It can be set to \"0\" to disable serving the health probe. Defaults to 0.0.0.0:10357.") flags.IntVar(&o.ConcurrentClusterSyncs, "concurrent-cluster-syncs", 5, "The number of Clusters that are allowed to sync concurrently.") flags.IntVar(&o.ConcurrentClusterResourceBindingSyncs, "concurrent-clusterresourcebinding-syncs", 5, "The number of ClusterResourceBindings that are allowed to sync concurrently.") flags.IntVar(&o.ConcurrentResourceBindingSyncs, "concurrent-resourcebinding-syncs", 5, "The number of ResourceBindings that are allowed to sync concurrently.") @@ -261,11 +239,3 @@ func (o *Options) SkippedNamespacesRegexps() []*regexp.Regexp { } return skippedPropagatingNamespaces } - -// Complete ensures that options are valid and marshals them if necessary. -func (o *Options) Complete() error { - if len(o.HealthProbeBindAddress) == 0 { - o.HealthProbeBindAddress = net.JoinHostPort(o.BindAddress, strconv.Itoa(o.SecurePort)) - } - return nil -}