Skip to content

Abstract cluster provider to add EKS - #169

Merged
HarshwardhanPatil07 merged 10 commits into
bootc-dev:mainfrom
alicefr:eks-testing
Sep 22, 2026
Merged

Abstract cluster provider to add EKS#169
HarshwardhanPatil07 merged 10 commits into
bootc-dev:mainfrom
alicefr:eks-testing

Conversation

@alicefr

@alicefr alicefr commented Sep 15, 2026

Copy link
Copy Markdown
Collaborator

Abstraction of the cluster provider in order to support simultaneously bink and other kubernetes platform like EKS.

@alicefr alicefr changed the title DNM: Abstract cluster provider to add EKS Abstract cluster provider to add EKS Sep 16, 2026
HarshwardhanPatil07
HarshwardhanPatil07 reviewed Sep 17, 2026
View reviewed changes
Comment thread test/e2e/e2eutil/provider_eks.go
Comment thread test/e2e/e2eutil/provider_eks_test.go
Comment thread test/e2e/e2eutil/provider_eks.go Outdated
@alicefr
alicefr enabled auto-merge (rebase) September 17, 2026 11:08
@alicefr
alicefr disabled auto-merge September 17, 2026 11:08
@alicefr
e2e: add NodeProvider interface and Providers() skip helper
6ebee77 
The NodeProvider interface abstracts the actions for each provider and
will help to introduce additional cluster providers for running the test
suite. Examples are EKS in the near future, or Openshift in the long
run, but it is opened to other k8s platform as well.

Assisted-by: AI
Signed-off-by: Alice Frosi <afrosi@redhat.com>
@alicefr
alicefr force-pushed the eks-testing branch 2 times, most recently from a33bf26 to ead8725 Compare September 21, 2026 08:22
@ptalgulk01

ptalgulk01 commented Sep 21, 2026

Copy link
Copy Markdown
Collaborator

I checked the new TC added is not seen in CI jobs, is it expected?

@alicefr

alicefr commented Sep 21, 2026

Copy link
Copy Markdown
Collaborator Author

I checked the new TC added is not seen in CI jobs, is it expected?

@ptalgulk01 do you mean a CI for EKS, we still don't have a public one. I have tested this in our downstream repository. I know that's not ideal, but we don't have the ability to add public CI at the moment, but it isn't breaking bink testing

cheesesashimi
cheesesashimi reviewed Sep 21, 2026
View reviewed changes

@cheesesashimi cheesesashimi left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Overall, this looks good! I don't have any blocking feedback, only minor suggestions and a few questions mostly for my own edification.

Comment thread test/e2e/e2eutil/provider_bink.go Outdated
Comment thread test/e2e/e2eutil/provider.go
Comment thread test/e2e/e2eutil/provider_eks_test.go
Build()
}

func TestEKSAddNode(t *testing.T) {

@cheesesashimi cheesesashimi Sep 21, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

praise: I really like that there are tests for this!

Comment thread test/e2e/bootcnode_test.go
// registry shares storage with the unauthenticated one (port 5000),
// so the update image is already available at both endpoints.
func TestPullSecretAuth(t *testing.T) {
e2eutil.Providers(t, "bink", "eks")

@cheesesashimi cheesesashimi Sep 21, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

question (non-blocking): Would this be ran via two separate CI jobs where one job targets bink and the other job targets EKS? Or would both be covered via the same CI job?

@alicefr alicefr Sep 21, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

It will be 2 separate CI. For now, we don't have a plan to add EKS to the public CI, but if we have some budget I'd love to. Right now it will simply be a downstream CI.

@alicefr

alicefr commented Sep 21, 2026

Copy link
Copy Markdown
Collaborator Author

Checking if the CI is happy and then I will squash the last commit.

@alicefr
e2e: extract bink node provisioning into BinkProvider
2aea618 
Move bink in its own provider implementation. If no provider is set,
then we assume bink to be default one.

Assisted-by: AI
Signed-off-by: Alice Frosi <afrosi@redhat.com>
@alicefr
e2e: generalize env vars from BINK_* to E2E_*
f0f67f6 
Rename environment variables to decouple e2e tests from the bink
provider:

- BINK_NODE_IMAGE_DIGEST -> E2E_NODE_IMAGE_DIGEST
- BINK_LOCAL_REGISTRY_NODE_IMAGE -> E2E_NODE_IMAGE_REGISTRY
- BINK_NODE_IMAGE_UPDATE_DIGEST -> E2E_NODE_IMAGE_UPDATE_DIGEST
- BINK_NODE_IMAGE_UPDATE2_DIGEST -> E2E_NODE_IMAGE_UPDATE2_DIGEST

Add E2E_PROVIDER=bink to explicitly select the provider.

Signed-off-by: Alice Frosi <afrosi@redhat.com>
@alicefr
e2e: annotate tests with supported providers
796fd96 
For now, we are only targeting the TestPullSecretAuth for EKS since it
requires a pull secret for pulling the container images. Once, this
first work has been merged will tackle the rest of the test suite.

Assisted-by: AI
Signed-off-by: Alice Frosi <afrosi@redhat.com>
@alicefr
e2e: add EKS node provider with AWS SDK v2
4693c09 
Implement EKSProvider that provisions e2e test nodes by launching
standalone EC2 instances that join an existing EKS cluster. The
provider discovers the Auto Scaling group for an eksctl node group
via tags, extracts its launch template, and uses it to launch new
instances.

EKSProvider implements the NodeProvider interface with:
- AddNode: launches an EC2 instance, waits for the k8s node to
  register (polling up to 10 min), and patches labels
- RemoveNode: terminates the EC2 instance and deletes the k8s node

Required env vars: EKS_CLUSTER_NAME, EKS_NODE_GROUP, AWS_REGION

Unit tests cover AddNode and RemoveNode using mock EC2 interfaces
and a fake k8s client.

Assisted-by: AI
Signed-off-by: Alice Frosi <afrosi@redhat.com>
@alicefr
e2e: add e2e-eks Makefile target
38430c4 
Assisted-by: AI
Signed-off-by: Alice Frosi <afrosi@redhat.com>
@alicefr
hack: make gather-logs.sh provider-agnostic
e89ebab 
Previously, gather-logs was using bink ssh, in order to make it
compatible with EKS, let's use a more generic way and use the
bootc-operator daemons to fetch the logs. This will work with each
cluster provider.

Assisted-by: AI
Signed-off-by: Alice Frosi <afrosi@redhat.com>
@alicefr
e2e: remove unused WithMemory and WithTargetImgRef options
3fc88cc 
Assisted-by: AI
Signed-off-by: Alice Frosi <afrosi@redhat.com>
@alicefr
e2e: refactor env to use full image refs and add auth helpers
b7f955b 
Use full digest-qualified image references per provider instead of
separate registry and digest fields. Add AuthImageRef, RegistryHost,
and extractRegistryHost helpers for pull secret test support.

Assisted-by: AI
Signed-off-by: Alice Frosi <afrosi@redhat.com>
@alicefr
e2e: check Booted.Image instead of ImageDigest in pull secret test
fed6309 
With remote registries the manifest digest and content digest can
differ. Assert on the full image ref which carries the manifest
digest rather than the locally resolved content digest.

Assisted-by: AI
Signed-off-by: Alice Frosi <afrosi@redhat.com>
@alicefr

alicefr commented Sep 22, 2026

Copy link
Copy Markdown
Collaborator Author

@cheesesashimi @HarshwardhanPatil07 CI is green and I solved all the comments. Could you please have a final look to this and if you are fine with it approve it?

HarshwardhanPatil07
HarshwardhanPatil07 approved these changes Sep 22, 2026
View reviewed changes

@HarshwardhanPatil07 HarshwardhanPatil07 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thank you very much!

@HarshwardhanPatil07
HarshwardhanPatil07 merged commit e68672b into bootc-dev:main Sep 22, 2026
11 checks passed
@alicefr

alicefr commented Sep 22, 2026

Copy link
Copy Markdown
Collaborator Author

@Mergifyio backport release-0.1

@mergify

mergify Bot commented Sep 22, 2026 •
edited
Loading

Copy link
Copy Markdown

backport release-0.1

✅ Backports have been created

Details

Cherry-pick of 124c07f has failed:

On branch mergify/bp/release-0.1/pr-169
Your branch is ahead of 'origin/release-0.1' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 124c07f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   test/e2e/crd_smoke_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/e2e/bootcnode_test.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify Bot mentioned this pull request Sep 22, 2026
Closed
@alicefr alicefr mentioned this pull request Sep 22, 2026
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@HarshwardhanPatil07 HarshwardhanPatil07 HarshwardhanPatil07 approved these changes
@ptalgulk01 ptalgulk01 Awaiting requested review from ptalgulk01
@cheesesashimi cheesesashimi Awaiting requested review from cheesesashimi

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@alicefr @ptalgulk01 @cheesesashimi @HarshwardhanPatil07