Skip to content

enable multiarch support in prowjobs #35536

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

enable multiarch support in prowjobs #35536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion config/jobs/kubernetes/test-infra/test-infra-periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ periodics:
labels:
# Enable dind for linters that required docker to run, for example typescript.
preset-dind-enabled: "true"
preset-enable-multiarch-support: "true"
spec:
containers:
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250904-c89b045f57-master
- image: us-central1-docker.pkg.dev/k8s-staging-test-infra/images/kubekins-e2e:v20250904-c89b045f57-master
command:
- runner.sh
args:
Expand Down
2 changes: 1 addition & 1 deletion config/jobs/kubernetes/test-infra/test-infra-postsubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ postsubmits:
preset-kind-volume-mounts: "true"
spec:
containers:
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250904-c89b045f57-master
- image: us-central1-docker.pkg.dev/k8s-staging-test-infra/images/kubekins-e2e:v20250904-c89b045f57-master
command:
- runner.sh
args:
Expand Down
25 changes: 13 additions & 12 deletions config/jobs/kubernetes/test-infra/test-infra-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,18 @@ presubmits:
annotations:
testgrid-dashboards: presubmits-test-infra
- name: pull-test-infra-unit-test
cluster: eks-prow-build-cluster
cluster: k8s-infra-prow-build
branches:
- master
always_run: true
decorate: true
labels:
# Python unit tests run in docker.
preset-dind-enabled: "true"
preset-enable-multiarch-support: "true"
spec:
containers:
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250904-c89b045f57-master
- image: us-central1-docker.pkg.dev/k8s-staging-test-infra/images/kubekins-e2e:v20250904-c89b045f57-master
command:
- runner.sh
args:
Expand All @@ -85,27 +86,26 @@ presubmits:
privileged: true
resources:
requests:
cpu: "8"
cpu: "7"
memory: "8Gi"
limits:
cpu: "8"
cpu: "7"
memory: "8Gi"
annotations:
testgrid-dashboards: presubmits-test-infra
testgrid-tab-name: unit-test
# The following test builds the images specified in .test-infra-misc-images.yaml
- name: pull-test-infra-misc-image-build-test
cluster: eks-prow-build-cluster
cluster: k8s-infra-prow-build
branches:
- ^master$
run_if_changed: '^(\.ko\.yaml|hack/(make-rules|prowimagebuilder)|label_sync/.+\.go|robots/commenter|robots/pr-creator|robots/issue-creator|testgrid/cmd|gcsweb)'
decorate: true
labels:
# Building deck requires docker for typescript compilation.
preset-dind-enabled: "true"
preset-enable-multiarch-support: "true"
spec:
containers:
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250904-c89b045f57-master
- image: us-central1-docker.pkg.dev/k8s-staging-test-infra/images/kubekins-e2e:v20250904-c89b045f57-master
command:
- runner.sh
args:
Expand All @@ -126,17 +126,18 @@ presubmits:
testgrid-dashboards: presubmits-test-infra
testgrid-tab-name: misc-image-build-test
- name: pull-test-infra-verify-lint
cluster: eks-prow-build-cluster
cluster: k8s-infra-prow-build
branches:
- master
always_run: true
decorate: true
labels:
# Enable dind for linters that required docker to run, for example typescript.
preset-dind-enabled: "true"
preset-enable-multiarch-support: "true"
spec:
containers:
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20250904-c89b045f57-master
- image: us-central1-docker.pkg.dev/k8s-staging-test-infra/images/kubekins-e2e:v20250904-c89b045f57-master
command:
- runner.sh
args:
Expand All @@ -147,10 +148,10 @@ presubmits:
privileged: true
resources:
requests:
cpu: "8"
cpu: "7"
memory: "8Gi"
limits:
cpu: "8"
cpu: "7"
memory: "8Gi"
annotations:
testgrid-dashboards: presubmits-test-infra
Expand Down
9 changes: 9 additions & 0 deletions config/prow/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1083,6 +1083,15 @@ presets:
secret:
defaultMode: 256
secretName: prow-job-ssh-private-key

# set this preset to enable jobs to run on both amd64 and arm64 nodes on GKE/AWS
- labels:
preset-enable-multiarch-support: "true"
tolerations:
- effect: NoSchedule
key: kubernetes.io/arch
operator: Equal
value: arm64
# enable GOPROXY by default
- env:
- name: GOPROXY
Expand Down
2 changes: 1 addition & 1 deletion hack/make-rules/verify/yamllint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ LINT_COMMAND=("yamllint" "-c" "config/jobs/.yamllint.conf" "config/jobs" "config
--rm -i \
-v "${REPO_ROOT:?}:${REPO_ROOT:?}" -w "${REPO_ROOT}" \
--security-opt="label=disable" \
"cytopia/yamllint:1.26@sha256:1bf8270a671a2e5f2fea8ac2e80164d627e0c5fa083759862bbde80628f942b2" \
"pipelinecomponents/yamllint:0.35.0@sha256:792a5c9f8c0f3b334996c8c5f9b58f000bd57ff8a87ba54fdd5e8d02679097f9" \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this relevant to the intent of the PR ?
why the switch ?

Copy link
Member Author

@upodroid upodroid Sep 22, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is relevant to this PR. The old image wasn't multi-arch so the lint job that I updated above would fail if it was scheduled on an arm node.

"${LINT_COMMAND[@]:1}"

if [[ -n "${NO_DOCKER:-}" ]]; then
Expand Down