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 EKS-A version in brew to v0.17.4 #6827

Merged
merged 1 commit into from
Oct 16, 2023

Conversation

abhinavmpandey08
Copy link
Member

Issue #, if available:

Description of changes:

Testing (if applicable):

Documentation added/planned (if applicable):

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@eks-distro-bot eks-distro-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Oct 16, 2023
@eks-distro-bot eks-distro-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 16, 2023
@codecov
Copy link

codecov bot commented Oct 16, 2023

Codecov Report

All modified lines are covered by tests ✅

Comparison is base (c50df49) 71.99% compared to head (d949d75) 71.98%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #6827      +/-   ##
==========================================
- Coverage   71.99%   71.98%   -0.01%     
==========================================
  Files         532      532              
  Lines       41597    41597              
==========================================
- Hits        29947    29944       -3     
- Misses       9978     9980       +2     
- Partials     1672     1673       +1     

see 1 file with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@abhinavmpandey08
Copy link
Member Author

/approved

@abhinavmpandey08
Copy link
Member Author

/approve
/cherry-pick release-0.17

@eks-distro-pr-bot
Copy link
Contributor

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

In response to this:

/approve
/cherry-pick release-0.17

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.

@eks-distro-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abhinavmpandey08

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

@eks-distro-bot eks-distro-bot merged commit f1cc039 into aws:main Oct 16, 2023
@eks-distro-pr-bot
Copy link
Contributor

@abhinavmpandey08: #6827 failed to apply on top of branch "release-0.17":

Applying: Update EKS-A version in brew to v0.17.4
Using index info to reconstruct a base tree...
M	release/pkg/test/testdata/main-bundle-release.yaml
M	release/pkg/test/testdata/release-0.17-bundle-release.yaml
M	release/triggers/brew-version-release/CLI_RELEASE_VERSION
Falling back to patching base and 3-way merge...
Auto-merging release/triggers/brew-version-release/CLI_RELEASE_VERSION
CONFLICT (content): Merge conflict in release/triggers/brew-version-release/CLI_RELEASE_VERSION
Auto-merging release/pkg/test/testdata/release-0.17-bundle-release.yaml
CONFLICT (content): Merge conflict in release/pkg/test/testdata/release-0.17-bundle-release.yaml
Auto-merging release/pkg/test/testdata/main-bundle-release.yaml
CONFLICT (content): Merge conflict in release/pkg/test/testdata/main-bundle-release.yaml
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 EKS-A version in brew to v0.17.4
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:

/approve
/cherry-pick release-0.17

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.

@abhinavmpandey08 abhinavmpandey08 deleted the update-brew branch October 16, 2023 20:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants