Skip to content

Commit 0c1da21

Browse files
committed
fix: Make sure that both DELETE_LOCAL_DATA and DELETE_EMPTY_DIR_DATA are supported
1 parent 2c3bdc0 commit 0c1da21

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

config/config.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,15 @@ func Initialize() error {
5959
if ignoreDaemonSets := strings.ToLower(os.Getenv(EnvIgnoreDaemonSets)); len(ignoreDaemonSets) == 0 || ignoreDaemonSets == "true" {
6060
cfg.IgnoreDaemonSets = true
6161
}
62-
if deleteLocalData := strings.ToLower(os.Getenv(EnvDeleteLocalData)); len(deleteLocalData) == 0 || deleteLocalData == "true" {
62+
// if the deprecated EnvDeleteLocalData is set, we need to set EnvDeleteEmptyDirData to its value
63+
if deleteLocalData := strings.ToLower(os.Getenv(EnvDeleteLocalData)); len(deleteLocalData) > 0 {
6364
log.Println("NOTICE: Environment variable '" + EnvDeleteLocalData + "' has been deprecated in favor of '" + EnvDeleteEmptyDirData + "'.")
6465
log.Println("NOTICE: Make sure to update your configuration, as said deprecated environment variable will be removed in a future release.")
65-
cfg.DeleteEmptyDirData = true
66+
if len(os.Getenv(EnvDeleteEmptyDirData)) == 0 {
67+
_ = os.Setenv(EnvDeleteEmptyDirData, deleteLocalData)
68+
} else {
69+
log.Println("WARNING: Both '" + EnvDeleteLocalData + "' and '" + EnvDeleteEmptyDirData + "' are set. The former is deprecated, and will be ignored.")
70+
}
6671
}
6772
if deleteEmptyDirData := strings.ToLower(os.Getenv(EnvDeleteEmptyDirData)); len(deleteEmptyDirData) == 0 || deleteEmptyDirData == "true" {
6873
cfg.DeleteEmptyDirData = true

0 commit comments

Comments
 (0)