Merge pull request #26 from openinfradev/add_aws_account_id

add aws account id configuraiton
openinfradev · Feb 15, 2023 · ff25f88 · ff25f88
2 parents a5d14c4 + a4ea6e5
commit ff25f88
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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