Merge pull request #2978 from sebsoto/backportArgs417

[release-4.17] Change how extra arguments are processed

Author: openshift-merge-bot[bot]

Containerfile

@@ -120,7 +120,9 @@ RUN make build-daemon
 #│   ├── gcp-get-hostname.ps1
 #│   ├── windows-defender-exclusion.ps1
 #│   └── hns.psm1
-#├── windows_exporter.exe
+#├── windows-exporter/
+#│   ├── windows_exporter.exe
+#│   └── windows-exporter-webconfig.yaml
 #└── windows-instance-config-daemon.exe
 
 FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
@@ -144,10 +146,13 @@ COPY --from=build /build/windows-machine-config-operator/build/_output/bin/windo
 # Copy hybrid-overlay-node.exe
 COPY --from=build /build/windows-machine-config-operator/ovn-kubernetes/go-controller/_output/go/bin/windows/hybrid-overlay-node.exe .
 
-# Copy windows_exporter.exe
+# Copy windows_exporter.exe and TLS windows-exporter-webconfig.yaml
+WORKDIR /payload/windows-exporter
 COPY --from=build /build/windows-machine-config-operator/windows_exporter/windows_exporter.exe .
+COPY pkg/internal/windows-exporter-webconfig.yaml .
 
 # Copy azure-cloud-node-manager.exe
+WORKDIR /payload/
 COPY --from=build /build/windows-machine-config-operator/cloud-provider-azure/azure-cloud-node-manager.exe .
 
 # Copy ecr-credential-provider

bundle/manifests/windows-machine-config-operator.clusterserviceversion.yaml

@@ -424,9 +424,7 @@ spec:
                 name: windows-machine-config-operator
             spec:
               containers:
-              - args:
-                - $(ARGS)
-                command:
+              - command:
                 - windows-machine-config-operator
                 env:
                 - name: WATCH_NAMESPACE

cmd/operator/main.go

@@ -62,6 +62,14 @@ func init() {
 func main() {
 	var debugLogging bool
 
+	if extraArgs := os.Getenv("ARGS"); extraArgs != "" {
+		for _, arg := range strings.Split(extraArgs, " ") {
+			if len(arg) > 0 {
+				os.Args = append(os.Args, arg)
+			}
+		}
+	}
+
 	flag.BoolVar(&debugLogging, "debugLogging", false, "Log debug messages")
 
 	// Add flags registered by imported packages (e.g. glog and

config/manager/manager.yaml

@@ -33,8 +33,6 @@ spec:
       containers:
       - command:
         - windows-machine-config-operator
-        args:
-        - $(ARGS)
         image: controller:latest
         name: manager
         imagePullPolicy: IfNotPresent