fix #329 add validation for ImagePullPolicy to prevent fallback to de…

…fault for invalid options
alibaba · Dec 12, 2024 · 49d0268 · 49d0268
1 parent f5d892b
commit 49d0268
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/pkg/skoop/collector/manager/manager.go b/pkg/skoop/collector/manager/manager.go
@@ -76,9 +76,14 @@ func NewSimplePodCollectorManager(ctx *ctx.Context) (collector.Manager, error) {
 		Config.SimplePodCollectorConfig.WaitTimeout = defaultWaitTimeout * time.Second
 	}
 
+	pullPolicy, err := utils.ConvertToImagePullPolicy(Config.SimplePodCollectorConfig.ImagePullPolicy)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create pod collector manager: %w", err)
+	}
+
 	return &simplePodCollectorManager{
 		image:                Config.SimplePodCollectorConfig.Image,
-		imagePullPolicy:      utils.ConvertToImagePullPolicy(Config.SimplePodCollectorConfig.ImagePullPolicy),
+		imagePullPolicy:      pullPolicy,
 		namespace:            Config.SimplePodCollectorConfig.CollectorNamespace,
 		client:               ctx.KubernetesClient(),
 		restConfig:           ctx.KubernetesRestClient(),

diff --git a/pkg/skoop/utils/k8s.go b/pkg/skoop/utils/k8s.go
@@ -155,15 +155,15 @@ func ContainsLoadBalancerIP(svc *v1.Service, ip string) bool {
 	return false
 }
 
-func ConvertToImagePullPolicy(policy string) v1.PullPolicy {
+func ConvertToImagePullPolicy(policy string) (v1.PullPolicy, error) {
 	policyMap := map[string]v1.PullPolicy{
 		"Always":       v1.PullAlways,
 		"IfNotPresent": v1.PullIfNotPresent,
 		"Never":        v1.PullNever,
 	}
 
 	if pullPolicy, exists := policyMap[policy]; exists {
-		return pullPolicy
+		return pullPolicy, nil
 	}
-	return v1.PullAlways
+	return "", fmt.Errorf("invalid image pull policy: %s, valid options are: Always, IfNotPresent, Never", policy)
 }