Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sets base image builds to push to private ecr #448

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Sets base image builds to push to private ecr #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
611a058
Sets base image builds to push to private ecr
jaxesn Dec 20, 2022
bbe4ad5
Merge remote-tracking branch 'origin/main' into jgw/private-ecr
rcrozean Jan 24, 2024
3e395d3
run make all -C templater
rcrozean Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config/docker-ecr-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"862665599504.dkr.ecr.us-west-2.amazonaws.com": "ecr-login",
"520703868821.dkr.ecr.us-east-1.amazonaws.com": "ecr-login",
"382577505035.dkr.ecr.us-west-2.amazonaws.com": "ecr-login",
"832188789588.dkr.ecr.us-east-1.amazonaws.com": "ecr-login",
"public.ecr.aws": "ecr-login"
}
}
2 changes: 1 addition & 1 deletion jobs/aws/eks-distro-build-tooling/eks-distro-base-periodics-al-2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ periodics:
- name: AL_TAG
value: "2"
- name: IMAGE_REPO
value: "public.ecr.aws/eks-distro-build-tooling"
value: "832188789588.dkr.ecr.us-east-1.amazonaws.com"
- name: ECR_PUBLIC_PUSH_ROLE_ARN
value: "arn:aws:iam::832188789588:role/ECRPublicPushRole"
- name: AWS_REGION
Expand Down
2 changes: 1 addition & 1 deletion jobs/aws/eks-distro-build-tooling/eks-distro-base-periodics-al-2023.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ periodics:
- name: AL_TAG
value: "2023"
- name: IMAGE_REPO
value: "public.ecr.aws/eks-distro-build-tooling"
value: "832188789588.dkr.ecr.us-east-1.amazonaws.com"
- name: ECR_PUBLIC_PUSH_ROLE_ARN
value: "arn:aws:iam::832188789588:role/ECRPublicPushRole"
- name: AWS_REGION
Expand Down
2 changes: 1 addition & 1 deletion jobs/aws/eks-distro-build-tooling/eks-distro-base-postsubmits-al-2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ postsubmits:
- name: AL_TAG
value: "2"
- name: IMAGE_REPO
value: "public.ecr.aws/eks-distro-build-tooling"
value: "832188789588.dkr.ecr.us-east-1.amazonaws.com"
- name: ECR_PUBLIC_PUSH_ROLE_ARN
value: "arn:aws:iam::832188789588:role/ECRPublicPushRole"
- name: AWS_REGION
Expand Down
2 changes: 1 addition & 1 deletion jobs/aws/eks-distro-build-tooling/eks-distro-base-postsubmits-al-2023.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ postsubmits:
- name: AL_TAG
value: "2023"
- name: IMAGE_REPO
value: "public.ecr.aws/eks-distro-build-tooling"
value: "832188789588.dkr.ecr.us-east-1.amazonaws.com"
- name: ECR_PUBLIC_PUSH_ROLE_ARN
value: "arn:aws:iam::832188789588:role/ECRPublicPushRole"
- name: AWS_REGION
Expand Down
10 changes: 9 additions & 1 deletion jobs/aws/eks-distro-build-tooling/eks-distro-base-tag-files-update-postsubmit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,20 @@ postsubmits:
- >
trap 'touch /status/done' EXIT
&&
make update-base-image-other-repos -C $PROJECT_PATH
source scripts/setup_public_ecr_push.sh
&&
make -j 4 update-base-image-other-repos -C $PROJECT_PATH
env:
- name: PROJECT_PATH
value: "eks-distro-base"
- name: AWS_REGION
value: "us-east-1"
- name: IMAGE_REPO
value: "832188789588.dkr.ecr.us-east-1.amazonaws.com"
- name: PUBLIC_IMAGE_REPO
value: "public.ecr.aws/eks-distro-build-tooling"
- name: ECR_PUBLIC_PUSH_ROLE_ARN
value: "arn:aws:iam::832188789588:role/ECRPublicPushRole"
- command:
- sh
args:
Expand Down
2 changes: 1 addition & 1 deletion jobs/aws/eks-distro-build-tooling/eks-distro-base-tooling-quarterly-update-al-2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ periodics:
- name: AL_TAG
value: "2"
- name: IMAGE_REPO
value: "public.ecr.aws/eks-distro-build-tooling"
value: "832188789588.dkr.ecr.us-east-1.amazonaws.com"
- name: ECR_PUBLIC_PUSH_ROLE_ARN
value: "arn:aws:iam::832188789588:role/ECRPublicPushRole"
- name: AWS_REGION
Expand Down
2 changes: 1 addition & 1 deletion jobs/aws/eks-distro-build-tooling/eks-distro-base-tooling-quarterly-update-al-2023.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ periodics:
- name: AL_TAG
value: "2023"
- name: IMAGE_REPO
value: "public.ecr.aws/eks-distro-build-tooling"
value: "832188789588.dkr.ecr.us-east-1.amazonaws.com"
- name: ECR_PUBLIC_PUSH_ROLE_ARN
value: "arn:aws:iam::832188789588:role/ECRPublicPushRole"
- name: AWS_REGION
Expand Down
2 changes: 1 addition & 1 deletion templater/jobs/periodic/eks-distro-build-tooling/eks-distro-base-periodics-al-X.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ envVars:
- name: AL_TAG
value: {{ .alVersion }}
- name: IMAGE_REPO
value: public.ecr.aws/eks-distro-build-tooling
value: 832188789588.dkr.ecr.us-east-1.amazonaws.com
- name: ECR_PUBLIC_PUSH_ROLE_ARN
value: arn:aws:iam::832188789588:role/ECRPublicPushRole
- name: AWS_REGION
Expand Down
2 changes: 1 addition & 1 deletion ...jobs/periodic/eks-distro-build-tooling/eks-distro-base-tooling-quarterly-update-al-X.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ envVars:
- name: AL_TAG
value: {{ .alVersion }}
- name: IMAGE_REPO
value: public.ecr.aws/eks-distro-build-tooling
value: 832188789588.dkr.ecr.us-east-1.amazonaws.com
- name: ECR_PUBLIC_PUSH_ROLE_ARN
value: arn:aws:iam::832188789588:role/ECRPublicPushRole
- name: AWS_REGION
Expand Down
2 changes: 1 addition & 1 deletion templater/jobs/postsubmit/eks-distro-build-tooling/eks-distro-base-postsubmits-al-X.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ envVars:
- name: AL_TAG
value: {{ .alVersion }}
- name: IMAGE_REPO
value: public.ecr.aws/eks-distro-build-tooling
value: 832188789588.dkr.ecr.us-east-1.amazonaws.com
- name: ECR_PUBLIC_PUSH_ROLE_ARN
value: arn:aws:iam::832188789588:role/ECRPublicPushRole
- name: AWS_REGION
Expand Down
9 changes: 8 additions & 1 deletion ...jobs/postsubmit/eks-distro-build-tooling/eks-distro-base-tag-files-update-postsubmit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,18 @@ jobName: eks-distro-base-tag-files-update-postsubmit
runIfChanged: ^EKS_DISTRO_TAG_FILE.yaml$
prCreation: true
commands:
- make update-base-image-other-repos -C $PROJECT_PATH
- source scripts/setup_public_ecr_push.sh
- make -j 4 update-base-image-other-repos -C $PROJECT_PATH
projectPath: eks-distro-base
envVars:
- name: AWS_REGION
value: us-east-1
- name: IMAGE_REPO
value: 832188789588.dkr.ecr.us-east-1.amazonaws.com
- name: PUBLIC_IMAGE_REPO
value: public.ecr.aws/eks-distro-build-tooling
- name: ECR_PUBLIC_PUSH_ROLE_ARN
value: arn:aws:iam::832188789588:role/ECRPublicPushRole
extraRefs:
- baseRef: main
org: eks-distro-pr-bot
Expand Down