-
Notifications
You must be signed in to change notification settings - Fork 8
fix(bundle): align CSV env var with Makefile and remove Machine example #143
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.
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
base: main
Are you sure you want to change the base?
Conversation
6ed64f7 to
8214ecb
Compare
scripts/generate-bundle-prod.sh
Outdated
|
|
||
| # Required environment variables | ||
| for var in OPERATOR_IMAGE COMPUTE_PCRS_IMAGE REG_SERVER_IMAGE; do | ||
| for var in OPERATOR_IMAGE; do |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can flatten loop
…xamples - Remove unused env vars COMPUTE_PCRS_IMAGE and REG_SERVER_IMAGE from CSV deployment spec since the operator never reads them at runtime (images come from TrustedExecutionCluster CR spec) - Add relatedImages section for air-gapped environment support - Update generate-bundle-prod.sh to patch relatedImages with OPERATOR_IMAGE, COMPUTE_PCRS_IMAGE, REG_SERVER_IMAGE, and TRUSTEE_IMAGE instead of patching deployment env vars - Update Makefile to pass TRUSTEE_IMAGE to bundle generation - Remove Machine from alm-examples as it's auto-created by register-server, not user-facing - Add publicTrusteeAddr field to TrustedExecutionCluster example - Normalize image tags from v0.1.0 to 0.1.0 (standard container format) - Update matchLabels from 'name' to 'app: trusted-cluster-operator' for consistency with operator deployment Signed-off-by: Yalan Zhang <yalzhang@redhat.com>
|
@yalzhang: The following tests failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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. |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: alicefr, Jakob-Naucke, yalzhang The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
@yalzhang what are the 2 new CI job failing on this PR? |
|
@alicefr these CI jobs need openshift/release#73211 for revival |
This is the integration test. However, the job tried to apply a merged patch, which caused it to fail. The fix is available in PR #73211, but it’s still not fully stable—some cases consistently fail due to timeouts. Jakbo is also investigating. The two jobs run on a dedicated Beaker system and are triggered for each PR submission (pre-submit jobs): ci/prow/infra-provision-verify: provision (prepare environment) → make cluster-up → deprovision. (This is meant to verify the infrastructure; we might consider removing it.) ci/prow/operator-lifecycle-verify: provision (prepare environment) → make cluster-up → make integration-tests → deprovision. |
|
ok, then we can merge this PR |
|
I'm testing the bundle part, and will add the result here. It may need some updates since the config/rbac changes which is just merged. |
deployment spec since the operator never reads them at runtime (images
come from TrustedExecutionCluster CR spec)
COMPUTE_PCRS_IMAGE, REG_SERVER_IMAGE, and TRUSTEE_IMAGE instead of
patching deployment env vars
not user-facing
consistency with operator deployment