diff --git a/charts/nebula-operator/templates/controller-manager-deployment.yaml b/charts/nebula-operator/templates/controller-manager-deployment.yaml index 295f2177..4517de3e 100644 --- a/charts/nebula-operator/templates/controller-manager-deployment.yaml +++ b/charts/nebula-operator/templates/controller-manager-deployment.yaml @@ -79,9 +79,6 @@ spec: command: - /usr/local/bin/autoscaler args: - {{- if .Values.watchNamespaces }} - - --watch-namespaces={{ .Values.watchNamespaces }} - {{- end }} - --concurrent-autoscaler-syncs={{ .Values.concurrentAutoscalerSyncs }} - --health-probe-bind-address=:8091 - --metrics-bind-address=:8090 diff --git a/charts/nebula-operator/values.yaml b/charts/nebula-operator/values.yaml index e23d535c..ef1beb7f 100644 --- a/charts/nebula-operator/values.yaml +++ b/charts/nebula-operator/values.yaml @@ -46,7 +46,7 @@ enableKruiseScheme: false # Period at which the controller forces the repopulation of its local object stores. (default 0h30m0s) syncPeriod: 0h30m0s -# Namespaces restricts the controller watches for updates to Kubernetes objects. If empty, all namespaces are watched. +# Namespaces restricts the controller-manager watches for updates to Kubernetes objects. If empty, all namespaces are watched. # e.g. ns1,ns2,ns3 watchNamespaces: "" diff --git a/cmd/autoscaler/app/autoscaler.go b/cmd/autoscaler/app/autoscaler.go index 4f53aa93..ce09113a 100644 --- a/cmd/autoscaler/app/autoscaler.go +++ b/cmd/autoscaler/app/autoscaler.go @@ -111,7 +111,8 @@ func Run(ctx context.Context, opts *options.Options) error { Cache: cache.Options{ SyncPeriod: &opts.HPAOpts.HorizontalPodAutoscalerSyncPeriod.Duration, - Namespaces: opts.Namespaces, + // FIXME: *cache.multiNamespaceInformer missing method GetController + //Namespaces: opts.Namespaces, }, Controller: config.Controller{ GroupKindConcurrency: map[string]int{ diff --git a/cmd/autoscaler/app/options/options.go b/cmd/autoscaler/app/options/options.go index f56c81c1..3ffdc2e8 100644 --- a/cmd/autoscaler/app/options/options.go +++ b/cmd/autoscaler/app/options/options.go @@ -112,5 +112,5 @@ func (o *Options) AddFlags(flags *pflag.FlagSet) { 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", ":8081", "The TCP address that the controller should bind to for serving health probes.(e.g. 127.0.0.1:8081, :8081). It can be set to \"0\" to disable the health probe serving.") - flags.StringSliceVar(&o.Namespaces, "watch-namespaces", nil, "Namespaces restricts the controller watches for updates to Kubernetes objects. If empty, all namespaces are watched. Multiple namespaces seperated by comma.(e.g. ns1,ns2,ns3).") + //flags.StringSliceVar(&o.Namespaces, "watch-namespaces", nil, "Namespaces restricts the controller watches for updates to Kubernetes objects. If empty, all namespaces are watched. Multiple namespaces seperated by comma.(e.g. ns1,ns2,ns3).") }