Merge 9e05314 into 2147c31

Author: spbsoluble

kubernetes-orchestrator-extension/Jobs/Inventory.cs

@@ -51,12 +51,12 @@ public JobResult ProcessJob(InventoryJobConfiguration config, SubmitInventoryUpd
             Logger.LogInformation("Begin INVENTORY for K8S Orchestrator Extension for job " + config.JobId);
             Logger.LogInformation($"Inventory for store type: {config.Capability}");
 
-            Logger.LogDebug($"Server: {KubeClient.GetHost()}");
-            Logger.LogDebug($"Store Path: {StorePath}");
-            Logger.LogDebug("KubeSecretType: " + KubeSecretType);
-            Logger.LogDebug("KubeSecretName: " + KubeSecretName);
-            Logger.LogDebug("KubeNamespace: " + KubeNamespace);
-            Logger.LogDebug("Host: " + KubeClient.GetHost());
+            Logger.LogDebug("Server: {Host}", KubeClient.GetHost());
+            Logger.LogDebug("Store Path: {StorePath}", StorePath);
+            Logger.LogDebug("KubeSecretType: {KubeSecretType}", KubeSecretType);
+            Logger.LogDebug("KubeSecretName: {KubeSecretName}", KubeSecretName);
+            Logger.LogDebug("KubeNamespace: {KubeNamespace}", KubeNamespace);
+            Logger.LogDebug("Host: {Host}", KubeClient.GetHost());
 
             Logger.LogTrace("Inventory entering switch based on KubeSecretType: " + KubeSecretType + "...");
 

kubernetes-orchestrator-extension/Jobs/JobBase.cs

@@ -877,15 +877,15 @@ private void InitializeProperties(dynamic storeProperties)
         }
 
         Logger.LogTrace("Creating new KubeCertificateManagerClient object");
-        // KubeClient = new KubeCertificateManagerClient(KubeSvcCreds);
-        //
-        // Logger.LogTrace("Getting KubeHost and KubeCluster from KubeClient");
-        // KubeHost = KubeClient.GetHost();
-        // Logger.LogTrace("KubeHost: {KubeHost}", KubeHost);
-        //
-        // Logger.LogTrace("Getting cluster name from KubeClient");
-        // KubeCluster = KubeClient.GetClusterName();
-        // Logger.LogTrace("KubeCluster: {KubeCluster}", KubeCluster);
+        KubeClient = new KubeCertificateManagerClient(KubeSvcCreds);
+        
+        Logger.LogTrace("Getting KubeHost and KubeCluster from KubeClient");
+        KubeHost = KubeClient.GetHost();
+        Logger.LogTrace("KubeHost: {KubeHost}", KubeHost);
+        
+        Logger.LogTrace("Getting cluster name from KubeClient");
+        KubeCluster = KubeClient.GetClusterName();
+        Logger.LogTrace("KubeCluster: {KubeCluster}", KubeCluster);
 
         if (string.IsNullOrEmpty(KubeSecretName) && !string.IsNullOrEmpty(StorePath) && !Capability.Contains("NS") &&
             !Capability.Contains("Cluster"))