Skip to content

Conversation

@mgencur
Copy link
Contributor

@mgencur mgencur commented Dec 17, 2025

https://issues.redhat.com/browse/OCPQE-31326

Depends on ajaggapa/deploy-konflux-operator#2

Enhance the deploy-konflux-operator step to support deployment in
disconnected/air-gapped OpenShift environments with the following changes:

  • Add DISCONNECTED flag to enable disconnected mode operation
  • Support registry proxy configuration via USE_REGISTRY_PROXY flag
  • Add configurable registry proxy host/port (REGISTRY_PROXY_HOST/PORT)
  • Allow deriving proxy URL from mirror registry or explicit configuration
  • Add mirror registry credential handling (MIRROR_REGISTRY_DIR/CREDS)
  • Remove obsolete install_secret function (pull secret handling). This is handled directly in the deploy-operator.sh script.

The step now supports two disconnected scenarios:

  1. Direct mirror registry access with authentication
  2. Registry proxy with custom or derived proxy endpoint

Environment variables added:

  • DISCONNECTED (default: false)
  • USE_REGISTRY_PROXY (default: false)
  • REGISTRY_PROXY_HOST (optional, derived if not set)
  • REGISTRY_PROXY_PORT (required with REGISTRY_PROXY_HOST)
  • REGISTRY_PROXY_CREDENTIALS (optional, uses mirror creds if not set)

This code has been tested in #72521 with registry proxy running on port 6003 in bare metal environment.

  Enhance the deploy-konflux-operator step to support deployment in
  disconnected/air-gapped OpenShift environments with the following changes:

  - Add DISCONNECTED flag to enable disconnected mode operation
  - Support registry proxy configuration via USE_REGISTRY_PROXY flag
  - Add configurable registry proxy host/port (REGISTRY_PROXY_HOST/PORT)
  - Allow deriving proxy URL from mirror registry or explicit configuration
  - Add mirror registry credential handling (MIRROR_REGISTRY_DIR/CREDS)
  - Remove obsolete install_secret function (pull secret handling). This
    is handled directly in the deploy-operator.sh script.

  The step now supports two disconnected scenarios:
  1. Direct mirror registry access with authentication
  2. Registry proxy with custom or derived proxy endpoint

  Environment variables added:
  - DISCONNECTED (default: false)
  - USE_REGISTRY_PROXY (default: false)
  - REGISTRY_PROXY_HOST (optional, derived if not set)
  - REGISTRY_PROXY_PORT (required with REGISTRY_PROXY_HOST)
  - REGISTRY_PROXY_CREDENTIALS (optional, uses mirror creds if not set)
@openshift-ci openshift-ci bot requested review from ajaggapa and jcaamano December 17, 2025 09:57
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 17, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: mgencur
Once this PR has been reviewed and has the lgtm label, please assign ajaggapa for approval. For more information see the Code Review Process.

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

Details Needs approval from an approver in each of these files:

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

@mgencur
Copy link
Contributor Author

mgencur commented Dec 17, 2025

/hold

Depends on ajaggapa/deploy-konflux-operator#2

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 17, 2025
declare -r REGISTRY_PROXY_CREDENTIALS="${REGISTRY_PROXY_CREDENTIALS:-"${MIRROR_REGISTRY_CREDS}"}"
declare -r REGISTRY_PROXY_HOST="${REGISTRY_PROXY_HOST:-""}"
declare -r REGISTRY_PROXY_PORT="${REGISTRY_PROXY_PORT:-""}"
declare -r DEPLOY_KONFLUX_OPERATOR_VERSION=v7.1
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This will need to be changed once ajaggapa/deploy-konflux-operator#2 is merged and a new tag created.

@openshift-ci-robot
Copy link
Contributor

[REHEARSALNOTIFIER]
@mgencur: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
pull-ci-openshift-cluster-network-operator-master-e2e-metal-ipi-ovn-dualstack-bgp-local-gw openshift/cluster-network-operator presubmit Registry content changed
pull-ci-openshift-cluster-network-operator-release-4.22-e2e-metal-ipi-ovn-dualstack-bgp-local-gw openshift/cluster-network-operator presubmit Registry content changed
pull-ci-openshift-cluster-network-operator-release-4.21-e2e-metal-ipi-ovn-dualstack-bgp-local-gw openshift/cluster-network-operator presubmit Registry content changed
pull-ci-openshift-cluster-network-operator-release-4.20-e2e-metal-ipi-ovn-dualstack-bgp-local-gw openshift/cluster-network-operator presubmit Registry content changed
pull-ci-openshift-cluster-network-operator-release-4.19-e2e-metal-ipi-ovn-dualstack-bgp-local-gw openshift/cluster-network-operator presubmit Registry content changed
pull-ci-openshift-cluster-network-operator-release-4.20-e2e-aws-ovn-serial-ipsec openshift/cluster-network-operator presubmit Registry content changed
pull-ci-openshift-cluster-network-operator-release-4.19-e2e-aws-ovn-serial-ipsec openshift/cluster-network-operator presubmit Registry content changed
pull-ci-openshift-cluster-network-operator-release-4.18-e2e-aws-ovn-serial-ipsec openshift/cluster-network-operator presubmit Registry content changed
pull-ci-openshift-cluster-network-operator-release-4.17-e2e-aws-ovn-serial-ipsec openshift/cluster-network-operator presubmit Registry content changed
pull-ci-openshift-cluster-network-operator-release-4.16-e2e-aws-ovn-serial-ipsec openshift/cluster-network-operator presubmit Registry content changed
pull-ci-openshift-origin-main-e2e-metal-ipi-ovn-dualstack-bgp-local-gw openshift/origin presubmit Registry content changed
pull-ci-openshift-origin-release-4.22-e2e-metal-ipi-ovn-dualstack-bgp-local-gw openshift/origin presubmit Registry content changed
pull-ci-openshift-origin-release-4.21-e2e-metal-ipi-ovn-dualstack-bgp-local-gw openshift/origin presubmit Registry content changed
pull-ci-openshift-origin-release-4.20-e2e-metal-ipi-ovn-dualstack-bgp-local-gw openshift/origin presubmit Registry content changed
pull-ci-openshift-origin-release-4.19-e2e-metal-ipi-ovn-dualstack-bgp-local-gw openshift/origin presubmit Registry content changed
pull-ci-openshift-origin-release-4.18-e2e-metal-ipi-ovn-dualstack-bgp-local-gw-techpreview openshift/origin presubmit Registry content changed
pull-ci-openshift-origin-main-e2e-aws-ovn-serial-ipsec openshift/origin presubmit Registry content changed
pull-ci-openshift-origin-release-4.22-e2e-aws-ovn-serial-ipsec openshift/origin presubmit Registry content changed
pull-ci-openshift-origin-release-4.21-e2e-aws-ovn-serial-ipsec openshift/origin presubmit Registry content changed
pull-ci-openshift-origin-release-4.20-e2e-aws-ovn-serial-ipsec openshift/origin presubmit Registry content changed
pull-ci-openshift-origin-release-4.19-e2e-aws-ovn-serial-ipsec openshift/origin presubmit Registry content changed
pull-ci-openshift-origin-release-4.18-e2e-aws-ovn-serial-ipsec openshift/origin presubmit Registry content changed
pull-ci-openshift-origin-release-4.17-e2e-aws-ovn-serial-ipsec openshift/origin presubmit Registry content changed
pull-ci-openshift-origin-release-4.16-e2e-aws-ovn-serial-ipsec openshift/origin presubmit Registry content changed
pull-ci-openshift-machine-config-operator-main-e2e-aws-ovn-serial-ipsec openshift/machine-config-operator presubmit Registry content changed

A total of 48 jobs have been affected by this change. The above listing is non-exhaustive and limited to 25 jobs.

A full list of affected jobs can be found here
Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals.

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 17, 2025

@mgencur: all tests passed!

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants