feat: expose more SSA options in the upgrade-k8s command#12560
Merged
talos-bot merged 1 commit intosiderolabs:mainfrom Jan 12, 2026
Merged
feat: expose more SSA options in the upgrade-k8s command#12560talos-bot merged 1 commit intosiderolabs:mainfrom
talos-bot merged 1 commit intosiderolabs:mainfrom
Conversation
Orzelius
commented
Jan 8, 2026
|
|
||
| // UpgradeOptions represents Kubernetes control plane upgrade settings. | ||
| type UpgradeOptions struct { | ||
| manifests.SSApplyBehaviorOptions |
Member
Author
There was a problem hiding this comment.
Please let me know if embedding the fields here is a bad idea
smira
reviewed
Jan 8, 2026
smira
reviewed
Jan 8, 2026
Member
This has been there before. |
Orzelius
force-pushed
the
more-ssa-opts
branch
from
4a67faa to
20f1108
Compare
Member
Author
oops, accidentally copied it with the other flags |
smira
reviewed
Jan 9, 2026
| // manifest sync related options | ||
| upgradeK8sCmd.Flags().BoolVar(&upgradeOptions.ForceConflicts, "mamifests-force-conflicts", ssaDefaults.ForceConflicts, "overwrite the fields when applying even if the field manager differs") | ||
| upgradeK8sCmd.Flags().BoolVar(&upgradeOptions.NoPrune, "mamifests-no-prune", ssaDefaults.NoPrune, "whether pruning of previously applied objects should happen after apply") | ||
| upgradeK8sCmd.Flags().StringVar(&upgradeK8sCmdFlags.inventoryPolicy, "mamifests-inventory-policy", ssaDefaults.InventoryPolicy.String(), |
smira
reviewed
Jan 9, 2026
smira
reviewed
Jan 9, 2026
Orzelius
force-pushed
the
more-ssa-opts
branch
3 times, most recently
from
c485627 to
75fb105
Compare
smira
reviewed
Jan 12, 2026
smira
reviewed
Jan 12, 2026
smira
reviewed
Jan 12, 2026
smira
approved these changes
Jan 12, 2026
shanduur
approved these changes
Jan 12, 2026
add the following flags to the upgrade-k8s command: * `--force-conflicts` overwrite the fields when applying even if the field manager differs * `--inventory-policy` string kubernetes SSA inventory policy (one of 'MustMatch', 'AdoptIfNoInventory' or 'AdoptAll') (default "AdoptIfNoInventory") * `--no-prune` whether pruning of previously applied objects should happen after apply * `--prune-timeout` int how long to wait for resources to be pruned in secunds (set to zero to disable waiting for resources to be fully deleted) (default 180) * `--reconcile-timeout` int how long to wait for resources to be prfully reconciled in secunds (set to zero to disable waiting for resources to be fully reoondiled) (default 180) Signed-off-by: Orzelius <33936483+Orzelius@users.noreply.github.com>
Orzelius
force-pushed
the
more-ssa-opts
branch
from
75fb105 to
c839b38
Compare
Member
Author
|
/m |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
add the following flags to the upgrade-k8s command:
--force-conflictsoverwrite the fields when applying even if the field manager differs--inventory-policystring kubernetes SSA inventory policy (one of 'MustMatch', 'AdoptIfNoInventory' or 'AdoptAll') (default "AdoptIfNoInventory")--no-prunewhether pruning of previously applied objects should happen after apply--prune-timeoutint how long to wait for resources to be pruned in secunds (set to zero to disable waiting for resources to be fully deleted) (default 180)--reconcile-timeoutint how long to wait for resources to be prfully reconciled in secunds (set to zero to disable waiting for resources to be fully reoondiled) (default 180)This should be merged once siderolabs/go-kubernetes#39 is merged and released
closes #12495