[Backport release-1.30] chore(backport): make helm timeout backward compatible #5041
Conversation
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
jnummelin
changed the title
ricardomaraschini
force-pushed
the
backport-timeout-fix
branch
from
c92782f
to
214a277
Compare
in the past the helm chart install timeout was moved from an integer to a string. this commit brings back the capability of using integers to set the helm chart timeout. Signed-off-by: Ricardo Maraschini <[email protected]>
ricardomaraschini
force-pushed
the
backport-timeout-fix
branch
from
214a277
to
dcf997f
Compare
twz123
changed the title
twz123
reviewed
Sep 26, 2024
There was a problem hiding this comment.
Some nits in the comments. You can also use git cherry-pick -x to automatically include the cherry-picked commit hash in the cherry-pick's commit message, as e.g. advertised in #5017 (comment).
| Version: "0.0.1", | ||
| Values: "values", | ||
| TargetNS: "default", | ||
| Timeout: k0sv1beta1.BackwardCompatibleDuration( |
There was a problem hiding this comment.
In the original PR, this is below ForceUpgrade.
Comment on lines
+37
to
38
| "github.com/k0sproject/k0s/pkg/apis/k0s/v1beta1" | ||
| k0sv1beta1 "github.com/k0sproject/k0s/pkg/apis/k0s/v1beta1" |
There was a problem hiding this comment.
Suggested change
| "github.com/k0sproject/k0s/pkg/apis/k0s/v1beta1" | |
| k0sv1beta1 "github.com/k0sproject/k0s/pkg/apis/k0s/v1beta1" | |
| k0sv1beta1 "github.com/k0sproject/k0s/pkg/apis/k0s/v1beta1" |
| @@ -159,7 +160,9 @@ func addOpenEBSHelmExtension(helmSpec *k0sv1beta1.HelmExtensions, storageExtensi | |||
| TargetNS: "openebs", | |||
| Version: constant.OpenEBSVersion, | |||
| Values: values, | |||
| Timeout: metav1.Duration{Duration: time.Duration(time.Minute * 30)}, // it takes a while to install openebs | |||
| Timeout: v1beta1.BackwardCompatibleDuration( | |||
There was a problem hiding this comment.
Suggested change
| Timeout: v1beta1.BackwardCompatibleDuration( | |
| Timeout: k0sv1beta1.BackwardCompatibleDuration( |
|
Super-seeded by #5048 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
** this is a backport of #5017**
in the past the helm chart install timeout was moved from an integer to a string. this commit brings back the capability of using integers to set the helm chart timeout.
Type of change
How Has This Been Tested?
Checklist: