Skip to content

Commit

Permalink
fix: validate extra args dashes existing
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrey Kontyakov committed Mar 31, 2024
1 parent f3c204a commit 2ed23b7
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion internal/controller/factory/statefulset.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package factory
import (
"context"
"fmt"
"strings"

appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
Expand Down Expand Up @@ -247,7 +248,13 @@ func ValidatePodExtraArgs(cluster *etcdaenixiov1alpha1.EtcdCluster) error {

baseArgs := argsFromSliceToMap(generateBaseEtcdArgs(cluster))

for flag := range baseArgs {
for name := range cluster.Spec.PodSpec.ExtraArgs {
if strings.HasPrefix(name, "-") {
return fmt.Errorf("the extra argument shoudn't have dashes, flag: %s", name)
}

flag := "--" + name

if _, exists := baseArgs[flag]; exists {
return fmt.Errorf("can't use base exta argument '%s' in .Spec.PodSpec.ExtraArgs", flag)
}
Expand Down

0 comments on commit 2ed23b7

Please sign in to comment.