Skip to content
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.

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

🐛 bootstrap: add support for data secret #2086

Merged
merged 1 commit into from
Nov 14, 2024

Conversation

honza
Copy link
Member

@honza honza commented Nov 12, 2024

We can configure bootstrap by setting ConfigRef or DataSecretName. Here, we correct the logic that determines if bootstrapping is ready to allow the data secret method as well as ConfigRef.

@metal3-io-bot metal3-io-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 12, 2024
We can configure bootstrap by setting `ConfigRef` or `DataSecretName`.
Here, we correct the logic that determines if bootstrapping is ready to
allow the data secret method as well as `ConfigRef`.

Signed-off-by: Honza Pokorny <[email protected]>
@metal3-io-bot metal3-io-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Nov 12, 2024
@dtantsur
Copy link
Member

/test metal3-centos-e2e-integration-test-main
/test metal3-ubuntu-e2e-integration-test-main
/lgtm

@metal3-io-bot metal3-io-bot added the lgtm Indicates that a PR is ready to be merged. label Nov 12, 2024
@Sunnatillo
Copy link
Member

Sunnatillo commented Nov 13, 2024

I think we should not do logic of CABPK provider.
It is already handled here and capm3 should just read from it.

@honza
Copy link
Member Author

honza commented Nov 13, 2024

It is already handled here and capm3 should just read from it.

This is referencing MachinePools.

The Machine reconciler doesn't have the same logic upstream. It will never set BootstrapReady if ConfigRef is empty.

@Sunnatillo
Copy link
Member

It is already handled here and capm3 should just read from it.

This is referencing MachinePools.

The Machine reconciler doesn't have the same logic upstream. It will never set BootstrapReady if ConfigRef is empty.

My bad, in that case
/approve

@metal3-io-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Sunnatillo

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

@metal3-io-bot metal3-io-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 14, 2024
@tuminoid
Copy link
Member

/retest

@tuminoid
Copy link
Member

/retest
Come on Prow ...

@metal3-io-bot metal3-io-bot merged commit d153c62 into metal3-io:main Nov 14, 2024
12 of 13 checks passed
@zaneb
Copy link
Member

zaneb commented Nov 21, 2024

@Sunnatillo I think you were right that it should work that way though. I opened a bug fix upstream: kubernetes-sigs/cluster-api#11459
(Even if that merges there will be lots of broken CAPIs around for a while, so we still need this.)

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. lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants