Skip to content

Commit 6d4cb6f

Browse files
Remove unnecessary error path and function for parsing kubeconfig from secret
Signed-off-by: Codey Jenkins <[email protected]>
1 parent eb889d6 commit 6d4cb6f

File tree

1 file changed

+4
-16
lines changed

1 file changed

+4
-16
lines changed

providers/kubeconfig/provider.go

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -194,12 +194,10 @@ func (p *Provider) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result
194194
}
195195

196196
// Extract and validate kubeconfig data
197-
kubeconfigData, err := p.extractKubeconfigData(secret, log)
198-
if err != nil {
199-
return ctrl.Result{}, err
200-
}
201-
if kubeconfigData == nil {
202-
return ctrl.Result{}, nil // No kubeconfig data found
197+
kubeconfigData, ok := secret.Data[p.opts.KubeconfigSecretKey]
198+
if !ok || len(kubeconfigData) == 0 {
199+
log.Info("Secret does not contain kubeconfig data, skipping", "key", p.opts.KubeconfigSecretKey)
200+
return ctrl.Result{}, nil
203201
}
204202

205203
// Hash the kubeconfig for change detection
@@ -239,16 +237,6 @@ func (p *Provider) getSecret(ctx context.Context, namespacedName client.ObjectKe
239237
return secret, nil
240238
}
241239

242-
// extractKubeconfigData extracts kubeconfig data from a secret
243-
func (p *Provider) extractKubeconfigData(secret *corev1.Secret, log logr.Logger) ([]byte, error) {
244-
kubeconfigData, ok := secret.Data[p.opts.KubeconfigSecretKey]
245-
if !ok {
246-
log.Info("Secret does not contain kubeconfig data", "key", p.opts.KubeconfigSecretKey)
247-
return nil, nil
248-
}
249-
return kubeconfigData, nil
250-
}
251-
252240
// hashKubeconfig creates a hash of the kubeconfig data
253241
func (p *Provider) hashKubeconfig(kubeconfigData []byte) string {
254242
hash := sha256.New()

0 commit comments

Comments
 (0)