-
Notifications
You must be signed in to change notification settings - Fork 38.7k
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
kubeadm: add a Timeouts struct to v1beta4 #122529
Merged
k8s-ci-robot
merged 6 commits into
kubernetes:master
from
neolit123:1.30-v1beta4-timeouts
Jan 15, 2024
+1,187
−552
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
492c061
kubeadm: add a Timeouts struct to v1beta4
neolit123 ea0fa41
kubeadm: implement mutators for "config migrate"
neolit123 d9e4870
kubeadm: make the active timeouts structure accessible from anywhere
neolit123 374e41c
kubeadm: replace deprecated wait.Poll() and wait.PollImmediate()
neolit123 caf5311
kubeadm: start using the Timeouts struct values
neolit123 5f876b9
kubeadm: switch from ExponentialBackoff() to PollUntilContextTimeout()
neolit123 File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
/* | ||
Copyright 2023 The Kubernetes Authors. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package kubeadm | ||
|
||
import ( | ||
"sync" | ||
|
||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
"k8s.io/kubernetes/cmd/kubeadm/app/constants" | ||
) | ||
|
||
// SetDefaultTimeouts sets an internal Timeouts struct to its default values. | ||
func SetDefaultTimeouts(t **Timeouts) { | ||
*t = &Timeouts{ | ||
ControlPlaneComponentHealthCheck: &metav1.Duration{Duration: constants.ControlPlaneComponentHealthCheckTimeout}, | ||
KubeletHealthCheck: &metav1.Duration{Duration: constants.KubeletHealthCheckTimeout}, | ||
KubernetesAPICall: &metav1.Duration{Duration: constants.KubernetesAPICallTimeout}, | ||
EtcdAPICall: &metav1.Duration{Duration: constants.EtcdAPICallTimeout}, | ||
TLSBootstrap: &metav1.Duration{Duration: constants.TLSBootstrapTimeout}, | ||
Discovery: &metav1.Duration{Duration: constants.DiscoveryTimeout}, | ||
} | ||
} | ||
|
||
var ( | ||
activeTimeouts *Timeouts = nil | ||
timeoutMutex = &sync.RWMutex{} | ||
) | ||
|
||
func init() { | ||
SetDefaultTimeouts(&activeTimeouts) | ||
} | ||
|
||
// GetActiveTimeouts gets the active timeouts structure. | ||
func GetActiveTimeouts() *Timeouts { | ||
timeoutMutex.RLock() | ||
defer timeoutMutex.RUnlock() | ||
return activeTimeouts | ||
} | ||
|
||
// SetActiveTimeouts sets the active timeouts structure. | ||
func SetActiveTimeouts(timeouts *Timeouts) { | ||
timeoutMutex.Lock() | ||
activeTimeouts = timeouts.DeepCopy() | ||
timeoutMutex.Unlock() | ||
} |
This file contains 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
This file contains 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
This file contains 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
32 changes: 12 additions & 20 deletions
32
cmd/kubeadm/app/apis/kubeadm/v1beta3/zz_generated.conversion.go
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we mention the default value here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i have been waiting for API machinery to add the
+default=xx
feature, but looks like it's still WIP.we are not consistent about showing defaults in godoc comments in the kubeadm's API. users have to use
config print xx-defaults
to see them. might be a good idea to put all the defaults as part of this PR in godoc form.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
updated to mention defaults in the v1beta4 public type