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.

Sign up for GitHub

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

Move fuction to get kubelet path into util package #365

Merged
merged 1 commit into from
Jan 31, 2025
Merged

Move fuction to get kubelet path into util package #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions pkg/driver/node/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,10 @@ import (
"github.com/awslabs/aws-s3-csi-driver/pkg/driver/node/targetpath"
"github.com/awslabs/aws-s3-csi-driver/pkg/driver/node/volumecontext"
"github.com/awslabs/aws-s3-csi-driver/pkg/mountpoint"
"github.com/awslabs/aws-s3-csi-driver/pkg/util"
)

const (
defaultKubeletPath = "/var/lib/kubelet"
)

var kubeletPath = getKubeletPath()
var kubeletPath = util.KubeletPath()

var (
nodeCaps = []csi.NodeServiceCapability_RPC_Type{}
Expand Down Expand Up @@ -173,14 +170,6 @@ func compileMountOptions(currentOptions []string, newOptions []string) []string
return allMountOptions.List()
}

func getKubeletPath() string {
kubeletPath := os.Getenv("KUBELET_PATH")
if kubeletPath == "" {
return defaultKubeletPath
}
return kubeletPath
}

func (ns *S3NodeServer) NodeUnpublishVolume(ctx context.Context, req *csi.NodeUnpublishVolumeRequest) (*csi.NodeUnpublishVolumeResponse, error) {
klog.V(4).Infof("NodeUnpublishVolume: called with args %+v", req)

Expand Down
15 changes: 15 additions & 0 deletions pkg/util/kubelet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package util

import "os"

const defaultKubeletPath = "/var/lib/kubelet"

// KubeletPath returns path of the kubelet.
// It looks for `KUBELET_PATH` variable, and returns a default path if its not defined.
func KubeletPath() string {
kubeletPath := os.Getenv("KUBELET_PATH")
if kubeletPath == "" {
return defaultKubeletPath
}
return kubeletPath
}
Loading