From a4ea6e5029d21ec5707ccb6534ec1119a112d236 Mon Sep 17 00:00:00 2001 From: Jugwan Eom Date: Tue, 14 Feb 2023 09:03:44 +0000 Subject: [PATCH] add aws account id configuraiton --- 05_install_decapod.sh | 2 +- conf.sh.example | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/05_install_decapod.sh b/05_install_decapod.sh index d95a230..f326b2d 100755 --- a/05_install_decapod.sh +++ b/05_install_decapod.sh @@ -47,7 +47,7 @@ log_info "... done" log_info "Creating aws secret..." if [[ " ${CAPI_INFRA_PROVIDERS[*]} " =~ " aws " ]]; then - argo submit --from wftmpl/tks-create-aws-conf-secret -n argo -p aws_access_key_id=$AWS_ACCESS_KEY_ID -p aws_secret_access_key=$AWS_SECRET_ACCESS_KEY --watch + argo submit --from wftmpl/tks-create-aws-conf-secret -n argo -p aws_access_key_id=$AWS_ACCESS_KEY_ID -p aws_secret_access_key=$AWS_SECRET_ACCESS_KEY -p aws_account_id=$AWS_ACCOUNT_ID --watch fi log_info "Run prepare-argocd workflow..." diff --git a/conf.sh.example b/conf.sh.example index 8e395ff..a211fc5 100644 --- a/conf.sh.example +++ b/conf.sh.example @@ -9,9 +9,11 @@ TKS_ADMIN_CLUSTER_INFRA_PROVIDER="byoh" declare -a CAPI_INFRA_PROVIDERS=("byoh" "aws") # when 'aws' is an infrastructure provider +# aws account id is obtained through "aws sts get-caller-identity --query Account --output text" command AWS_REGION=ap-northeast-2 AWS_ACCESS_KEY_ID=XXX_MUST_BE_FILLED AWS_SECRET_ACCESS_KEY=XXX_MUST_BE_FILLED +AWS_ACCOUNT_ID=XXX_MUST_BE_FILLED GIT_SVC_USERNAME=XXX_MUST_BE_FILLED GIT_SVC_TOKEN=XXX_MUST_BE_FILLED