UPSTREAM: <carry>: allows for switching KS to talk to Kube API over l…

…ocalhost

This commit fixes some compilation issues.

cmd/kube-controller-manager/app/patch.go

@@ -31,7 +31,7 @@ func SetUpCustomRoundTrippersForOpenShift(controllerManagerOptions *options.Kube
 		return nil
 	}
 
-	config, err := clientcmd.BuildConfigFromFlags(controllerManagerOptions.Master, controllerManagerOptions.Kubeconfig)
+	config, err := clientcmd.BuildConfigFromFlags(controllerManagerOptions.Master, controllerManagerOptions.Generic.ClientConnection.Kubeconfig)
 	if err != nil {
 		return err
 	}

cmd/kube-scheduler/app/options/patch.go

@@ -1,7 +1,11 @@
 package options
 
-import kubeschedulerconfig "k8s.io/kubernetes/pkg/scheduler/apis/config"
+import (
+	"k8s.io/klog/v2"
 
-func LoadKubeSchedulerConfiguration(file string) (*kubeschedulerconfig.KubeSchedulerConfiguration, error) {
-	return loadConfigFromFile(file)
+	kubeschedulerconfig "k8s.io/kubernetes/pkg/scheduler/apis/config"
+)
+
+func LoadKubeSchedulerConfiguration(logger klog.Logger, file string) (*kubeschedulerconfig.KubeSchedulerConfiguration, error) {
+	return loadConfigFromFile(logger, file)
 }

cmd/kube-scheduler/app/patch.go

@@ -3,6 +3,8 @@ package app
 import (
 	"time"
 
+	"k8s.io/klog/v2"
+
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/component-base/metrics/legacyregistry"
@@ -12,7 +14,7 @@ import (
 	"github.com/openshift/library-go/pkg/monitor/health"
 )
 
-func setUpPreferredHostForOpenShift(kubeSchedulerOptions *options.Options) error {
+func setUpPreferredHostForOpenShift(logger klog.Logger, kubeSchedulerOptions *options.Options) error {
 	if !kubeSchedulerOptions.OpenShiftContext.UnsupportedKubeAPIOverPreferredHost {
 		return nil
 	}
@@ -24,7 +26,7 @@ func setUpPreferredHostForOpenShift(kubeSchedulerOptions *options.Options) error
 	// if there was no kubeconfig specified we won't be able to get cluster info.
 	// in that case try to load the configuration and read kubeconfig directly from it if it was provided.
 	if len(kubeSchedulerOptions.ConfigFile) > 0 {
-		cfg, err := options.LoadKubeSchedulerConfiguration(kubeSchedulerOptions.ConfigFile)
+		cfg, err := options.LoadKubeSchedulerConfiguration(logger, kubeSchedulerOptions.ConfigFile)
 		if err != nil {
 			return err
 		}

cmd/kube-scheduler/app/server.go

@@ -137,7 +137,8 @@ func runCommand(cmd *cobra.Command, opts *options.Options, registryOptions ...Op
 		cancel()
 	}()
 
-	if err := setUpPreferredHostForOpenShift(opts); err != nil {
+	logger := klog.FromContext(ctx)
+	if err := setUpPreferredHostForOpenShift(logger, opts); err != nil {
 		return err
 	}