Skip to content
This repository has been archived by the owner on Oct 3, 2024. It is now read-only.

Commit

Permalink
Specify us-east-1 region
Browse files Browse the repository at this point in the history
  • Loading branch information
Lucas Rodriguez committed Nov 29, 2023
1 parent b806299 commit 261add9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -121,16 +121,16 @@ update-zarf-config: ## Generate a new Zarf config file with registry type and IA
deploy-init-package-private: ## Run zarf init to deploy the AWS init package configured with private ECR registry
@cd build || exit \
&& ZARF_CONFIG="../zarf-config.yaml" zarf init \
--registry-url="$$(aws sts get-caller-identity --query 'Account' --output text).dkr.ecr.us-west-2.amazonaws.com" \
--registry-url="$$(aws sts get-caller-identity --query 'Account' --output text).dkr.ecr.us-east-1.amazonaws.com" \
--registry-push-username="AWS" \
--registry-push-password="$$(aws ecr get-login-password --region us-west-2)" \
--registry-push-password="$$(aws ecr get-login-password --region us-east-1)" \
--components="zarf-ecr-credential-helper" \
--confirm

delete-private-repos: ## Delete private ECR repos created by deploying the AWS init package
@repos="defenseunicorns/pepr/controller defenseunicorns/zarf/agent defenseunicorns/zarf-init-aws/ecr-credential-helper"; \
for repo in $${repos}; do \
aws ecr delete-repository --repository-name "$$repo" --force || true; \
aws ecr delete-repository --repository-name "$$repo" --force --region us-east-1 || true; \
done

deploy-init-package-public: ## Run zarf init to deploy the AWS init package configured with public ECR registry
Expand All @@ -145,7 +145,7 @@ deploy-init-package-public: ## Run zarf init to deploy the AWS init package conf
delete-public-repos: ## Delete public ECR repos created by deploying the AWS init package
@repos="defenseunicorns/pepr/controller defenseunicorns/zarf/agent defenseunicorns/zarf-init-aws/ecr-credential-helper"; \
for repo in $${repos}; do \
aws ecr-public delete-repository --repository-name "$$repo" --force || true; \
aws ecr-public delete-repository --repository-name "$$repo" --force --region us-east-1 || true; \
done

# INTERNAL: used to test for new CVEs that may have been introduced
Expand Down
2 changes: 1 addition & 1 deletion zarf-config.example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ package:

deploy:
set:
aws_region: us-west-2
aws_region: us-east-1
registry_type: ""
ecr_hook_role_arn: ""
ecr_credential_helper_role_arn: ""
Expand Down

0 comments on commit 261add9

Please sign in to comment.