Made logging consistent between bash and powershell

OctopusDeploy · Nov 8, 2018 · 4ae9cbf · 4ae9cbf
1 parent 554cd72
commit 4ae9cbf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/source/Calamari/Kubernetes/Scripts/KubectlBashContext.sh b/source/Calamari/Kubernetes/Scripts/KubectlBashContext.sh
@@ -159,8 +159,8 @@ get_kubectl
 configure_kubectl_path
 setup_context
 create_namespace
-cat $KUBECONFIG
 echo "##octopus[stdout-verbose]"
+cat $KUBECONFIG
 echo "Invoking target script \"$(get_octopusvariable "OctopusKubernetesTargetScript")\" with $(get_octopusvariable "OctopusKubernetesTargetScriptParameters") parameters"
 echo "##octopus[stdout-default]"
 

diff --git a/source/Calamari/Kubernetes/Scripts/KubectlPowershellContext.ps1 b/source/Calamari/Kubernetes/Scripts/KubectlPowershellContext.ps1
@@ -183,8 +183,9 @@ Write-Host "##octopus[stdout-verbose]"
 ConfigureKubeCtlPath
 SetupContext
 CreateNamespace
+echo "##octopus[stdout-verbose]"
 Get-Content $env:KUBECONFIG
-Write-Host "##octopus[stdout-default]"
 Write-Verbose "Invoking target script $OctopusKubernetesTargetScript with $OctopusKubernetesTargetScriptParameters parameters"
+echo "##octopus[stdout-default]"
 
 Invoke-Expression ". `"$OctopusKubernetesTargetScript`" $OctopusKubernetesTargetScriptParameters"