Skip to content

NO-ISSUE: Synchronize From Upstream Repositories #1024

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
Jun 13, 2025
Merged

NO-ISSUE: Synchronize From Upstream Repositories #1024

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ func Pod(source *operatorsv1alpha1.CatalogSource, name, opmImg, utilImage, img s

pod.Spec.Containers[0].Image = opmImg
pod.Spec.Containers[0].Command = []string{"/bin/opm"}
pod.Spec.Containers[0].ImagePullPolicy = image.InferImagePullPolicy(opmImg)
var containerArgs = []string{
"serve",
filepath.Join(catalogPath, "catalog"),
Expand Down
65 changes: 50 additions & 15 deletions staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/reconciler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,32 +914,58 @@ func TestPodNodeSelector(t *testing.T) {

func TestPullPolicy(t *testing.T) {
var table = []struct {
image string
policy corev1.PullPolicy
image string
policy corev1.PullPolicy
opmImage string
extractContent bool
}{
{
image: "quay.io/operator-framework/olm@sha256:b9d011c0fbfb65b387904f8fafc47ee1a9479d28d395473341288ee126ed993b",
policy: corev1.PullIfNotPresent,
image: "quay.io/operator-framework/olm@sha256:b9d011c0fbfb65b387904f8fafc47ee1a9479d28d395473341288ee126ed993b",
policy: corev1.PullIfNotPresent,
opmImage: "opmImage",
extractContent: false,
},
{
image: "gcc@sha256:06a6f170d7fff592e44b089c0d2e68d870573eb9a23d9c66d4b6ea11f8fad18b",
policy: corev1.PullIfNotPresent,
image: "gcc@sha256:06a6f170d7fff592e44b089c0d2e68d870573eb9a23d9c66d4b6ea11f8fad18b",
policy: corev1.PullIfNotPresent,
opmImage: "opmImage",
extractContent: false,
},
{
image: "myimage:1.0",
policy: corev1.PullAlways,
image: "myimage:1.0",
policy: corev1.PullAlways,
opmImage: "opmImage",
extractContent: false,
},
{
image: "busybox",
policy: corev1.PullAlways,
image: "busybox",
policy: corev1.PullAlways,
opmImage: "opmImage",
extractContent: false,
},
{
image: "gcc@sha256:06a6f170d7fff592e44b089c0d2e68",
policy: corev1.PullIfNotPresent,
image: "gcc@sha256:06a6f170d7fff592e44b089c0d2e68",
policy: corev1.PullIfNotPresent,
opmImage: "opmImage",
extractContent: false,
},
{
image: "hello@md5:b1946ac92492d2347c6235b4d2611184",
policy: corev1.PullIfNotPresent,
image: "hello@md5:b1946ac92492d2347c6235b4d2611184",
policy: corev1.PullIfNotPresent,
opmImage: "opmImage",
extractContent: false,
},
{
image: "quay.io/operator-framework/olm@sha256:b9d011c0fbfb65b387904f8fafc47ee1a9479d28d395473341288ee126ed993b",
policy: corev1.PullIfNotPresent,
opmImage: "quay.io/operator-framework/olm@sha256:b9d011c0fbfb65b387904f8fafc47ee1a9479d28d395473341288ee126ed993b",
extractContent: true,
},
{
image: "quay.io/operator-framework/olm@sha256:b9d011c0fbfb65b387904f8fafc47ee1a9479d28d395473341288ee126ed993b",
policy: corev1.PullAlways,
opmImage: "quay.io/operator-framework/olm:latest",
extractContent: true,
},
}

Expand All @@ -951,7 +977,16 @@ func TestPullPolicy(t *testing.T) {
}

for _, tt := range table {
p, err := Pod(source, "catalog", "opmImage", "utilImage", tt.image, serviceAccount("", "service-account"), nil, nil, int32(0), int32(0), int64(workloadUserID), v1alpha1.Legacy)
if tt.extractContent {
grpcPodConfig := &v1alpha1.GrpcPodConfig{
ExtractContent: &v1alpha1.ExtractContentConfig{
CacheDir: "/tmp/cache",
CatalogDir: "/catalog",
},
}
source.Spec.GrpcPodConfig = grpcPodConfig
}
p, err := Pod(source, "catalog", tt.opmImage, "utilImage", tt.image, serviceAccount("", "service-account"), nil, nil, int32(0), int32(0), int64(workloadUserID), v1alpha1.Legacy)
require.NoError(t, err)
policy := p.Spec.Containers[0].ImagePullPolicy
if policy != tt.policy {
Expand Down
1 change: 1 addition & 0 deletions ...tor-framework/operator-lifecycle-manager/pkg/controller/registry/reconciler/reconciler.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.