Merge pull request #1614 from buildkite/fix/ecr-credential-helper-parameter

Fix/disable EnableECRCredentialHelper parameter

Author: petetomasik

packer/linux/stack/conf/bin/bk-install-elastic-stack.sh

@@ -137,6 +137,7 @@ set_always         "BUILDKITE_TERMINATE_INSTANCE_AFTER_JOB" "$BUILDKITE_TERMINAT
 set_always         "BUILDKITE_TERMINATE_INSTANCE_ON_DISK_FULL" "$BUILDKITE_TERMINATE_INSTANCE_ON_DISK_FULL"
 set_always         "BUILDKITE_PURGE_BUILDS_ON_DISK_FULL" "$BUILDKITE_PURGE_BUILDS_ON_DISK_FULL"
 set_always         "BUILDKITE_ECR_POLICY" "${BUILDKITE_ECR_POLICY:-none}"
+set_always         "ECR_CREDENTIAL_HELPER_ENABLED" "$ECR_CREDENTIAL_HELPER_ENABLED"
 set_always         "BUILDKITE_SECRETS_BUCKET" "$BUILDKITE_SECRETS_BUCKET"
 set_always         "BUILDKITE_SECRETS_BUCKET_REGION" "$BUILDKITE_SECRETS_BUCKET_REGION"
 set_always         "BUILDKITE_STACK_NAME" "$BUILDKITE_STACK_NAME"

packer/linux/stack/conf/buildkite-agent/hooks/environment

@@ -111,7 +111,7 @@ if [[ "${BUILDKITE_ECR_POLICY:-}" != "none" && "${ECR_PLUGIN_ENABLED:-}" == "1"
   export BUILDKITE_PLUGIN_ECR_RETRIES=3
 
   # Allow pipeline-level override, otherwise use CloudFormation parameter
-  set_unless_present "BUILDKITE_PLUGIN_ECR_CREDENTIAL_HELPER" "${ECR_CREDENTIAL_HELPER_ENABLED:-true}"
+  set_unless_present "BUILDKITE_PLUGIN_ECR_CREDENTIAL_HELPER" "${ECR_CREDENTIAL_HELPER_ENABLED:-false}"
 
   # map AWS_ECR_LOGIN_REGISTRY_IDS into the plugin list format
   if [[ -n "${AWS_ECR_LOGIN_REGISTRY_IDS:-}" ]]; then

packer/windows/stack/conf/bin/bk-install-elastic-stack.ps1

@@ -77,6 +77,7 @@ set_always         "BUILDKITE_AGENTS_PER_INSTANCE" "$Env:BUILDKITE_AGENTS_PER_IN
 set_always         "BUILDKITE_TERMINATE_INSTANCE_AFTER_JOB" "$Env:BUILDKITE_TERMINATE_INSTANCE_AFTER_JOB"
 
 set_always         "BUILDKITE_ECR_POLICY" "$Env:BUILDKITE_ECR_POLICY"
+set_always         "ECR_CREDENTIAL_HELPER_ENABLED" "$Env:ECR_CREDENTIAL_HELPER_ENABLED"
 set_always         "BUILDKITE_SECRETS_BUCKET" "$Env:BUILDKITE_SECRETS_BUCKET"
 set_always         "BUILDKITE_SECRETS_BUCKET_REGION" "$Env:BUILDKITE_SECRETS_BUCKET_REGION"
 set_always         "BUILDKITE_STACK_NAME" "$Env:BUILDKITE_STACK_NAME"

packer/windows/stack/conf/buildkite-agent/hooks/environment

@@ -57,7 +57,7 @@ if [[ "${BUILDKITE_ECR_POLICY:-}" != "none" && "${ECR_PLUGIN_ENABLED:-}" == "1"
   export BUILDKITE_PLUGIN_ECR_RETRIES=3
 
   # Allow pipeline-level override, otherwise use CloudFormation parameter
-  set_unless_present "BUILDKITE_PLUGIN_ECR_CREDENTIAL_HELPER" "${ECR_CREDENTIAL_HELPER_ENABLED:-true}"
+  set_unless_present "BUILDKITE_PLUGIN_ECR_CREDENTIAL_HELPER" "${ECR_CREDENTIAL_HELPER_ENABLED:-false}"
 
   # map AWS_ECR_LOGIN_REGISTRY_IDS into the plugin list format
   if [[ -n "${AWS_ECR_LOGIN_REGISTRY_IDS:-}" ]]; then

templates/aws-stack.yml

@@ -921,7 +921,7 @@ Parameters:
     AllowedValues:
       - "true"
       - "false"
-    Default: "true"
+    Default: "false"
 
   EnableDockerLoginPlugin:
     Type: String