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.

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

CoreOS host architecture detection fix #882

Merged
merged 4 commits into from
Apr 27, 2020
Merged

CoreOS host architecture detection fix #882

merged 4 commits into from
Apr 27, 2020

Conversation

kron4eg
Copy link
Member

@kron4eg kron4eg commented Apr 26, 2020

What this PR does / why we need it:
Ported fixes for coreOS from #795
Plus golden tests

Fixed CoreOS host architecture detection

@kron4eg kron4eg requested a review from xmudrii April 26, 2020 22:32
@kubermatic-bot kubermatic-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. labels Apr 26, 2020
@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kron4eg

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

@kubermatic-bot kubermatic-bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Apr 26, 2020
Signed-off-by: Artiom Diomin <[email protected]>
func genCluster() kubeone.KubeOneCluster {
return kubeone.KubeOneCluster{
Versions: kubeone.VersionConfig{
Kubernetes: "v1.17.4",
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
Kubernetes: "v1.17.4",
Kubernetes: "1.17.4",

The leading v in the version generates invalid scripts. Do we have some sort of validation or do we drop the leading v if the user provides it?

Copy link
Member Author

Choose a reason for hiding this comment

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

kubeone.KubeOneCluster is validated and defaulted of course, long before it get to this point.

Copy link
Member

Choose a reason for hiding this comment

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

I've tested this and if the user provides a config file such as the following one, provisioning would fail.

apiVersion: kubeone.io/v1alpha1
kind: KubeOneCluster
versions:
  kubernetes: "v1.18.2"
cloudProvider:
  name: aws

We should add a validation rule or defaulting to default to the version without the leading v. If you prefer, we can do it in a follow-up.

Copy link
Member Author

Choose a reason for hiding this comment

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

heh, yeah, v, err := semver.NewVersion(version.Kubernetes) will parse with v or without successfully.

Signed-off-by: Artiom Diomin <[email protected]>
@kron4eg
Copy link
Member Author

kron4eg commented Apr 27, 2020

/retest

Copy link
Member

@xmudrii xmudrii left a comment

Choose a reason for hiding this comment

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

/lgtm

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Apr 27, 2020
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 02eb08228b84c4237214f29702e7174e9b37409a

@xmudrii xmudrii mentioned this pull request Apr 27, 2020
2 tasks
@kubermatic-bot kubermatic-bot merged commit 68aa7b6 into master Apr 27, 2020
@kubermatic-bot kubermatic-bot added this to the v1.0 milestone Apr 27, 2020
@kubermatic-bot kubermatic-bot deleted the coreos-fix branch April 27, 2020 11:20
@kron4eg
Copy link
Member Author

kron4eg commented Apr 27, 2020

xref #870

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants