Use GitVersion to parse version from discovery #2312
Merged
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
openshift-ci
bot
added
the
approved
timflannagan
reviewed
Aug 3, 2021
| serverGitVersion, err := semver.Parse(serverVersion.GitVersion) | ||
| // need to use the gitversion from version.info.String() because minor version is not always Uint value | ||
| // and patch version is not returned as a first class field | ||
| semver, err := semver.Parse(strings.Split(strings.TrimPrefix(serverVersion.String(), "v"), "-")[0]) |
There was a problem hiding this comment.
Just a quick thought - the apimachinery util package has parsing functions available that output a struct, and methods on that struct for retrieving major/minor/patch fields as uints, so you wouldn't need to also convert the string representation to a uint later.
kevinrizza
force-pushed
the
fix-server-version-parsing-catalog-template
branch
from
6fddfd1 to
1da2cb0
Compare
ecordell
approved these changes
Aug 3, 2021
| "github.com/sirupsen/logrus" | ||
| versionUtil "k8s.io/apimachinery/pkg/util/version" |
There was a problem hiding this comment.
supernit: usually lowercase module names?
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: ecordell, kevinrizza The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/lgtm |
In some cases, the discovery client can return a kube server version with the minor version field as a non uint value. To properly parse the value and get all version fields correctly, instead directly parse the GitVersion string for all values of the kube server version
kevinrizza
force-pushed
the
fix-server-version-parsing-catalog-template
branch
from
1da2cb0 to
f391ebb
Compare
|
/lgtm |
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.
Fix an issue with the new catalog templating controller where it was incorrectly parsing the version field from discovery. Instead, directly use the gitVersion value to match the behavior for minKubeVersion requirement parsing.