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

Jump to bottom

Remove rescan-interval CLI option and env var (backport #111) #115

Open
wants to merge 1 commit into
base: v0.5.x
Choose a base branch
from
Open

Remove rescan-interval CLI option and env var (backport #111) #115

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
4 changes: 0 additions & 4 deletions deploy/charts/harvester-node-disk-manager/templates/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,6 @@ spec:
- name: NDM_AUTO_PROVISION_FILTER
value: {{ . | join "," | quote }}
{{- end }}
{{- with .Values.rescanInterval }}
- name: NDM_RESCAN_INTERVAL
value: {{ . | quote }}
{{- end }}
{{- with .Values.maxConcurrentOps }}
- name: NDM_MAX_CONCURRENT_OPS
value: {{ . | quote }}
Expand Down
3 changes: 0 additions & 3 deletions deploy/charts/harvester-node-disk-manager/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@ autoProvisionFilter: []
# - /dev/sda?
# - /dev/nvme0n1p1

# Specify the interval of device rescanning of the node (in seconds)
rescanInterval:

# Sepcify how many concurrent ops we could execute at the same time
maxConcurrentOps:

Expand Down
10 changes: 2 additions & 8 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,6 @@ func main() {
Usage: "A string of comma-separated glob patterns that you want to exclude for block device filesystem label filter",
Destination: &opt.LabelFilter,
},
&cli.Int64Flag{
Name: "rescan-interval",
EnvVars: []string{"NDM_RESCAN_INTERVAL"},
Usage: "Specify the interval of device rescanning of the node (in seconds)",
Destination: &opt.RescanInterval,
},
&cli.StringFlag{
Name: "auto-provision-filter",
EnvVars: []string{"NDM_AUTO_PROVISION_FILTER"},
Expand Down Expand Up @@ -178,8 +172,8 @@ func initLogs(opt *option.Option) {
logrus.SetOutput(os.Stdout)
logrus.Infof("Node Disk Manager %s is starting", version.FriendlyVersion())
logrus.Infof("Notable parameters are following:")
logrus.Infof("Namespace: %s, ConcurrentOps: %d, RescanInterval: %d, InjectUdevMonitorError: %v",
opt.Namespace, opt.MaxConcurrentOps, opt.RescanInterval, opt.InjectUdevMonitorError)
logrus.Infof("Namespace: %s, ConcurrentOps: %d, InjectUdevMonitorError: %v",
opt.Namespace, opt.MaxConcurrentOps, opt.InjectUdevMonitorError)
if opt.Debug {
logrus.SetLevel(logrus.DebugLevel)
logrus.Debugf("Loglevel set to [%v]", logrus.DebugLevel)
Expand Down
1 change: 0 additions & 1 deletion pkg/option/option.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ type Option struct {
PathFilter string
LabelFilter string
AutoProvisionFilter string
RescanInterval int64
MaxConcurrentOps uint
InjectUdevMonitorError bool
}
Loading