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 mount utils #2099

Merged
merged 3 commits into from
Jun 21, 2024
Merged

Bump mount utils #2099

merged 3 commits into from
Jun 21, 2024

Conversation

davidcassany
Copy link
Contributor

No description provided.

@davidcassany davidcassany requested a review from a team as a code owner June 11, 2024 11:27
@davidcassany davidcassany marked this pull request as draft June 11, 2024 11:27
@kkaempf
Copy link
Contributor

kkaempf commented Jun 11, 2024

Huh ? This seems to bump much more than just the mount utils ?!

@@ -28,7 +28,7 @@ type Mounter interface {
}

func NewMounter(binary string) Mounter {
return mount.New(binary)
return mount.NewWithoutSystemd(binary)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is a new method provided with the updated interface which provides a mount wrapper that does not pretend to detect systemd. For instance this has impact on make test-cli target being executed in a desktop env. In that case every time a new mounter got initiated a systemd dialog appeared to provide the root password interactively, even it we are not mounting anything in our unit tests and they all can run as a non root user.

func mount.NewWithoutSystemd(mounterPath string) mount.Interface

NewWithoutSystemd returns a Linux specific mount.Interface for the current system. 
It provides options to override the default mounter behavior. mounterPath allows
using an alternative to `/bin/mount` for mounting. Any detection for systemd functionality
is disabled with this Mounter.

A part from that we were already a bit outdated in that library.

@@ -25,7 +27,7 @@ require (
github.com/spf13/viper v1.15.0
golang.org/x/crypto v0.21.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/mount-utils v0.23.0
k8s.io/mount-utils v0.30.1
Copy link
Contributor Author

@davidcassany davidcassany Jun 11, 2024

Choose a reason for hiding this comment

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

This is the actual bump, all other changes in go.mod and in vendor are caused by the indirect dependencies and the mount-utils code itself.

Copy link
Member

@fgiudici fgiudici Jun 21, 2024

Choose a reason for hiding this comment

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

This is the actual bump, all other changes in go.mod and in vendor are caused by the indirect dependencies and the mount-utils code itself.

golang vendoring... 😅

@davidcassany davidcassany marked this pull request as ready for review June 11, 2024 13:44
Signed-off-by: David Cassany <dcassany@suse.com>
Signed-off-by: David Cassany <dcassany@suse.com>
Copy link
Member

@fgiudici fgiudici left a comment

Choose a reason for hiding this comment

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

LGTM

go.mod Outdated Show resolved Hide resolved
@@ -25,7 +27,7 @@ require (
github.com/spf13/viper v1.15.0
golang.org/x/crypto v0.21.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/mount-utils v0.23.0
k8s.io/mount-utils v0.30.1
Copy link
Member

@fgiudici fgiudici Jun 21, 2024

Choose a reason for hiding this comment

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

This is the actual bump, all other changes in go.mod and in vendor are caused by the indirect dependencies and the mount-utils code itself.

golang vendoring... 😅

Co-authored-by: Francesco Giudici <francesco.giudici@gmail.com>
Signed-off-by: David Cassany Viladomat <dcassany@suse.com>
@davidcassany davidcassany enabled auto-merge (squash) June 21, 2024 13:00
@davidcassany davidcassany merged commit 2b23133 into rancher:main Jun 21, 2024
29 checks passed
@davidcassany davidcassany deleted the bump_mount-utils branch June 21, 2024 13:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

3 participants