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

Update AMI filter for rocky linux #1803

Merged
merged 1 commit into from
Jun 3, 2024

Conversation

ahmedwaleedmalik
Copy link
Member

@ahmedwaleedmalik ahmedwaleedmalik commented Jun 3, 2024

What this PR does / why we need it:
*Rocky-8-EC2-8*.x86_64 doesn't work anymore and we need to drop -8* https://github.com/kubermatic/kubeone/blob/main/examples/terraform/aws/variables.tf#L220

Which issue(s) this PR fixes:

Fixes #

What type of PR is this?

/kind chore

Special notes for your reviewer:

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

NONE

Documentation:

NONE

@ahmedwaleedmalik ahmedwaleedmalik self-assigned this Jun 3, 2024
@kubermatic-bot kubermatic-bot added release-note-none Denotes a PR that doesn't merit a release note. kind/chore Updating grunt tasks etc; no production code changes. docs/none Denotes a PR that doesn't need documentation (changes). 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. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 3, 2024
@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Jun 3, 2024
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 3a83a9ef149c07b27a44001e97571af2419e7098

@ahmedwaleedmalik
Copy link
Member Author

/approve

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ahmedwaleedmalik

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 3, 2024
@kubermatic-bot kubermatic-bot merged commit 2447748 into kubermatic:main Jun 3, 2024
12 checks passed
@ahmedwaleedmalik ahmedwaleedmalik deleted the rocky-ami branch June 3, 2024 10:02
@xrstf
Copy link
Contributor

xrstf commented Jun 5, 2024

/cherrypick release/v1.57

@xrstf
Copy link
Contributor

xrstf commented Jun 5, 2024

/cherrypick release/v1.58

@xrstf
Copy link
Contributor

xrstf commented Jun 5, 2024

/cherrypick release/v1.59

@kubermatic-bot
Copy link
Contributor

@xrstf: #1803 failed to apply on top of branch "release/v1.57":

Applying: Update AMI filter for rocky linux
Using index info to reconstruct a base tree...
M	pkg/cloudprovider/provider/aws/provider.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/cloudprovider/provider/aws/provider.go
CONFLICT (content): Merge conflict in pkg/cloudprovider/provider/aws/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 Update AMI filter for rocky linux
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:

/cherrypick release/v1.57

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

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

Applying: Update AMI filter for rocky linux
Using index info to reconstruct a base tree...
M	pkg/cloudprovider/provider/aws/provider.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/cloudprovider/provider/aws/provider.go
CONFLICT (content): Merge conflict in pkg/cloudprovider/provider/aws/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 Update AMI filter for rocky linux
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:

/cherrypick 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/test-infra repository.

@kubermatic-bot
Copy link
Contributor

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

Applying: Update AMI filter for rocky linux
Using index info to reconstruct a base tree...
M	pkg/cloudprovider/provider/aws/provider.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/cloudprovider/provider/aws/provider.go
CONFLICT (content): Merge conflict in pkg/cloudprovider/provider/aws/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 Update AMI filter for rocky linux
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:

/cherrypick 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/test-infra repository.

kubermatic-bot pushed a commit that referenced this pull request Jun 5, 2024
* [release/v1.59] Update AMI filter for rocky linux (#1803)

* pin cluster-exposer to KKP 2.25 (Go 1.22)

---------

Co-authored-by: Waleed Malik <[email protected]>
kubermatic-bot pushed a commit that referenced this pull request Jun 5, 2024
…to 1.4.3 (#1808)

* [release/v1.58] Update AMI filter for rocky linux (#1803)

* pin cluster-exposer to KKP 2.24 (Go 1.21)

* bump OSM to 1.4.3

---------

Co-authored-by: Waleed Malik <[email protected]>
kubermatic-bot pushed a commit that referenced this pull request Jun 5, 2024
…to 1.3.6 (#1807)

* [release/v1.57] Update AMI filter for rocky linux (#1803)

* bump OSM to 1.3.6

---------

Co-authored-by: Waleed Malik <[email protected]>
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). kind/chore Updating grunt tasks etc; no production code 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants