@@ -274,7 +274,7 @@ resource "null_resource" "tiller_tls_ca_certs" {
274
274
interpreter = local. is_windows ? [" PowerShell" , " -Command" ] : [" bash" , " -c" ]
275
275
276
276
command = <<- EOF
277
- ${ var . kubectl_server_endpoint != " " ? " echo \" $KUBECTL_CA_DATA\" > ${ path . module } /kubernetes_server_ca.pem" : " " }
277
+ ${ var . kubectl_server_endpoint != " " ? " echo \" ${ local . env_prefix } KUBECTL_CA_DATA\" > ${ path . module } /kubernetes_server_ca.pem" : " " }
278
278
${ lookup (module. require_executables . executables , " kubectl" , " " )} ${ local . esc_newl }
279
279
${ local . kubectl_auth_params } ${ local . esc_newl }
280
280
--namespace ${ var . tiller_tls_ca_cert_secret_namespace } ${ local . esc_newl }
@@ -330,7 +330,7 @@ resource "null_resource" "tiller_tls_certs" {
330
330
interpreter = local. is_windows ? [" PowerShell" , " -Command" ] : [" bash" , " -c" ]
331
331
332
332
command = <<- EOF
333
- ${ var . kubectl_server_endpoint != " " ? " echo \" $KUBECTL_CA_DATA\" > ${ path . module } /kubernetes_server_ca.pem" : " " }
333
+ ${ var . kubectl_server_endpoint != " " ? " echo \" ${ local . env_prefix } KUBECTL_CA_DATA\" > ${ path . module } /kubernetes_server_ca.pem" : " " }
334
334
${ lookup (module. require_executables . executables , " kubectl" , " " )} ${ local . esc_newl }
335
335
${ local . kubectl_auth_params } ${ local . esc_newl }
336
336
--namespace ${ var . namespace } ${ local . esc_newl }
@@ -437,20 +437,21 @@ locals {
437
437
tls_algorithm_config = var. private_key_algorithm == " ECDSA" ? " --tls-private-key-ecdsa-curve ${ var . private_key_ecdsa_curve } " : " --tls-private-key-rsa-bits ${ var . private_key_rsa_bits } "
438
438
439
439
kubergrunt_auth_params = <<- EOF
440
- ${ var . kubectl_server_endpoint != " " ? " --kubectl-server-endpoint \" $KUBECTL_SERVER_ENDPOINT\" --kubectl-certificate-authority \" $KUBECTL_CA_DATA\" --kubectl-token \" $ KUBECTL_TOKEN\" " : " " } ${ local . esc_newl }
440
+ ${ var . kubectl_server_endpoint != " " ? " --kubectl-server-endpoint \" ${ local . env_prefix } KUBECTL_SERVER_ENDPOINT\" --kubectl-certificate-authority \" ${ local . env_prefix } KUBECTL_CA_DATA\" --kubectl-token \" {local.env_prefix} KUBECTL_TOKEN\" " : " " } ${ local . esc_newl }
441
441
${ var . kubectl_config_path != " " ? " --kubeconfig ${ var . kubectl_config_path } " : " " } ${ local . esc_newl }
442
442
${ var . kubectl_config_context_name != " " ? " --kubectl-context-name ${ var . kubectl_config_context_name } " : " " } ${ local . esc_newl }
443
443
EOF
444
444
445
445
446
446
kubectl_auth_params = <<- EOF
447
- ${ var . kubectl_server_endpoint != " " ? " --server \" $KUBECTL_SERVER_ENDPOINT\" --certificate-authority \" ${ path . module } /kubernetes_server_ca.pem\" --token \" $KUBECTL_TOKEN\" " : " " } ${ local . esc_newl }
447
+ ${ var . kubectl_server_endpoint != " " ? " --server \" ${ local . env_prefix } KUBECTL_SERVER_ENDPOINT\" --certificate-authority \" ${ path . module } /kubernetes_server_ca.pem\" --token \" ${ local . env_prefix } KUBECTL_TOKEN\" " : " " } ${ local . esc_newl }
448
448
${ var . kubectl_config_path != " " ? " --kubeconfig ${ var . kubectl_config_path } " : " " } ${ local . esc_newl }
449
449
${ var . kubectl_config_context_name != " " ? " --context ${ var . kubectl_config_context_name } " : " " } ${ local . esc_newl }
450
450
EOF
451
451
452
452
453
453
is_windows = module. os . name == " Windows"
454
+ env_prefix = local. is_windows ? " $env:" : " $"
454
455
esc_newl = local. is_windows ? " `" : " \\ "
455
456
}
456
457
0 commit comments