diff --git a/pkg/daemon/discover/discover.go b/pkg/daemon/discover/discover.go index 942574810..2fe2fa6ee 100644 --- a/pkg/daemon/discover/discover.go +++ b/pkg/daemon/discover/discover.go @@ -42,7 +42,7 @@ import ( ) const ( - discoverDaemonUdev = "DISCOVER_DAEMON_UDEV_BLACKLIST" + DiscoverDaemonUdev = "DISCOVER_DAEMON_UDEV_BLACKLIST" ) var ( @@ -200,7 +200,7 @@ func udevBlockMonitor(c chan struct{}, period time.Duration) { // get discoverDaemonUdevBlacklist from the environment variable // if user doesn't provide any regex; generate the default regex // else use the regex provided by user - discoverUdev := os.Getenv(discoverDaemonUdev) + discoverUdev := os.Getenv(DiscoverDaemonUdev) if discoverUdev == "" { discoverUdev = "(?i)dm-[0-9]+,(?i)rbd[0-9]+,(?i)nbd[0-9]+" } diff --git a/pkg/operator/discover/discover.go b/pkg/operator/discover/discover.go index 1981fc8f1..05e82b184 100644 --- a/pkg/operator/discover/discover.go +++ b/pkg/operator/discover/discover.go @@ -148,6 +148,7 @@ func (d *Discover) createDiscoverDaemonSet(ctx context.Context, namespace, disco k8sutil.NamespaceEnvVar(), k8sutil.NodeEnvVar(), k8sutil.NameEnvVar(), + {Name: discoverDaemon.DiscoverDaemonUdev, Value: os.Getenv(discoverDaemon.DiscoverDaemonUdev)}, }, }, }, diff --git a/pkg/operator/discover/discover_test.go b/pkg/operator/discover/discover_test.go index ec19cc16e..a95e59bcd 100644 --- a/pkg/operator/discover/discover_test.go +++ b/pkg/operator/discover/discover_test.go @@ -80,7 +80,7 @@ func TestStartDiscoveryDaemonset(t *testing.T) { volumeMounts := agentDS.Spec.Template.Spec.Containers[0].VolumeMounts assert.Equal(t, 3, len(volumeMounts)) envs := agentDS.Spec.Template.Spec.Containers[0].Env - assert.Equal(t, 3, len(envs)) + assert.Equal(t, 4, len(envs)) image := agentDS.Spec.Template.Spec.Containers[0].Image assert.Equal(t, "rook/rook:myversion", image) assert.Nil(t, agentDS.Spec.Template.Spec.Tolerations)