Skip to content

Conversation

@snarkychef
Copy link
Member

@snarkychef snarkychef commented Nov 7, 2025

Issue #, if available:
https://github.com/aws/eks-anywhere-internal/issues/3276

Description of changes:
Fixes issues with failing registry mirror package tests.

  1. Changes the hardcoded image uri for the curl pod used in validation of package tests to read from the bundle instead. As the hardcoded image will be missing in the registry mirror.
  2. As some core packages like package controller and credential provider images come from both eks-a bundle and package bundle, we need to make sure images from both these sources are copied to the same destination in the registry mirror.
  3. Fixed the chart registry for copy packages command to match the regional registry logic
  4. Fixed the staging registry instead of hardcoded dev registry
  5. Increased timeout for package controller installation due to expected ecr cred injector network call failure/retries in air gapped environment. Created a task to disable ecr auth when using registry mirror

Testing (if applicable):

./bin/e2e.test -test.run 'TestVSphereKubernetes133UbuntuAuthenticatedRegistryMirrorCuratedPackagesSimpleFlow' -test.v 9

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@eks-distro-bot eks-distro-bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 7, 2025
@codecov
Copy link

codecov bot commented Nov 7, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 70.02%. Comparing base (4a32198) to head (e202eda).
⚠️ Report is 2 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main   #10343      +/-   ##
==========================================
- Coverage   70.02%   70.02%   -0.01%     
==========================================
  Files         680      680              
  Lines       41811    41811              
==========================================
- Hits        29280    29278       -2     
- Misses      10729    10730       +1     
- Partials     1802     1803       +1     

☔ 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.

@snarkychef snarkychef force-pushed the fix-registry-pkg-e2e branch 3 times, most recently from 6e62757 to f825c1d Compare November 14, 2025 21:51
@snarkychef snarkychef force-pushed the fix-registry-pkg-e2e branch 3 times, most recently from 5816d87 to 2b691f2 Compare November 20, 2025 20:45
@snarkychef
Copy link
Member Author

/hold

@snarkychef
Copy link
Member Author

/unhold

@snarkychef
Copy link
Member Author

/approve

@eks-distro-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: snarkychef

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

The pull request process is described here

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

@2ez4szliu
Copy link
Member

/lgtm

@eks-distro-bot eks-distro-bot merged commit c3fbbc5 into aws:main Nov 21, 2025
12 of 13 checks passed
@snarkychef snarkychef deleted the fix-registry-pkg-e2e branch November 21, 2025 00:24
@snarkychef
Copy link
Member Author

/cherry-pick release-0.23

@snarkychef
Copy link
Member Author

/cherry-pick release-0.24

@eks-distro-pr-bot
Copy link
Contributor

@snarkychef: #10343 failed to apply on top of branch "release-0.23":

Applying: fix hardcoded curl pod image to use with registry mirror
Applying: fix copy packages destination to match import images
Using index info to reconstruct a base tree...
M	test/e2e/constants.go
M	test/e2e/vsphere_test.go
M	test/framework/cluster.go
Falling back to patching base and 3-way merge...
Auto-merging test/framework/cluster.go
Auto-merging test/e2e/vsphere_test.go
CONFLICT (content): Merge conflict in test/e2e/vsphere_test.go
Auto-merging test/e2e/constants.go
CONFLICT (content): Merge conflict in test/e2e/constants.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 fix copy packages destination to match import images
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-0.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/test-infra repository.

@eks-distro-pr-bot
Copy link
Contributor

@snarkychef: #10343 failed to apply on top of branch "release-0.24":

Applying: fix hardcoded curl pod image to use with registry mirror
Applying: fix copy packages destination to match import images
Using index info to reconstruct a base tree...
M	test/e2e/constants.go
M	test/e2e/vsphere_test.go
M	test/framework/cluster.go
Falling back to patching base and 3-way merge...
Auto-merging test/framework/cluster.go
Auto-merging test/e2e/vsphere_test.go
CONFLICT (content): Merge conflict in test/e2e/vsphere_test.go
Auto-merging test/e2e/constants.go
CONFLICT (content): Merge conflict in test/e2e/constants.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 fix copy packages destination to match import images
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-0.24

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/test-infra repository.

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

Labels

approved lgtm size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants