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

Syncing latest changes from upstream master for rook #672

Merged
merged 4 commits into from
Jun 25, 2024

Commits on Jun 21, 2024

  1. osd: use old passphrase to kill the luks slot

    While adding a new encryption key to slot 1
    if there exists a key in slot 1 which is not
    equal to the one we want to update it with,
    we kill the slot and then add the new key to it.
    
    While killing the slot, the existing code uses
    the new key, which is not valid in such cases.
    
    This patch modifies the code to use the key in
    slot 0 (the one that we know works) to kill the slot.
    
    Signed-off-by: Niraj Yadav <niryadav@redhat.com>
    black-dragon74 committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    b8b7af3 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2024

  1. Merge pull request rook#14367 from black-dragon74/use-orig-enc-key

    osd: Use old passphrase to kill the LUKS slot
    subhamkrai committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    3a72a2a View commit details
    Browse the repository at this point in the history
  2. build(deps): bump github.com/aws/aws-sdk-go

    Bumps the github-dependencies group with 1 update: [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go).
    
    
    Updates `github.com/aws/aws-sdk-go` from 1.54.2 to 1.54.6
    - [Release notes](https://github.com/aws/aws-sdk-go/releases)
    - [Commits](aws/aws-sdk-go@v1.54.2...v1.54.6)
    
    ---
    updated-dependencies:
    - dependency-name: github.com/aws/aws-sdk-go
      dependency-type: direct:production
      update-type: version-update:semver-patch
      dependency-group: github-dependencies
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    7c6d0b9 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. Merge pull request rook#14373 from rook/dependabot/go_modules/github-…

    …dependencies-9b2da29897
    
    build(deps): bump github.com/aws/aws-sdk-go from 1.54.2 to 1.54.6 in the github-dependencies group
    subhamkrai committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    c096b84 View commit details
    Browse the repository at this point in the history