Skip to content
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

Jump to bottom

🐛 fix: fix reading of semver for kube version #158

Merged
merged 1 commit into from
Sep 13, 2019
Merged

🐛 fix: fix reading of semver for kube version #158

merged 1 commit into from
Sep 13, 2019

Conversation

rsmitty
Copy link
Contributor

@rsmitty rsmitty commented Sep 13, 2019 •
edited
Loading

What this PR does / why we need it:

This PR updates how we parse the kubernetes version in the
instances.go and allows it to pass the semver check during machine creation.

Signed-off-by: Spencer Smith robertspencersmith@gmail.com

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #156

@k8s-ci-robot k8s-ci-robot added do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Sep 13, 2019
@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Sep 13, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @rsmitty. Thanks for your PR.

I'm waiting for a kubernetes-sigs or kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Sep 13, 2019
@rsmitty
Copy link
Contributor Author

rsmitty commented Sep 13, 2019

@vincepri This should be closer to what you were looking for. Still allows for input of v1.x.y in the yaml files.

vincepri
vincepri approved these changes Sep 13, 2019
View reviewed changes
Copy link
Member

@vincepri vincepri left a comment

Choose a reason for hiding this comment

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

/approve
/ok-to-test

@rsmitty You'll need to remove the Fixes ... from the commit description to make the invalid commit message error go away

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Sep 13, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rsmitty, vincepri

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 13, 2019
@rsmitty rsmitty force-pushed the version-fix branch 2 times, most recently from 205dadd to d10ecea Compare September 13, 2019 15:05
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Sep 13, 2019
jdef
jdef reviewed Sep 13, 2019
View reviewed changes
cloud/services/compute/instances.go
@@ -61,7 +62,11 @@ func (s *Service) CreateInstance(scope *scope.MachineScope) (*compute.Instance,
scope.Name(), scope.Namespace())
}

version, err := semver.Make(*scope.Machine.Spec.Version)
Copy link
Contributor

Choose a reason for hiding this comment

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

Instead of manual parsing, maybe use ParseTolerant (instead of Make).

@rsmitty
🐛 fix: fix reading of semver for kube version
2ec9377 
This PR updates how we parse the kubernetes version in the
instances.go and allows it to pass the semver check during machine creation.

Signed-off-by: Spencer Smith <robertspencersmith@gmail.com>
@rsmitty rsmitty changed the title 🐛 fix: remove leading v from kube version 🐛 fix: fix reading of semver for kube version Sep 13, 2019
@rsmitty
Copy link
Contributor Author

rsmitty commented Sep 13, 2019

@jdef @vincepri okay, updated to use parse tolerant. feels much cleaner, thanks for the pointer to that function! also added in the v for the default source image.

vincepri
vincepri approved these changes Sep 13, 2019
View reviewed changes
Copy link
Member

@vincepri vincepri left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 13, 2019
@k8s-ci-robot k8s-ci-robot merged commit 363d9ea into kubernetes-sigs:master Sep 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jdef jdef jdef left review comments

@vincepri vincepri vincepri approved these changes

@detiber detiber Awaiting requested review from detiber

Assignees

@vincepri vincepri

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Error when creating machines b/c of k8s version
4 participants
@rsmitty @k8s-ci-robot @jdef @vincepri