Skip to content

Commit cdaef4c

Browse files
authored
Merge pull request openshift-kni#1449 from openshift-kni/operator-fix-commandline
operator: fix and clean commandline
2 parents 85b51cc + 4ab59db commit cdaef4c

File tree

3 files changed

+24
-13
lines changed

3 files changed

+24
-13
lines changed

bundle/manifests/numaresources-operator.clusterserviceversion.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -518,8 +518,6 @@ spec:
518518
containers:
519519
- args:
520520
- -v=4
521-
- --leader-elect
522-
- --enable-scheduler
523521
command:
524522
- /bin/numaresources-operator
525523
env:

cmd/main.go

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ import (
2424
"fmt"
2525
"os"
2626
"runtime"
27+
"strconv"
28+
"strings"
2729
"time"
2830

2931
// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
@@ -74,11 +76,13 @@ const (
7476
)
7577

7678
const (
77-
defaultWebhookPort = 9443
78-
defaultMetricsAddr = ":8080"
79-
defaultMetricsSupport = true
80-
defaultProbeAddr = ":8081"
81-
defaultNamespace = "numaresources-operator"
79+
defaultWebhookPort = 9443
80+
defaultMetricsAddr = ":8080"
81+
defaultMetricsSupport = true
82+
defaultProbeAddr = ":8081"
83+
defaultNamespace = "numaresources-operator"
84+
defaultEnableScheduler = true
85+
defaultEnableLeaderElection = true
8286
)
8387

8488
var (
@@ -125,15 +129,25 @@ type Params struct {
125129
enableMCPCondsForward bool
126130
image ImageParams
127131
inspectFeatures bool
128-
enableReplicasDetect bool
129132
}
130133

131134
func (pa *Params) SetDefaults() {
132135
pa.metricsAddr = defaultMetricsAddr
133136
pa.probeAddr = defaultProbeAddr
134137
pa.render.Namespace = defaultNamespace
135-
pa.enableReplicasDetect = true
136138
pa.enableMetrics = defaultMetricsSupport
139+
pa.enableScheduler = defaultEnableScheduler
140+
pa.enableLeaderElection = defaultEnableLeaderElection
141+
}
142+
143+
func (pa *Params) Summarize() string {
144+
var sb strings.Builder
145+
sb.WriteString("leaderElection=" + strconv.FormatBool(pa.enableLeaderElection))
146+
sb.WriteString(" scheduler=" + strconv.FormatBool(pa.enableScheduler))
147+
sb.WriteString(" webhooks=" + strconv.FormatBool(pa.enableWebhooks))
148+
sb.WriteString(" webhooksHTTP2=" + strconv.FormatBool(pa.enableHTTP2))
149+
sb.WriteString(" metrics=" + strconv.FormatBool(pa.enableMetrics))
150+
return sb.String()
137151
}
138152

139153
func (pa *Params) FromFlags() {
@@ -158,7 +172,6 @@ func (pa *Params) FromFlags() {
158172
flag.BoolVar(&pa.enableMCPCondsForward, "enable-mcp-conds-fwd", pa.enableMCPCondsForward, "enable MCP Status Condition forwarding")
159173
flag.StringVar(&pa.image.Exporter, "image-exporter", pa.image.Exporter, "use this image as default for the RTE")
160174
flag.StringVar(&pa.image.Scheduler, "image-scheduler", pa.image.Scheduler, "use this image as default for the scheduler")
161-
flag.BoolVar(&pa.enableReplicasDetect, "detect-replicas", pa.enableReplicasDetect, "autodetect optimal replica count.(DEPRECATED) autodetect enabled by default and should be configured from the NUMAResourcesScheduler CR")
162175

163176
flag.Parse()
164177

@@ -194,7 +207,9 @@ func main() {
194207
config := textlogger.NewConfig(textlogger.Verbosity(int(klogV)))
195208
ctrl.SetLogger(textlogger.NewLogger(config))
196209

197-
klog.InfoS("starting", "program", version.OperatorProgramName(), "version", bi.Version, "branch", bi.Branch, "gitcommit", bi.Commit, "golang", runtime.Version(), "vl", klogV, "auxv", config.Verbosity().String())
210+
klog.InfoS("starting", "program", version.OperatorProgramName(), "version", bi.Version, "branch", bi.Branch, "gitcommit", bi.Commit, "golang", runtime.Version())
211+
klog.InfoS("starting", "program", version.OperatorProgramName(), "logVerbosity", klogV, "auxVerbosity", config.Verbosity().String())
212+
klog.InfoS("starting", "program", version.OperatorProgramName(), "params", params.Summarize())
198213

199214
ctx := context.Background()
200215

config/manager/manager.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ spec:
5353
- /bin/numaresources-operator
5454
args:
5555
- -v=4
56-
- --leader-elect
57-
- --enable-scheduler
5856
ports:
5957
- containerPort: 8080
6058
protocol: TCP

0 commit comments

Comments
 (0)