Used "kubectl config view" instead of printing raw config (#404)

* Used "kubectl config view" instead of printing raw config * Removed the variable guard, as we now rely on kubectl to mask for us * Restored the variable guard, because config view can still leak details
OctopusDeploy · Jun 10, 2019 · b0772a9 · b0772a9
1 parent 41fc3fa
commit b0772a9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/source/Calamari/Kubernetes/Scripts/KubectlBashContext.sh b/source/Calamari/Kubernetes/Scripts/KubectlBashContext.sh
@@ -165,7 +165,7 @@ configure_kubectl_path
 setup_context
 create_namespace
 if [[ "$Octopus_K8S_OutputKubeConfig" = true ]]; then
-    cat $KUBECONFIG
+    kubectl config view
 fi
 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
@@ -189,7 +189,7 @@ ConfigureKubeCtlPath
 SetupContext
 CreateNamespace
 if ($K8S_OutputKubeConfig -eq $true) {
-	Get-Content $env:KUBECONFIG
+	& $Kubectl_Exe config view
 }
 Write-Verbose "Invoking target script $OctopusKubernetesTargetScript with $OctopusKubernetesTargetScriptParameters parameters"
 Write-Host "##octopus[stdout-default]"