Repository navigation
fix: auto-discover operator deployment name in FBC e2e install task - #687
Merged
Merged
Conversation
…tor-from-fbc task The FBC repo is not split into per-stream configs, so the policyControllerOperatorDeploymentName override from the v1-0 stream was never applied to FBC e2e tests. This caused the 1.0.x policy controller FBC e2e to loop forever waiting for a deployment named "policy-controller-operator" when the actual deployment is "policy-controller-manager". Instead of relying on a hardcoded param, query the Subscription's installedCSV and extract the deployment name from the CSV spec. This works for both streams and any future deployment renames.
Configuration Diff12 document(s) impacted: + 0 added
- 0 removed
! 12 modifiedDiff@@ spec.template.values @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStream/rhtas-tenant/policy-controller-operator-v1-0
! - one list entry removed:
- - name: policyControllerOperatorDeploymentName
- value: policy-controller-manager
@@ spec.template.values @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStream/rhtas-tenant/policy-controller-v1-0
! - one list entry removed:
- - name: policyControllerOperatorDeploymentName
- value: policy-controller-manager
@@ spec.resources.appstudio.redhat.com/v1beta2/IntegrationTestScenario/{{.application}}{{.nameSuffix}}-v4-16-e2e.spec.params @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStreamTemplate/rhtas-tenant/pco-fbc-template
! - one list entry removed:
- - name: POLICY_CONTROLLER_OPERATOR_DEPLOYMENT_NAME
- value: {{.policyControllerOperatorDeploymentName}}
@@ spec.resources.appstudio.redhat.com/v1beta2/IntegrationTestScenario/{{.application}}{{.nameSuffix}}-v4-17-e2e.spec.params @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStreamTemplate/rhtas-tenant/pco-fbc-template
! - one list entry removed:
- - name: POLICY_CONTROLLER_OPERATOR_DEPLOYMENT_NAME
- value: {{.policyControllerOperatorDeploymentName}}
@@ spec.resources.appstudio.redhat.com/v1beta2/IntegrationTestScenario/{{.application}}{{.nameSuffix}}-v4-18-e2e.spec.params @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStreamTemplate/rhtas-tenant/pco-fbc-template
! - one list entry removed:
- - name: POLICY_CONTROLLER_OPERATOR_DEPLOYMENT_NAME
- value: {{.policyControllerOperatorDeploymentName}}
@@ spec.resources.appstudio.redhat.com/v1beta2/IntegrationTestScenario/{{.application}}{{.nameSuffix}}-v4-19-e2e.spec.params @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStreamTemplate/rhtas-tenant/pco-fbc-template
! - one list entry removed:
- - name: POLICY_CONTROLLER_OPERATOR_DEPLOYMENT_NAME
- value: {{.policyControllerOperatorDeploymentName}}
@@ spec.resources.appstudio.redhat.com/v1beta2/IntegrationTestScenario/{{.application}}{{.nameSuffix}}-v4-19-e2e-fips.spec.params @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStreamTemplate/rhtas-tenant/pco-fbc-template
! - one list entry removed:
- - name: POLICY_CONTROLLER_OPERATOR_DEPLOYMENT_NAME
- value: {{.policyControllerOperatorDeploymentName}}
@@ spec.resources.appstudio.redhat.com/v1beta2/IntegrationTestScenario/{{.application}}{{.nameSuffix}}-v4-20-e2e.spec.params @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStreamTemplate/rhtas-tenant/pco-fbc-template
! - one list entry removed:
- - name: POLICY_CONTROLLER_OPERATOR_DEPLOYMENT_NAME
- value: {{.policyControllerOperatorDeploymentName}}
@@ spec.resources.appstudio.redhat.com/v1beta2/IntegrationTestScenario/{{.application}}{{.nameSuffix}}-v4-21-e2e.spec.params @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStreamTemplate/rhtas-tenant/pco-fbc-template
! - one list entry removed:
- - name: POLICY_CONTROLLER_OPERATOR_DEPLOYMENT_NAME
- value: {{.policyControllerOperatorDeploymentName}}
@@ spec.resources.appstudio.redhat.com/v1beta2/IntegrationTestScenario/{{.application}}{{.nameSuffix}}-v4-22-e2e.spec.params @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStreamTemplate/rhtas-tenant/pco-fbc-template
! - one list entry removed:
- - name: POLICY_CONTROLLER_OPERATOR_DEPLOYMENT_NAME
- value: {{.policyControllerOperatorDeploymentName}}
@@ spec.resources.appstudio.redhat.com/v1beta2/IntegrationTestScenario/{{.application}}{{.nameSuffix}}-v5-0-e2e.spec.params @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStreamTemplate/rhtas-tenant/pco-fbc-template
! - one list entry removed:
- - name: POLICY_CONTROLLER_OPERATOR_DEPLOYMENT_NAME
- value: {{.policyControllerOperatorDeploymentName}}
@@ spec.variables @@
# projctl.konflux.dev/v1beta1/ProjectDevelopmentStreamTemplate/rhtas-tenant/pco-fbc-template
! - one list entry removed:
- - name: policyControllerOperatorDeploymentName
- defaultValue: policy-controller-operator
- description: "The operator deployment name to wait for in e2e install"📦 Artifacts: base-output.yaml, head-output.yaml, dyff-output.txt |
tommyd450
approved these changes
Nov 10, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
install-operator-from-fbctask now dynamically discovers the operatordeployment name by querying the Subscription's
status.installedCSVandextracting the deployment from the CSV's
spec.install.spec.deployments,instead of relying on a hardcoded
operator-deployment-nameparameter.POLICY_CONTROLLER_OPERATOR_DEPLOYMENT_NAMEpipeline parameterand the
policyControllerOperatorDeploymentNametemplate variable from allOCP patches, the FBC template, and the v1-0 stream config since they are
no longer needed.
|| trueguards to diagnosticoc getcommands inside retry loopsto prevent
set -efrom killing the script on transient API errors.Problem
The FBC repo is not split into per-stream configs, so the v1-0 stream's
override of
policyControllerOperatorDeploymentNametopolicy-controller-managerwas never applied to the FBC e2e IntegrationTestScenarios. The pipeline used the
template default (
policy-controller-operator), causing 1.0.x FBC e2e tests toloop indefinitely waiting for a deployment that doesn't exist.