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 eksctl-io main merge to brave-intl main #593

Merged
merged 1 commit into from
Aug 4, 2024

Conversation

hspencer77
Copy link

Description

Checklist

  • Added tests that cover your change (if possible)
  • Added/modified documentation as required (such as the README.md, or the userdocs directory)
  • Manually tested
  • Made sure the title of the PR is a good description that can go into the release notes
  • (Core team) Added labels for change area (e.g. area/nodegroup) and kind (e.g. kind/improvement)

BONUS POINTS checklist: complete for good vibes and maybe prizes?! 🤯

  • Backfilled missing tests for code in same general area 🎉
  • Refactored something and made the world a better place 🌟

@hspencer77 hspencer77 self-assigned this Aug 4, 2024
@hspencer77 hspencer77 added the enhancement New feature or request label Aug 4, 2024
Copy link

github-actions bot commented Aug 4, 2024

[puLL-Merge] - brave-intl/eksctl@593

Description

This PR updates various dependencies in the go.mod and go.sum files, and makes a minor change to the pkg/apis/eksctl.io/v1alpha5/types.go file. The main focus appears to be updating and aligning dependency versions, including AWS SDK, Kubernetes-related packages, and various other libraries.

Changes

Changes

  1. go.mod:

    • Updated Go version to 1.22.5
    • Updated several AWS SDK packages (e.g., aws-sdk-go-v2, config, credentials)
    • Updated Kubernetes-related packages (e.g., k8s.io/api, k8s.io/client-go)
    • Added new dependency: github.com/awslabs/amazon-eks-ami/nodeadm
    • Updated various other dependencies
  2. go.sum:

    • Numerous changes reflecting the updates in go.mod
    • Removed some old dependency versions
    • Added new dependency hashes
  3. pkg/apis/eksctl.io/v1alpha5/types.go:

    • Removed a merge conflict marker (>>>>>>>)

Possible Issues

  • The removal of the merge conflict marker in types.go suggests that there might have been a merge conflict that was resolved. It's worth double-checking that the resolution was correct and that no unintended changes were introduced.

Security Hotspots

No significant security issues are apparent in this change. However, updating dependencies can sometimes introduce new vulnerabilities, so it's always a good practice to review the changelog of updated packages, especially those related to security-sensitive areas like AWS SDK and Kubernetes libraries.

@hspencer77 hspencer77 merged commit 16e877e into main Aug 4, 2024
6 of 10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request puLL-Merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant