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

[maintenance] Support arm64 #3449

Merged
merged 6 commits into from
Nov 15, 2024
Merged

[maintenance] Support arm64 #3449

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
60faaa0
Migrate aws/kubectl from amd on Docker Hub to amd+arm on AWS ECR
imnasnainaec Nov 14, 2024
8278cda
Add public.ecr.aws endpoint
imnasnainaec Nov 14, 2024
fd30892
Add cloudfront.net endpoint
imnasnainaec Nov 14, 2024
9ee1183
Add endpoints to deploy_ workflows
imnasnainaec Nov 14, 2024
0d563ac
Default amd64, not arm64
imnasnainaec Nov 15, 2024
03d24a8
Update README
imnasnainaec Nov 15, 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
2 changes: 2 additions & 0 deletions .github/workflows/deploy_qa.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
egress-policy: block
allowed-endpoints: >
*.actions.githubusercontent.com:443
*.cloudfront.net:443
*.data.mcr.microsoft.com:443
${{ secrets.AWS_ACCOUNT }}.dkr.ecr.${{ secrets.AWS_DEFAULT_REGION }}.amazonaws.com
api.ecr.${{ secrets.AWS_DEFAULT_REGION }}.amazonaws.com:443
Expand All @@ -42,6 +43,7 @@ jobs:
github.com:443
mcr.microsoft.com:443
production.cloudflare.docker.com:443
public.ecr.aws:443
pypi.org:443
registry-1.docker.io:443
registry.npmjs.org:443
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/deploy_release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jobs:
egress-policy: block
allowed-endpoints: >
*.actions.githubusercontent.com:443
*.cloudfront.net:443
*.data.mcr.microsoft.com:443
api.ecr-public.us-east-1.amazonaws.com:443
api.github.com:443
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/maintenance.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@ jobs:
disable-sudo: true
egress-policy: block
allowed-endpoints: >
*.cloudfront.net:443
archive.ubuntu.com:80
auth.docker.io:443
files.pythonhosted.org:443
github.com:443
production.cloudflare.docker.com:443
public.ecr.aws:443
pypi.org:443
registry-1.docker.io:443
security.ubuntu.com:80
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/aws-login/templates/aws-ecr-login-cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
spec:
serviceAccountName: {{ .Values.awsEcr.serviceAccount }}
containers:
- image: {{ .Values.awsEcr.image }}:{{ .Values.awsEcr.imageTag }}
- image: {{ .Values.awsEcr.image }}:{{ .Values.awsEcr.imageVersion }}-{{ .Values.global.cpuArch }}
imagePullPolicy: IfNotPresent
name: {{ .Values.awsEcr.cronJobName }}
command:
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/aws-login/templates/aws-ecr-login-oneshot.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
spec:
serviceAccountName: {{ .Values.awsEcr.serviceAccount }}
containers:
- image: {{ .Values.awsEcr.image }}:{{ .Values.awsEcr.imageTag }}
- image: {{ .Values.awsEcr.image }}:{{ .Values.awsEcr.imageVersion }}-{{ .Values.global.cpuArch }}
imagePullPolicy: IfNotPresent
name: "{{ .Values.awsEcr.jobName }}"
command:
Expand Down
5 changes: 3 additions & 2 deletions deploy/helm/aws-login/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@ global:
awsAccessKeyId: "Override"
awsSecretAccessKey: "Override"
pullSecretName: aws-login-credentials
cpuArch: "arm64"

awsEcr:
configName: aws-ecr-config
cron: yes
cronJobName: ecr-cred-helper-cron
dockerEmail: [email protected]
image: sillsdev/aws-kubectl
imageTag: "0.3.0"
image: "public.ecr.aws/thecombine/aws-kubectl"
imageVersion: "0.4.0"
jobName: ecr-cred-helper
schedule: "0 */8 * * *"
secretsName: aws-ecr-credentials
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/thecombine/charts/maintenance/templates/cronjob-daily-backup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
spec:
serviceAccountName: {{ .Values.serviceAccount.name }}
containers:
- image: sillsdev/aws-kubectl:0.3.0
- image: {{ .Values.awsEcr.image }}:{{ .Values.awsEcr.imageVersion }}-{{ .Values.global.cpuArch }}
imagePullPolicy: Always
name: daily-backup
command:
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/thecombine/charts/maintenance/templates/cronjob-update-fonts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
spec:
serviceAccountName: {{ .Values.serviceAccount.name }}
containers:
- image: sillsdev/aws-kubectl:0.3.0
- image: {{ .Values.awsEcr.image }}:{{ .Values.awsEcr.imageVersion }}-{{ .Values.global.cpuArch }}
imagePullPolicy: Always
name: update-fonts
command:
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/thecombine/charts/maintenance/templates/get-fonts-hook.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
spec:
serviceAccountName: {{ .Values.serviceAccount.name }}
containers:
- image: sillsdev/aws-kubectl:0.3.0
- image: {{ .Values.awsEcr.image }}:{{ .Values.awsEcr.imageVersion }}-{{ .Values.global.cpuArch }}
imagePullPolicy: Always
name: "install-fonts"
command:
Expand Down
6 changes: 5 additions & 1 deletion deploy/helm/thecombine/charts/maintenance/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ global:
imageRegistry: ""
# Default AWS S3 location
awsS3Location: "thecombine.app"
cpuArch: "arm64"

imageName: combine_maint

Expand All @@ -34,7 +35,10 @@ serviceAccount:
role: role-maintenance
roleBinding: role-maintenance-binding

serviceAccount.name: account-maintenance
awsEcr:
image: "public.ecr.aws/thecombine/aws-kubectl"
imageVersion: "0.4.0"

#######################################
# Variables controlling backups
#######################################
Expand Down
2 changes: 1 addition & 1 deletion maintenance/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# - ARM 64-bit
############################################################

FROM sillsdev/aws-kubectl:0.3.0
FROM public.ecr.aws/thecombine/aws-kubectl:0.4.0-$TARGETARCH

USER root

Expand Down
Loading