Skip to content

Commit 8261a45

Browse files
committed
fix validation in resource prefix flag
1 parent 96e66f6 commit 8261a45

File tree

2 files changed

+1
-12
lines changed

2 files changed

+1
-12
lines changed

pkg/config/controller_config.go

-11
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ func (cfg *ControllerConfig) BindFlags(fs *pflag.FlagSet) {
160160
fs.StringToStringVar(&cfg.ResourcePrefix, flagResourcePrefix, defaultResourcePrefix,
161161
"the prefixes for resource tags, backend SG name and worker node SG rules label.")
162162

163-
cfg.mergeDefaultResourcePrefixVal()
164163
cfg.FeatureGates.BindFlags(fs)
165164
cfg.AWSConfig.BindFlags(fs)
166165
cfg.RuntimeConfig.BindFlags(fs)
@@ -268,13 +267,3 @@ func (cfg *ControllerConfig) validateResourcePrefixKeys() error {
268267
}
269268
return nil
270269
}
271-
272-
// mergeDefaultResourcePrefixVal make sure the ResourcePrefix map always has default val for unspecified key in user-passed flag
273-
func (cfg *ControllerConfig) mergeDefaultResourcePrefixVal() {
274-
// Merge user-provided values with defaults
275-
for key, defaultVal := range defaultResourcePrefix {
276-
if _, exists := cfg.ResourcePrefix[key]; !exists {
277-
cfg.ResourcePrefix[key] = defaultVal
278-
}
279-
}
280-
}

pkg/config/controller_config_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ func TestControllerConfig_validateResourcePrefixKeys(t *testing.T) {
227227
"backendSGNamePrefix": "k8s-traffic",
228228
},
229229
},
230-
wantErr: errors.New("invalid number of keys. Expected 5 keys, but got 4 keys"),
230+
wantErr: errors.New("invalid number of keys. Expected 5 keys, only got 4 keys"),
231231
},
232232
}
233233
for _, tt := range tests {

0 commit comments

Comments
 (0)