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

Consider Hetzner network set by cluster spec #8872

Merged
merged 2 commits into from Feb 5, 2022

Conversation

embik
Copy link
Member

@embik embik commented Feb 4, 2022

What does this PR do / Why do we need it:

#6588 introduced a network field for Hetzner on various levels (datacenter and cluster spec). The description suggests that the field on the cluster spec takes precedence over the datacenter field.

Unfortunately, it looks like the implementation back then did not consider the field on the cluster spec level for the generated MachineDeployments and only applied the datacenter-level value.

This can result in MachineDeployments failing to deploy if the datacenter value is not given or set to an empty string, or a mismatch from the network that is defined in CCM settings (as that does consider the cluster spec value):

network := data.Cluster().Spec.Cloud.Hetzner.Network
if network == "" {
network = data.DC().Spec.Hetzner.Network
}

Does this PR close any issues?:
Fixes #8868

Special notes for your reviewer:

Documentation:

Does this PR introduce a user-facing change?:

If a network is set in the Hetzner cluster spec, it is now correctly applied to generated machines

Signed-off-by: Marvin Beckers marvin@kubermatic.com

Signed-off-by: Marvin Beckers <marvin@kubermatic.com>
@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. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. labels Feb 4, 2022
@embik embik requested a review from xrstf February 4, 2022 11:19
@kubermatic-bot kubermatic-bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 4, 2022
@embik
Copy link
Member Author

embik commented Feb 4, 2022

/cherry-pick release/v2.20

@kubermatic-bot
Copy link
Contributor

@embik: once the present PR merges, I will cherry-pick it on top of release/v2.20 in a new PR and assign it to you.

In response to this:

/cherry-pick release/v2.20

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.

@embik
Copy link
Member Author

embik commented Feb 4, 2022

/cherry-pick release/v2.19

@kubermatic-bot
Copy link
Contributor

@embik: once the present PR merges, I will cherry-pick it on top of release/v2.19 in a new PR and assign it to you.

In response to this:

/cherry-pick release/v2.19

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.

Signed-off-by: Marvin Beckers <marvin@kubermatic.com>
Copy link
Contributor

@xrstf xrstf left a comment

Choose a reason for hiding this comment

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

Oh thank god someone fixed this. I experienced some weirdness myself but never got around to investigating where I fucked up.

/approve

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Feb 5, 2022
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 49c031aecb701e8cb2508b11ada0c219a0aeac68

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: embik, xrstf

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

@xrstf
Copy link
Contributor

xrstf commented Feb 5, 2022

/retest

1 similar comment
@xrstf
Copy link
Contributor

xrstf commented Feb 5, 2022

/retest

@kubermatic-triage-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs

Review the full test history

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@kubermatic-bot kubermatic-bot merged commit 8070b5b into kubermatic:master Feb 5, 2022
@kubermatic-bot
Copy link
Contributor

@embik: new pull request created: #8891

In response to this:

/cherry-pick release/v2.20

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.

@kubermatic-bot
Copy link
Contributor

@embik: new pull request created: #8892

In response to this:

/cherry-pick release/v2.19

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.

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. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Hetzner machine spec does not consider network defined in cluster spec - Test Release 2.20
4 participants