Skip to content

Keep OPENSCAP_IMAGE defaulting to the manifest image - #1336

Closed
Vincent056 wants to merge 1 commit into
ComplianceAsCode:masterfrom
Vincent056:fix-openscap-image-default
Closed

Keep OPENSCAP_IMAGE defaulting to the manifest image#1336
Vincent056 wants to merge 1 commit into
ComplianceAsCode:masterfrom
Vincent056:fix-openscap-image-default

Conversation

@Vincent056

Copy link
Copy Markdown

Summary

One-line follow-up to #1295: OPENSCAP_IMAGE still defaulted to the ghcr openscap-ocp image, whose publisher #1295 removed - the tag is now frozen at its final build. Since the deploy targets substitute DEFAULT_OPENSCAP_IMAGE -> OPENSCAP_IMAGE in the rendered manifests, a plain make deploy/e2e deploy silently swapped the fresh Konflux openscap-dev:master image out for the permanently-frozen ghcr one - the same slow-rot failure mode as the frozen k8scontent image.

Restoring OPENSCAP_IMAGE?=$(DEFAULT_OPENSCAP_IMAGE) makes the substitution a no-op unless a developer explicitly overrides (e.g. make e2e OPENSCAP_IMAGE=my-scanner:test, which is unaffected).

🤖 Generated with Claude Code

Since ComplianceAsCode#1295 the manifests default to the Konflux openscap-dev:master
image, but OPENSCAP_IMAGE still defaulted to the ghcr openscap-ocp
image - whose publisher ComplianceAsCode#1295 removed, freezing that tag permanently.
Because the deploy targets substitute DEFAULT_OPENSCAP_IMAGE with
OPENSCAP_IMAGE, a plain 'make deploy' swapped the fresh Konflux image
out for the frozen ghcr one. Restore the invariant that an unset
OPENSCAP_IMAGE equals the manifest default, so the substitution is a
no-op unless a developer overrides it.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@openshift-ci
openshift-ci Bot requested review from jhrozek and xiaojiey August 12, 2026 18:04
@Vincent056 Vincent056 added this to the 1.10.0 milestone Aug 12, 2026

@yuumasato yuumasato left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci

openshift-ci Bot commented Aug 13, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Vincent056, yuumasato

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [Vincent056,yuumasato]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@yuumasato

Copy link
Copy Markdown
Member

/retest

1 similar comment
@taimurhafeez

Copy link
Copy Markdown
Collaborator

/retest

@openshift-ci

openshift-ci Bot commented Aug 18, 2026

Copy link
Copy Markdown

@Vincent056: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-aws-parallel a43c50a link true /test e2e-aws-parallel
ci/prow/e2e-aws-serial a43c50a link true /test e2e-aws-serial

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@Vincent056

Copy link
Copy Markdown
Author

Superseded: the identical change (OPENSCAP_IMAGE?=$(DEFAULT_OPENSCAP_IMAGE)) merged to master as part of #1338's default-image alignment, and the underlying issue this was chasing is now fully addressed under CMP-4600 — #1348 makes the openscap-dev:master tag actually exist, and #1255 restores the OPENSCAP_IMAGE_FROM_CI mapping so prow uses its PR-built openscap image.

@Vincent056 Vincent056 closed this Aug 18, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants