Skip to content

Deprecate retry_bootstrap #6050

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.

Sign up for GitHub

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

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Deprecate retry_bootstrap #6050

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
48c8b59
Deprecate retry_bootstrap
kfox1111 May 7, 2025
6ce6beb
Merge branch 'main' into dep_retry_bootstrap
kfox1111 May 7, 2025
8afb026
Use the input
kfox1111 May 7, 2025
6bbb8d7
Merge branch 'dep_retry_bootstrap' of https://github.com/kfox1111/spi…
kfox1111 May 7, 2025
160fa0b
Merge branch 'main' into dep_retry_bootstrap
kfox1111 May 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions cmd/spire-agent/cli/run/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,10 @@ func NewAgentConfig(c *Config, logOptions []log.Option, allowUnknownConfig bool)
ac.LogReopener = log.ReopenOnSignal(logger, reopenableFile)
}

if c.Agent.RetryBootstrap {
ac.Log.Warn("The 'retry_bootstrap' configuration is deprecated. It will be enabled by default in SPIRE 1.13 and the option removed in SPIRE 1.14.")
}

Comment on lines +429 to +432
Copy link
Collaborator

Choose a reason for hiding this comment

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

We are unable to change default behaviors without a complete minor rotation, so we need to move this to 1.14, before removing,
And need to display this to users that are not using it.
Maybe something like this?

Suggested change
if c.Agent.RetryBootstrap {
ac.Log.Warn("The 'retry_bootstrap' configuration is deprecated. It will be enabled by default in SPIRE 1.13 and the option removed in SPIRE 1.14.")
}
if !c.Agent.RetryBootstrap {
ac.Log.Warn("The 'retry_bootstrap' configuration is going to be default in SPIRE 1.14 and the option removed in SPIRE 1.15.")
}

ac.UseSyncAuthorizedEntries = true
if c.Agent.Experimental.UseSyncAuthorizedEntries != nil {
ac.Log.Warn("The 'use_sync_authorized_entries' configuration is deprecated. The option to disable it will be removed in SPIRE 1.13.")
Expand Down
Loading