Skip to content

Normalize the hardcoded images used for warmpool pre-pulling#17144

Merged
k8s-ci-robot merged 5 commits intokubernetes:masterfrom
rifelpet:warmpool-containerproxy
Jul 16, 2025
Merged

Normalize the hardcoded images used for warmpool pre-pulling#17144
k8s-ci-robot merged 5 commits intokubernetes:masterfrom
rifelpet:warmpool-containerproxy

Conversation

@rifelpet
Copy link
Copy Markdown
Member

@rifelpet rifelpet commented Dec 17, 2024

Fixes #16871

When AWS WarmPool is enabled, nodeup pre-pulls a hardcoded list of images based on the cluster's assets:

https://github.com/rifelpet/kops/blob/4a882890ff2addb1ae0f69f93280102969ab64d3/pkg/nodemodel/nodeupconfigbuilder.go#L490-L507

When a cluster has:

spec:
  assets:
    containerProxy: public.ecr.aws/1234

All of the assets are remapped to begin with the containerProxy value. This results in the WarmPool logic not matching against any of the cluster's assets, and nodeup doesn't treat the instance as being in the warm pool.

Now we run the hardcoded images through the same remapping logic to ensure its matched against any images used in the cluster's assets.

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Dec 17, 2024

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 17, 2024
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 17, 2024
@rifelpet rifelpet marked this pull request as ready for review December 17, 2024 05:10
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 17, 2024
@rifelpet
Copy link
Copy Markdown
Member Author

rifelpet commented Dec 17, 2024

/hold
for manual testing with the e2e job's KOPS_BASE_URL.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 17, 2024
@rifelpet rifelpet force-pushed the warmpool-containerproxy branch 2 times, most recently from 172ea41 to a01e7b8 Compare December 19, 2024 01:22
@rifelpet rifelpet mentioned this pull request Dec 19, 2024
Closed
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Jan 20, 2025

@rifelpet: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-kops-e2e-cni-flannel a01e7b8 link true /test pull-kops-e2e-cni-flannel
pull-kops-e2e-gce-cni-calico a01e7b8 link true /test pull-kops-e2e-gce-cni-calico
pull-kops-e2e-gce-cni-kindnet a01e7b8 link true /test pull-kops-e2e-gce-cni-kindnet
pull-kops-e2e-k8s-aws-amazonvpc-u2404 a01e7b8 link true /test pull-kops-e2e-k8s-aws-amazonvpc-u2404

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Details

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. I understand the commands that are listed here.

@rifelpet rifelpet mentioned this pull request Feb 4, 2025
Closed
@k8s-triage-robot
Copy link
Copy Markdown

k8s-triage-robot commented Apr 20, 2025

The Kubernetes project currently lacks enough contributors to adequately respond to all PRs.

This bot triages PRs according to the following rules:

  • After 90d of inactivity, lifecycle/stale is applied
  • After 30d of inactivity since lifecycle/stale was applied, lifecycle/rotten is applied
  • After 30d of inactivity since lifecycle/rotten was applied, the PR is closed

You can:

  • Mark this PR as fresh with /remove-lifecycle stale
  • Close this PR with /close
  • Offer to help out with Issue Triage

Please send feedback to sig-contributor-experience at kubernetes/community.

/lifecycle stale

@k8s-ci-robot k8s-ci-robot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Apr 20, 2025
@k8s-triage-robot
Copy link
Copy Markdown

k8s-triage-robot commented May 20, 2025

The Kubernetes project currently lacks enough active contributors to adequately respond to all PRs.

This bot triages PRs according to the following rules:

  • After 90d of inactivity, lifecycle/stale is applied
  • After 30d of inactivity since lifecycle/stale was applied, lifecycle/rotten is applied
  • After 30d of inactivity since lifecycle/rotten was applied, the PR is closed

You can:

  • Mark this PR as fresh with /remove-lifecycle rotten
  • Close this PR with /close
  • Offer to help out with Issue Triage

Please send feedback to sig-contributor-experience at kubernetes/community.

/lifecycle rotten

@k8s-ci-robot k8s-ci-robot added lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. and removed lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. labels May 20, 2025
@rifelpet rifelpet force-pushed the warmpool-containerproxy branch from a01e7b8 to 42d1264 Compare June 12, 2025 02:47
@rifelpet
Copy link
Copy Markdown
Member Author

rifelpet commented Jun 12, 2025

/retest

@hakman
Copy link
Copy Markdown
Member

hakman commented Jul 4, 2025

/remove-lifecycle rotten

@k8s-ci-robot k8s-ci-robot removed the lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. label Jul 4, 2025
@hakman
Copy link
Copy Markdown
Member

hakman commented Jul 4, 2025

@rifelpet anything left to do here?

@rifelpet rifelpet force-pushed the warmpool-containerproxy branch from 42d1264 to 9fe0a2e Compare July 16, 2025 03:18
rifelpet
rifelpet commented Jul 16, 2025
View reviewed changes
Comment thread tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-nodes_content
Comment on lines 63 to +67
warmPoolImages:
- quay.io/cilium/cilium:v1.16.7
- quay.io/cilium/operator:v1.16.7
- registry.k8s.io/kube-proxy:v1.32.0
- registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.0
- kops.k8s.io/remapped-image/cilium/cilium:v1.16.7
- kops.k8s.io/remapped-image/cilium/operator:v1.16.7
- kops.k8s.io/remapped-image/kube-proxy:v1.32.0
- kops.k8s.io/remapped-image/provider-aws/cloud-controller-manager:v1.31.0
Copy link
Copy Markdown
Member Author

@rifelpet rifelpet Jul 16, 2025

Choose a reason for hiding this comment

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

this is the relevant test output

@rifelpet
Copy link
Copy Markdown
Member Author

rifelpet commented Jul 16, 2025

@rifelpet anything left to do here?

@hakman this should be ready for review

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

k8s-ci-robot commented Jul 16, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman

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 Jul 16, 2025
@rifelpet
Copy link
Copy Markdown
Member Author

rifelpet commented Jul 16, 2025

/retest
/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 16, 2025
@k8s-ci-robot k8s-ci-robot merged commit 6ac7fcc into kubernetes:master Jul 16, 2025
26 checks passed
@hakman hakman mentioned this pull request Feb 17, 2026
Merged
k8s-ci-robot added a commit that referenced this pull request Feb 17, 2026
@k8s-ci-robot
Merge pull request #17977 from hakman/automated-cherry-pick-of-#17144-#…
d32141f 
…17861-upstream-release-1.33

Automated cherry pick of #17144: Normalize the hardcoded images used for warmpool pre-pulling
#17861: Feature: pull user defined images for warm pool instances
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@hakman hakman hakman approved these changes

@johngmyers johngmyers Awaiting requested review from johngmyers

@olemarkus olemarkus Awaiting requested review from olemarkus

Assignees

@hakman hakman

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. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Kops cluster upgrade from 1.28.7 to 1.29.2 - warmpool instances join cluster and remain in notReady state

4 participants

@rifelpet @k8s-ci-robot @k8s-triage-robot @hakman