Skip to content

Fix push oci #252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 3, 2025
Merged

Fix push oci #252

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae5fb69
implementing fixes and improving debugging logs
nicholasSUSE Oct 3, 2025
2661ebd
Merge remote-tracking branch 'upstream/master' into fix-push-oci
nicholasSUSE Oct 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions pkg/auto/oci.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ func UpdateOCI(ctx context.Context, rootFs billy.Filesystem, ociDNS, ociUser, oc
}

func setupOCI(ctx context.Context, ociDNS, ociUser, ociPass string, debug bool) (*oci, error) {
// Strip http:// or https:// scheme if present
ociDNS = strings.TrimPrefix(ociDNS, "https://")
ociDNS = strings.TrimPrefix(ociDNS, "http://")

var err error
o := &oci{
DNS: ociDNS,
Expand Down Expand Up @@ -128,13 +132,24 @@ func setupHelm(ctx context.Context, ociDNS, ociUser, ociPass string, debug bool)

// Production code with Secure Mode and authentication
default:
regClient, err = registry.NewClient(registry.ClientOptDebug(false))
logger.Log(ctx, slog.LevelInfo, "production mode")
regClient, err = registry.NewRegistryClientWithTLS(
os.Stdout, // output writer
"", // certFile (none)
"", // keyFile (none)
"", // caFile (none)
false, // insecureSkipTLSverify
"", // registryConfig (use default)
false, // debug
)
if err != nil {
logger.Log(ctx, slog.LevelError, "failed to create registry client")
return nil, err
}
if err = regClient.Login(registryHost,
registry.LoginOptInsecure(false),
registry.LoginOptBasicAuth(ociUser, ociPass)); err != nil {
logger.Log(ctx, slog.LevelError, "failed to login")
return nil, err
}
}
Expand Down Expand Up @@ -181,7 +196,6 @@ func (o *oci) update(ctx context.Context, release *options.ReleaseOptions) ([]st
// Never overwrite a previously released chart!
exists, err := o.checkAsset(ctx, o.helmClient, o.DNS, chart, version)
if err != nil {
logger.Log(ctx, slog.LevelError, "failed to check registry for asset", slog.String("asset", asset))
return pushedAssets, err
}
if exists {
Expand Down Expand Up @@ -261,7 +275,7 @@ func checkAsset(ctx context.Context, helmClient *registry.Client, ociDNS, chart,
logger.Log(ctx, slog.LevelDebug, "asset does not exist at registry", slog.String("chart", chart))
return false, nil
}
logger.Err(err)
logger.Log(ctx, slog.LevelError, "failed to check registry for asset", slog.String("asset", chart))
return false, err
}

Expand Down
Loading