fixed rebase issues

pkg/costmodel/allocation.go

@@ -17,8 +17,8 @@ const (
 	// upstream KSM has implementation change vs OC internal KSM - it sets metric to 0 when pod goes down
 	// VS OC implementation which stops emitting it
 	// by adding != 0 filter, we keep just the active times in the prom result
-	queryFmtPods                        = `avg(kube_pod_container_status_running{%s} != 0) by (pod, namespace, %s)[%s:%s]`
-	queryFmtPodsUID                     = `avg(kube_pod_container_status_running{%s} != 0) by (pod, namespace, uid, %s)[%s:%s]`
+	queryFmtPods    = `avg(kube_pod_container_status_running{%s} != 0) by (pod, namespace, %s)[%s:%s]`
+	queryFmtPodsUID = `avg(kube_pod_container_status_running{%s} != 0) by (pod, namespace, uid, %s)[%s:%s]`
 
 	queryFmtRAMBytesAllocated           = `avg(avg_over_time(container_memory_allocation_bytes{container!="", container!="POD", node!="", %s}[%s])) by (container, pod, namespace, node, %s, provider_id)`
 	queryFmtRAMRequests                 = `avg(avg_over_time(kube_pod_container_resource_requests{resource="memory", unit="byte", container!="", container!="POD", node!="", %s}[%s])) by (container, pod, namespace, node, %s)`

pkg/costmodel/router.go

@@ -93,7 +93,7 @@ type Accesses struct {
 	ClusterMap               clusters.ClusterMap
 	CloudProvider            models.Provider
 	ConfigFileManager        *config.ConfigFileManager
-  CloudConfigController    *cloudconfig.Controller
+	CloudConfigController    *cloudconfig.Controller
 	CloudCostPipelineService *cloudcost.PipelineService
 	CloudCostQueryService    *cloudcost.QueryService
 	ClusterInfoProvider      clusters.ClusterInfoProvider
@@ -1738,10 +1738,8 @@ func Initialize(additionalConfigWatchers ...*watcher.ConfigMapWatcher) *Accesses
 		KubeClientSet:          kubeClientset,
 		ClusterCache:           k8sCache,
 		ClusterMap:             clusterMap,
-    CloudProvider:          cloudProvider,
-		CloudConfigController:  cloudconfig.NewController(cloudProvider),
-		ConfigFileManager:      confManager,
 		CloudProvider:          cloudProvider,
+		CloudConfigController:  cloudconfig.NewController(cloudProvider),
 		ConfigFileManager:      confManager,
 		ClusterInfoProvider:    clusterInfoProvider,
 		Model:                  costModel,