Skip to content

csv-generator: Populate name field in relatedImages entries #163

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
tiraboschi merged 1 commit into from
May 8, 2026
Merged

csv-generator: Populate name field in relatedImages entries #163

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
6 changes: 5 additions & 1 deletion cmd/csv-generator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,12 +412,16 @@ func buildClusterPermissions(rules []rbac.Rule) []StrategyDeploymentPermissions
// and any additional images passed via --additional-images.
func buildRelatedImages(operatorImage string, additionalImageEnvVars []parser.EnvVar) []RelatedImage {
relatedImages := []RelatedImage{
{Image: operatorImage},
{
Name: operatorImage,
Image: operatorImage,
},
}

// Add all additional images to relatedImages.
for _, envVar := range additionalImageEnvVars {
relatedImages = append(relatedImages, RelatedImage{
Name: envVar.Value,
Image: envVar.Value,
})
}
Expand Down
40 changes: 32 additions & 8 deletions cmd/csv-generator/related_images_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,21 @@ func TestBuildRelatedImages(t *testing.T) {
operatorImage: "quay.io/test/autopilot@sha256:abc123",
additionalImageEnvVars: nil,
expected: []RelatedImage{
{Image: "quay.io/test/autopilot@sha256:abc123"},
{
Name: "quay.io/test/autopilot@sha256:abc123",
Image: "quay.io/test/autopilot@sha256:abc123",
},
},
},
{
name: "operator image with empty additional images slice",
operatorImage: "quay.io/test/autopilot@sha256:abc123",
additionalImageEnvVars: []parser.EnvVar{},
expected: []RelatedImage{
{Image: "quay.io/test/autopilot@sha256:abc123"},
{
Name: "quay.io/test/autopilot@sha256:abc123",
Image: "quay.io/test/autopilot@sha256:abc123",
},
},
},
{
Expand All @@ -53,8 +59,14 @@ func TestBuildRelatedImages(t *testing.T) {
{Name: "NETWORK_RESOURCES_INJECTOR_IMAGE", Value: "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:def456"},
},
expected: []RelatedImage{
{Image: "quay.io/test/autopilot@sha256:abc123"},
{Image: "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:def456"},
{
Name: "quay.io/test/autopilot@sha256:abc123",
Image: "quay.io/test/autopilot@sha256:abc123",
},
{
Name: "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:def456",
Image: "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:def456",
},
},
},
{
Expand All @@ -66,10 +78,22 @@ func TestBuildRelatedImages(t *testing.T) {
{Name: "THIRD_IMAGE", Value: "registry.example.com/test/third:v1.0"},
},
expected: []RelatedImage{
{Image: "quay.io/test/autopilot@sha256:abc123"},
{Image: "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:def456"},
{Image: "quay.io/test/another@sha256:xyz789"},
{Image: "registry.example.com/test/third:v1.0"},
{
Name: "quay.io/test/autopilot@sha256:abc123",
Image: "quay.io/test/autopilot@sha256:abc123",
},
{
Name: "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:def456",
Image: "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:def456",
},
{
Name: "quay.io/test/another@sha256:xyz789",
Image: "quay.io/test/another@sha256:xyz789",
},
{
Name: "registry.example.com/test/third:v1.0",
Image: "registry.example.com/test/third:v1.0",
},
},
},
}
Expand Down