Skip to content
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

OCPBUGS-4955: Set ImagePullPolicy of bundle unpacker to "IfNotPresent" for image digests #2908

Merged
merged 6 commits into from
Dec 19, 2022
Merged

OCPBUGS-4955: Set ImagePullPolicy of bundle unpacker to "IfNotPresent" for image digests #2908

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cae1e0b
Capture ImagePullPolicy selection from image as func, export for wide…
dtfranz Dec 15, 2022
23b37eb
Fixed using wrong image as reference for pull policy inference
dtfranz Dec 16, 2022
5b6a543
Fixed unit test using wrong vars for path/image/etc.
dtfranz Dec 16, 2022
9816763
Remove comment block
dtfranz Dec 16, 2022
2a5c923
Generate hash just once for digestPath
dtfranz Dec 16, 2022
c336d48
Merge branch 'master' into bundle-digest-ifnotpresent
dtfranz Dec 16, 2022
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
8 changes: 4 additions & 4 deletions pkg/controller/bundle/bundle_unpacker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ func TestConfigMapUnpacker(t *testing.T) {
defaultUnpackTimeoutSeconds := int64(defaultUnpackDuration.Seconds())

// Custom timeout to override the default cmdline flag ActiveDeadlineSeconds value
//customAnnotationDuration := 2 * time.Minute
//customAnnotationTimeoutSeconds := int64(customAnnotationDuration.Seconds())
customAnnotationDuration := 2 * time.Minute
customAnnotationTimeoutSeconds := int64(customAnnotationDuration.Seconds())

type fields struct {
objs []runtime.Object
Expand All @@ -77,7 +77,7 @@ func TestConfigMapUnpacker(t *testing.T) {
args args
expected expected
}{
/*{
{
Copy link
Collaborator

Choose a reason for hiding this comment

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

nevermind XD

description: "NoCatalogSource/NoConfigMap/NoJob/NotCreated/Pending",
fields: fields{},
args: args{
Expand Down Expand Up @@ -397,7 +397,7 @@ func TestConfigMapUnpacker(t *testing.T) {
},
},
},
},*/
},
{
description: "CatalogSourcePresent/ConfigMapPresent/JobPresent/DigestImage/Unpacked",
Copy link
Collaborator

Choose a reason for hiding this comment

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

maybe double-check if tests are needed for non-digest images too?

fields: fields{
Expand Down