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 cni plugins #2024

Merged
merged 8 commits into from
May 10, 2023
Merged

Update cni plugins #2024

merged 8 commits into from
May 10, 2023

Conversation

kschumy
Copy link
Contributor

@kschumy kschumy commented May 10, 2023

Issue #, if available:

Description of changes:
For some reason, go mod tidy is generating an error. Will work on resolving this

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
Copy link
Collaborator

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

@github-actions github-actions bot added patch Pull request that add .patch files project Adds, Removes, or updates GIT_TAG in projects folder v1.22 v1.23 v1.24 v1.25 v1.26 v1.27 labels May 10, 2023
@kschumy kschumy changed the title WIP: Update cni plugins Update cni plugins May 10, 2023
@kschumy kschumy marked this pull request as ready for review May 10, 2023 07:55
@kschumy
Copy link
Contributor Author

kschumy commented May 10, 2023

Locally, had run into this exact issue safchain/ethtool#57

@kschumy
Copy link
Contributor Author

kschumy commented May 10, 2023

testing two different solutions out on 1.22 and 1.23. I think 1.23 is correct, but I want to make sure

@kschumy
Copy link
Contributor Author

kschumy commented May 10, 2023

The 1.23 approach, which also updated vendor, was correct. The failure was due to checksums. Updating all in next commit

Copy link
Member

Choose a reason for hiding this comment

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

Need to bump golang/x/text to 0.3.8 in the patch to fix CVE-2021-38561

Copy link
Member

Choose a reason for hiding this comment

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

P.S upstream updated to golang/x/text to 0.5.0 in 1.2.0

Copy link
Member

Choose a reason for hiding this comment

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

@kschumy does the patch need to have go 1.18 instead of go1.17?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

So we should be good not handling that other CVE, right?

Copy link
Member

@zafs23 zafs23 May 10, 2023

Choose a reason for hiding this comment

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

@kschumy it's not the CVE, the project is generated with golang version 1.18 but in the go.mod it is 1.17

Copy link
Contributor Author

Choose a reason for hiding this comment

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

we have that for several projects

@eks-distro-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by:

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

@markapruett
Copy link
Member

/lgtm

@eks-distro-bot eks-distro-bot merged commit 3477c57 into aws:main May 10, 2023
1 check passed
danbudris pushed a commit to danbudris/eks-distro that referenced this pull request Sep 25, 2023
* Bumped cni plugins to 1.2.0 for all versions

* added WIP patch

* Fixed patches(???)

* fix go sum again

* Added vendor to 1.23 only to test vs 1.22, which does not have vendor

* Added correct version of patch to all versions

* checksums

* missed a checksum
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm patch Pull request that add .patch files project Adds, Removes, or updates GIT_TAG in projects folder size/XXL v1.22 v1.23 v1.24 v1.25 v1.26 v1.27
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants