Skip to content

Commit 3e82169

Browse files
committed
fixup! refactor: simplify OCI auth error handling
Signed-off-by: cappyzawa <[email protected]>
1 parent 572c8f8 commit 3e82169

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

internal/controller/ocirepository_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ func (r *OCIRepositoryReconciler) reconcileSource(ctx context.Context, sp *patch
365365
return sreconcile.ResultEmpty, e
366366
}
367367

368-
if _, ok := keychain.(soci.Anonymous); obj.Spec.Provider != sourcev1.GenericOCIProvider && ok {
368+
if _, ok := keychain.(soci.Anonymous); obj.Spec.Provider != "" && obj.Spec.Provider != sourcev1.GenericOCIProvider && ok {
369369
var opts []auth.Option
370370
if obj.Spec.ServiceAccountName != "" {
371371
// Check object-level workload identity feature gate.

internal/helm/getter/client_opts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ func GetClientOpts(ctx context.Context, c client.Client, obj *sourcev1.HelmRepos
134134
return nil, "", fmt.Errorf("failed to configure login options: %w", err)
135135
}
136136
}
137-
} else if obj.Spec.Provider != sourcev1.GenericOCIProvider && obj.Spec.Type == sourcev1.HelmRepositoryTypeOCI && ociRepo {
137+
} else if p := obj.Spec.Provider; p != "" && p != sourcev1.GenericOCIProvider && obj.Spec.Type == sourcev1.HelmRepositoryTypeOCI && ociRepo {
138138
authenticator, authErr := soci.OIDCAuth(ctx, obj.Spec.URL, obj.Spec.Provider)
139139
if authErr != nil {
140140
return nil, "", fmt.Errorf("failed to get credential from '%s': %w", obj.Spec.Provider, authErr)

0 commit comments

Comments
 (0)