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

Fix flatcar AMI filter #1692

Merged
merged 1 commit into from
Dec 17, 2021
Merged

Conversation

kron4eg
Copy link
Member

@kron4eg kron4eg commented Dec 17, 2021

What this PR does / why we need it:
Seems like recently flatcar got new arm64 images, and THEY starter to return from search query, which leads to incompatible architecture errors between AMI and instance.

This PR fixes that problem

Fix flatcar AMI filter

@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 Dec 17, 2021
@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/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Dec 17, 2021
Signed-off-by: Artiom Diomin <kron82@gmail.com>
@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Dec 17, 2021
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 47a684ba79443742cd7780100807ed6f0ecd7a35

@xmudrii
Copy link
Member

xmudrii commented Dec 17, 2021

/cherrypick release/v1.3

@kubermatic-bot
Copy link
Contributor

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

In response to this:

/cherrypick release/v1.3

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 kubermatic-bot merged commit 3f264d8 into kubermatic:master Dec 17, 2021
@kubermatic-bot kubermatic-bot added this to the KubeOne 1.4 milestone Dec 17, 2021
@kubermatic-bot
Copy link
Contributor

@xmudrii: #1692 failed to apply on top of branch "release/v1.3":

Applying: Fix flatcar AMI filter
Using index info to reconstruct a base tree...
M	examples/terraform/aws/main.tf
M	examples/terraform/aws/output.tf
Falling back to patching base and 3-way merge...
Auto-merging examples/terraform/aws/output.tf
CONFLICT (content): Merge conflict in examples/terraform/aws/output.tf
Auto-merging examples/terraform/aws/main.tf
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix flatcar AMI filter
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.3

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.

kron4eg added a commit to kron4eg/kubeone that referenced this pull request Dec 17, 2021
Signed-off-by: Artiom Diomin <kron82@gmail.com>
@kron4eg kron4eg deleted the flatcar-ami branch December 17, 2021 09:10
@kron4eg
Copy link
Member Author

kron4eg commented Dec 17, 2021

cherry pick: #1693

kubermatic-bot pushed a commit that referenced this pull request Dec 17, 2021
Signed-off-by: Artiom Diomin <kron82@gmail.com>
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/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.

None yet

3 participants