Skip to content

Fix bug with handling server types and add new Hetzner server types #1877

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

Merged
merged 3 commits into from
Nov 15, 2024

Conversation

adoi
Copy link
Contributor

@adoi adoi commented Nov 14, 2024

What this PR does / why we need it:
Fixes handling Hetzner server types. When no error was returned while we were running prowjobs in Hetzner, Hetzner client was returning a nil server type, we had no check for this, which later resulted in test failures after Hetzner had deprecated support for cx11 server types.

This pr also adds cx22 to server types for our e2e tests, after Hetzner deprecation of cx11: https://docs.hetzner.com/cloud/servers/deprecated-plans/

Which issue(s) this PR fixes:

Fixes #

What type of PR is this?

/kind bug
/kind chore

Special notes for your reviewer:

Does this PR introduce a user-facing change? Then add your Release Note here:

NONE

Documentation:

NONE

Signed-off-by: Adonis Murati <[email protected]>
@kubermatic-bot kubermatic-bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. labels Nov 14, 2024
@kubermatic-bot
Copy link
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@kubermatic-bot kubermatic-bot added sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. do-not-merge/docs-needed Indicates that a PR should not merge because it's missing one of the documentation labels. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Nov 14, 2024
@adoi
Copy link
Contributor Author

adoi commented Nov 14, 2024

/test pull-machine-controller-e2e-hetzner

@kubermatic-bot kubermatic-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Nov 15, 2024
@adoi
Copy link
Contributor Author

adoi commented Nov 15, 2024

/test pull-machine-controller-e2e-hetzner

@kubermatic-bot kubermatic-bot added release-note-none Denotes a PR that doesn't merit a release note. docs/none Denotes a PR that doesn't need documentation (changes). and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. do-not-merge/docs-needed Indicates that a PR should not merge because it's missing one of the documentation labels. labels Nov 15, 2024
@adoi adoi marked this pull request as ready for review November 15, 2024 12:01
@kubermatic-bot kubermatic-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 15, 2024
@adoi adoi changed the title test hetzner e2e test Fix bug with handling server types and add new Hetzner server types Nov 15, 2024
@adoi adoi assigned adoi and unassigned xrstf Nov 15, 2024
@adoi adoi requested a review from xrstf November 15, 2024 12:52
@xrstf
Copy link
Contributor

xrstf commented Nov 15, 2024

/approve
/lgtm

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Nov 15, 2024
@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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

@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 4b4a05e9aef74c19184e698251f797753b0fdb52

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 15, 2024
@kubermatic-bot kubermatic-bot merged commit 51cf731 into kubermatic:main Nov 15, 2024
13 checks passed
@ahmedwaleedmalik
Copy link
Member

/cherry-pick release/v1.60

@kubermatic-bot
Copy link
Contributor

@ahmedwaleedmalik: new pull request created: #1884

In response to this:

/cherry-pick release/v1.60

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-sigs/prow repository.

@ahmedwaleedmalik
Copy link
Member

/cherry-pick release/v1.59

@ahmedwaleedmalik
Copy link
Member

/cherry-pick release/v1.58

@kubermatic-bot
Copy link
Contributor

@ahmedwaleedmalik: #1877 failed to apply on top of branch "release/v1.59":

Applying: test hetzner e2e test
Using index info to reconstruct a base tree...
M	pkg/cloudprovider/provider/hetzner/provider.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/cloudprovider/provider/hetzner/provider.go
CONFLICT (content): Merge conflict in pkg/cloudprovider/provider/hetzner/provider.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 test hetzner e2e test
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release/v1.59

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-sigs/prow repository.

@kubermatic-bot
Copy link
Contributor

@ahmedwaleedmalik: #1877 failed to apply on top of branch "release/v1.58":

Applying: test hetzner e2e test
Using index info to reconstruct a base tree...
M	pkg/cloudprovider/provider/hetzner/provider.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/cloudprovider/provider/hetzner/provider.go
CONFLICT (content): Merge conflict in pkg/cloudprovider/provider/hetzner/provider.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 test hetzner e2e test
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release/v1.58

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-sigs/prow repository.

@ahmedwaleedmalik
Copy link
Member

I don't really know if this is required for 1.59 and 1.58 or not. For now, we just need this for #1883

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. docs/none Denotes a PR that doesn't need documentation (changes). lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. 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.

4 participants