Skip to content

OCPBUGS-64840: image extract: Use Explicit strategy for ICSP/IDMS #2202

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
openshift-merge-bot merged 1 commit into from
Mar 12, 2026
+2 −2
Merged

OCPBUGS-64840: image extract: Use Explicit strategy for ICSP/IDMS #2202

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions pkg/cli/image/extract/extract.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,10 +356,10 @@ func (o *ExtractOptions) Run() error {
return err
}
if len(o.ICSPFile) > 0 {
fromContext = fromContext.WithAlternateBlobSourceStrategy(strategy.NewICSPOnErrorStrategy(o.ICSPFile))
fromContext = fromContext.WithAlternateBlobSourceStrategy(strategy.NewICSPExplicitStrategy(o.ICSPFile))
Copy link
Copy Markdown
Member

@ardaguclu ardaguclu Feb 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be great if you ensure that this code bits are not used by adm release commands. So that they won't be updated too.

Copy link
Copy Markdown
Contributor Author

@tchap tchap Feb 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only release info is also affected. Do we care there?

Copy link
Copy Markdown
Member

@ardaguclu ardaguclu Feb 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My question is obsolete. We need to change the strategy for all of them apart from image info. This change is correct.

Do we care there?

We definitely care :)

Copy link
Copy Markdown
Contributor Author

@tchap tchap Feb 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

release new is also affected, I can see.

So can you sum up one more time what the change is supposed to be?
Explicit for new and extract, OnError for info?

Copy link
Copy Markdown
Member

@ardaguclu ardaguclu Feb 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Explicit for new and extract, OnError for info?

According to the #829 (comment), yes

Copy link
Copy Markdown
Contributor Author

@tchap tchap Feb 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, so the current state is in sync with that comment.

}
if len(o.IDMSFile) > 0 {
fromContext = fromContext.WithAlternateBlobSourceStrategy(strategy.NewIDMSOnErrorStrategy(o.IDMSFile))
fromContext = fromContext.WithAlternateBlobSourceStrategy(strategy.NewIDMSExplicitStrategy(o.IDMSFile))
}
fromOptions := &imagesource.Options{
FileDir: o.FileDir,
Expand Down