Skip to content

chore(e2e): remove usage of deprecated secure TLS bootstrap client deadline NBC field#8635

Merged
cameronmeissner merged 2 commits into
mainfrom
cameissner/e2e-remove-stls-deadline
Jun 4, 2026
Merged

chore(e2e): remove usage of deprecated secure TLS bootstrap client deadline NBC field#8635
cameronmeissner merged 2 commits into
mainfrom
cameissner/e2e-remove-stls-deadline

Conversation

@cameronmeissner

Copy link
Copy Markdown
Contributor

What this PR does / why we need it:

remove usage of deprecated secure TLS bootstrap client deadline NBC field

Which issue(s) this PR fixes:

Fixes #

Copilot AI left a comment

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.

Pull request overview

This PR updates the E2E test suite to stop using the deprecated SecureTLSBootstrappingConfig.Deadline field, and instead relies on the newer per-RPC secure TLS bootstrapping timeout fields when converting NBC → aksnodeconfigv1 for scriptless scenarios.

Changes:

  • Removed SecureTLSBootstrappingConfig.Deadline overrides from secure TLS bootstrapping fallback E2E scenarios (Linux + Windows).
  • Updated the NBC → aksnodeconfigv1.BootstrappingConfig translation to populate the newer per-step secure TLS bootstrapping timeout fields instead of the deprecated deadline field.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

File Description
e2e/scenario_win_test.go Removes deprecated secure TLS bootstrapping Deadline usage in the Windows 2022 fallback scenario.
e2e/scenario_test.go Removes deprecated secure TLS bootstrapping Deadline usage in multiple Linux fallback scenarios.
e2e/node_config.go Switches scriptless NBC → aksnodeconfigv1 mapping from deprecated deadline to per-RPC secure TLS bootstrapping timeouts.

Comment thread e2e/node_config.go
SecureTlsBootstrappingCustomClientDownloadUrl: to.Ptr(nbc.SecureTLSBootstrappingConfig.GetCustomClientDownloadURL()),
TlsBootstrappingToken: nbc.KubeletClientTLSBootstrapToken,
SecureTlsBootstrappingValidateKubeconfigTimeout: to.Ptr(nbc.SecureTLSBootstrappingConfig.GetValidateKubeconfigTimeout()),
SecureTlsBootstrappingGetAccessTokenTimeout: to.Ptr(nbc.SecureTLSBootstrappingConfig.GetGetAccessTokenTimeout()),

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.

naming nit: GetGetAccessTokenTimeout the naming looks awkward

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

can't change that in this PR, I might look at changing in a separate PR

@cameronmeissner cameronmeissner merged commit 6f34bad into main Jun 4, 2026
26 of 30 checks passed
@cameronmeissner cameronmeissner deleted the cameissner/e2e-remove-stls-deadline branch June 4, 2026 16:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants