Skip to content

Dalec E2E: Use upstream k8s images if no artifacts are built#6258

Merged
k8s-ci-robot merged 1 commit into
kubernetes-sigs:mainfrom
willie-yao:fix-dalec-substitution
Apr 25, 2026
Merged

Dalec E2E: Use upstream k8s images if no artifacts are built#6258
k8s-ci-robot merged 1 commit into
kubernetes-sigs:mainfrom
willie-yao:fix-dalec-substitution

Conversation

@willie-yao
Copy link
Copy Markdown
Contributor

What type of PR is this?
/kind cleanup

What this PR does / why we need it:
This PR accounts for an edge case where a Dalec test is only testing images and a CAPZ community gallery image does not yet exist for that version, the artifacts are set to the wrong version.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests
  • cherry-pick candidate

Release note:

NONE

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. labels Apr 24, 2026
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Apr 24, 2026
@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 24, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 43.88%. Comparing base (e8bd139) to head (97a294b).
⚠️ Report is 3 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #6258      +/-   ##
==========================================
+ Coverage   43.85%   43.88%   +0.03%     
==========================================
  Files         289      289              
  Lines       25341    25351      +10     
==========================================
+ Hits        11113    11125      +12     
+ Misses      13450    13448       -2     
  Partials      778      778              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Copy link
Copy Markdown
Contributor

@mboersma mboersma left a comment

Choose a reason for hiding this comment

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

lgtm, my only real concern is it contains 30 lines of code that is duplicated twice (with one variant). Is it possible to have just one patch file?

# Download all binaries to temp files first, then replace
ALL_UPSTREAM_BINARIES=("kubeadm" "kubectl" "kubelet")
for BINARY in "$${ALL_UPSTREAM_BINARIES[@]}"; do
TEMP_FILE="/tmp/$${BINARY}.download"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

It doesn't really matter in this context, but mktemp can be more portable than hardcoding /tmp.

@willie-yao
Copy link
Copy Markdown
Contributor Author

my only real concern is it contains 30 lines of code that is duplicated twice (with one variant). Is it possible to have just one patch file?

Some of the scripts differ very slightly between distros and control planes / machine deployments have different paths, so I don't think it's trivial to do this with just a single patch file. It could be something to look into as a follow-up though!

Signed-off-by: William Yao <william2000yao@gmail.com>
@willie-yao willie-yao force-pushed the fix-dalec-substitution branch from 36ae260 to 97a294b Compare April 24, 2026 22:38
Copy link
Copy Markdown
Contributor

@mboersma mboersma left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 24, 2026
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

LGTM label has been added.

DetailsGit tree hash: 1e332440ff6cf8fa9af6923a5040b0bb16289aa0

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mboersma

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 24, 2026
@willie-yao
Copy link
Copy Markdown
Contributor Author

/cherry-pick release-1.22

@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

@willie-yao: once the present PR merges, I will cherry-pick it on top of release-1.22 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-1.22

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@willie-yao
Copy link
Copy Markdown
Contributor Author

/cherry-pick release-1.23

@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

@willie-yao: once the present PR merges, I will cherry-pick it on top of release-1.23 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-1.23

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot merged commit 7a7144f into kubernetes-sigs:main Apr 25, 2026
26 of 29 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.24 milestone Apr 25, 2026
@github-project-automation github-project-automation Bot moved this from Todo to Done in CAPZ Planning Apr 25, 2026
@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

@willie-yao: new pull request created: #6259

Details

In response to this:

/cherry-pick release-1.22

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

@willie-yao: new pull request created: #6260

Details

In response to this:

/cherry-pick release-1.23

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

4 participants