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

Bump helm from 3.14.2 to 3.14.4 #8119

Merged
merged 1 commit into from
May 8, 2024

Conversation

cxbrowne1207
Copy link
Member

@cxbrowne1207 cxbrowne1207 commented May 8, 2024

Issue #, if available:

Description of changes:
This has already been bumped to 3.14.4 in release/cli. Dependency reviews on 3.14.2 will fail on other branches because of this open alert: https://github.com/aws/eks-anywhere/security/dependabot/105

The plan is to first bump this, and then bump helm direclty to 3.14.4 on the release branch to fix the dependency review and govulncheck

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/S Denotes a PR that changes 10-29 lines, ignoring generated files. label May 8, 2024
Copy link

codecov bot commented May 8, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 73.40%. Comparing base (713026d) to head (8084157).

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #8119   +/-   ##
=======================================
  Coverage   73.40%   73.40%           
=======================================
  Files         577      577           
  Lines       35899    35899           
=======================================
  Hits        26351    26351           
  Misses       7882     7882           
  Partials     1666     1666           

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

@d8660091
Copy link
Member

d8660091 commented May 8, 2024

/lgtm

@cxbrowne1207
Copy link
Member Author

/approve

@eks-distro-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cxbrowne1207

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 8a64e64 into aws:main May 8, 2024
11 checks passed
cxbrowne1207 added a commit to cxbrowne1207/eks-anywhere that referenced this pull request May 8, 2024
cxbrowne1207 added a commit that referenced this pull request May 8, 2024
…8118)

* Bump controller-runtime to v0.16.5 (#7788)

`controller-runtime` v0.16.5

- Fake client breaking changes:
  - Start using `WithStatusSubresource` when we care about status being
    treated differently through `Update` calls. This is basically all
    controllers.
  - Add a finalizer when creating an object directly with a deletion
    timestamp. This make sense since any controller interested in the
    delete flow should be already adding finalizers.
- Signature of `Watches` for creating a controller has been simplified
  and doesn't need the `source.Kind` wrapper.
- Manager options signature has changed. Now metrics and webhook fields
  are nested in its own second level struct.
- Validation webhooks now return a `(admission.Warnings, error)` instead
  of just `error`. We are not using this functionality for now, but we
  had to update all our webhooks and test to follow the new signature.
- `handler.MapFunc` has changed, now they take a context as well. We
  don't use the context but need to conform to the new signature.

`cluster-api` v1.6.2

- When setting up cluster tracker, the variable `DefaultIndexes` is
  removed, now we use `[]Index{NodeProviderIDIndex}`

CAPC

We are still waiting for capc to be updated to capi v1.5, which would
enable us to move to controller-runtime v0.15. It's taking quite long
and we got to the point where this is preventing us from updating
moduled (like helm) that we need to update ASAP.

I opted for "vendoring" just the api structs we need from capc. In order
to contain changes and allow for an easy "revert" to use the original
module (whenever we can), I created a dummy module so I can just use a
`replace` in our go.mod and point to our vendored folder.

I put this in `internal/thirdparty/capc`. You don't need to review that
code, I just copied it.

Assertions in gomock

I had to change some of the assertions in the cluster manager tests. Now
they are less strict since they use type instead of content assertion.
TBH, they were wrong from the beginning since they expected current and
new spec to be the same, so if so, this makes the test slightly better.

I checked and I believe all this is already dead code because of the
workflow refactors we did in v0.19.0. It's just that the code hasn't
been deleted yet. I'll push to get all this crap removed.

CAPV

They just change the package where they have the api structs from
`api/[version]` to `apis/[version]`.

* Bump helm to v3.14.2 (#7797)

bump helm and controller runtime

* Bump x/net (#7945)

bump net/x to fix vulnerability

* go mod tidy

* Bump Go version to 1.21 (#7805)

* Bump helm froo 3.14.2 to 3.14.4 (#8119)

* go mod tidy

* fix linting errors

---------

Co-authored-by: Guillermo Gaston <gaslor@amazon.com>
Co-authored-by: Xu Deng <xudeng@amazon.com>
Co-authored-by: Abhay Krishna <arnchlm@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm 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.

3 participants