React to library-go changes

openshift · Jan 27, 2020 · 469ca75 · 469ca75
1 parent 434f436
commit 469ca75
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/pkg/cmd/render/render.go b/pkg/cmd/render/render.go
@@ -207,7 +207,6 @@ func (r *renderOpts) Run() error {
 		&renderConfig.FileConfig,
 		genericrenderoptions.Template{FileName: "defaultconfig.yaml", Content: v411_00_assets.MustAsset(filepath.Join(bootstrapVersion, "kube-controller-manager", "defaultconfig.yaml"))},
 		mustReadTemplateFile(filepath.Join(r.generic.TemplatesDir, "config", "bootstrap-config-overrides.yaml")),
-		mustReadTemplateFile(filepath.Join(r.generic.TemplatesDir, "config", "config-overrides.yaml")),
 		&renderConfig,
 		nil,
 	); err != nil {

diff --git a/pkg/operator/configobservation/configobservercontroller/observe_config_controller.go b/pkg/operator/configobservation/configobservercontroller/observe_config_controller.go
@@ -68,7 +68,11 @@ func NewConfigObserver(
 				"openshift-kube-controller-manager",
 				[]string{"extendedArguments", "cloud-provider"},
 				[]string{"extendedArguments", "cloud-config"}),
-			featuregates.NewObserveFeatureFlagsFunc(nil, []string{"extendedArguments", "feature-gates"}),
+			featuregates.NewObserveFeatureFlagsFunc(
+				nil,
+				nil,
+				[]string{"extendedArguments", "feature-gates"},
+			),
 			network.ObserveClusterCIDRs,
 			network.ObserveServiceClusterIPRanges,
 			proxy.NewProxyObserveFunc([]string{"targetconfigcontroller", "proxy"}),

diff --git a/pkg/operator/targetconfigcontroller/targetconfigcontroller.go b/pkg/operator/targetconfigcontroller/targetconfigcontroller.go
@@ -178,7 +178,10 @@ func isRequiredConfigPresent(config []byte) error {
 func createTargetConfigController(c TargetConfigController, recorder events.Recorder, operatorSpec *operatorv1.StaticPodOperatorSpec) (bool, error) {
 	errors := []error{}
 
-	directResourceResults := resourceapply.ApplyDirectly(c.kubeClient, c.eventRecorder, v411_00_assets.Asset,
+	directResourceResults := resourceapply.ApplyDirectly(
+		resourceapply.NewKubeClientHolder(c.kubeClient),
+		c.eventRecorder,
+		v411_00_assets.Asset,
 		"v4.1.0/kube-controller-manager/ns.yaml",
 		"v4.1.0/kube-controller-manager/kubeconfig-cert-syncer.yaml",
 		"v4.1.0/kube-controller-manager/kubeconfig-cm.yaml",