Skip to content

TRT-2761: Revert #1330 "NO-ISSUE: Synchronize From Upstream Repositories"#1334

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
redhat-chai-bot:revert-1330-1782684731
Jun 29, 2026
Merged

TRT-2761: Revert #1330 "NO-ISSUE: Synchronize From Upstream Repositories"#1334
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
redhat-chai-bot:revert-1330-1782684731

Conversation

@redhat-chai-bot

Copy link
Copy Markdown
Contributor

Reverts #1330 ; tracked by TRT-2761

Per OpenShift policy, we are reverting this breaking change to get CI and/or nightly payloads flowing again.

PR #1330 ("NO-ISSUE: Synchronize From Upstream Repositories") introduced applyClusterTLSProfile() in packageserver startup with a 30-second API timeout. In HyperShift hosted clusters the API server may not be ready during initial cluster creation, causing fatal startup errors and container restarts. This has caused 5 consecutive payload rejections over 36 hours in the 5.0 CI stream, blocking hypershift-e2e-aws-ovn (streak of 3) and hypershift-e2e-aks (streak of 2).

Full AI payload analysis

To unrevert this, revert this PR, and layer an additional separate commit on top that addresses the problem. Before merging the unrevert, please run these jobs on the PR and check the result of these jobs to confirm the fix has corrected the problem:

/payload-job periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aws-ovn
/payload-job periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aks

CC: @openshift-bot

…ize-upstream"

This reverts commit 0adff33, reversing
changes made to 3222549.
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 28, 2026
@openshift-ci-robot

openshift-ci-robot commented Jun 28, 2026

Copy link
Copy Markdown

@redhat-chai-bot: This pull request references TRT-2761 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "5.0.0" version, but no target version was set.

Details

In response to this:

Reverts #1330 ; tracked by TRT-2761

Per OpenShift policy, we are reverting this breaking change to get CI and/or nightly payloads flowing again.

PR #1330 ("NO-ISSUE: Synchronize From Upstream Repositories") introduced applyClusterTLSProfile() in packageserver startup with a 30-second API timeout. In HyperShift hosted clusters the API server may not be ready during initial cluster creation, causing fatal startup errors and container restarts. This has caused 5 consecutive payload rejections over 36 hours in the 5.0 CI stream, blocking hypershift-e2e-aws-ovn (streak of 3) and hypershift-e2e-aks (streak of 2).

Full AI payload analysis

To unrevert this, revert this PR, and layer an additional separate commit on top that addresses the problem. Before merging the unrevert, please run these jobs on the PR and check the result of these jobs to confirm the fix has corrected the problem:

/payload-job periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aws-ovn
/payload-job periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aks

CC: @openshift-bot

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 openshift-eng/jira-lifecycle-plugin repository.

@coderabbitai

coderabbitai Bot commented Jun 28, 2026

Copy link
Copy Markdown

Warning

Review limit reached

@redhat-chai-bot, we couldn't start this review because you've reached your PR review rate limit.

More reviews will be available in 39 minutes and 11 seconds. Learn how PR review limits work.

Your organization has used up its prepaid credits, and credit purchases are no longer available. Enable the review add-on in the billing tab to keep reviews running — you're only billed for reviews past your plan's rate limits ($0.25/file).

⌛ How to resolve this issue?

After more reviews become available, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based credits.

🚦 How do rate limits work?

CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability.

For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window.

Please see our Fair Usage Limits Policy for further information.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 9cac59e0-af85-4099-abd1-21ff7b68e4ff

📥 Commits

Reviewing files that changed from the base of the PR and between 0adff33 and 4b0c882.

⛔ Files ignored due to path filters (53)
  • go.sum is excluded by !**/*.sum
  • staging/operator-lifecycle-manager/go.sum is excluded by !**/*.sum
  • vendor/github.com/containerd/containerd/labels/labels.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/containerd/containerd/labels/validate.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/containerd/containerd/version/version.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/go-viper/mapstructure/v2/.editorconfig is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/go-viper/mapstructure/v2/.envrc is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/go-viper/mapstructure/v2/.gitignore is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/go-viper/mapstructure/v2/.golangci.yaml is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/go-viper/mapstructure/v2/README.md is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/go-viper/mapstructure/v2/decode_hooks.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/go-viper/mapstructure/v2/devenv.lock is excluded by !**/*.lock, !**/vendor/**, !vendor/**
  • vendor/github.com/go-viper/mapstructure/v2/devenv.nix is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/go-viper/mapstructure/v2/devenv.yaml is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/go-viper/mapstructure/v2/errors.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/go-viper/mapstructure/v2/internal/errors/errors.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/go-viper/mapstructure/v2/internal/errors/join.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/go-viper/mapstructure/v2/internal/errors/join_go1_19.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/go-viper/mapstructure/v2/reflect_go1_19.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/go-viper/mapstructure/v2/reflect_go1_20.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/mitchellh/hashstructure/LICENSE is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/mitchellh/hashstructure/README.md is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/mitchellh/hashstructure/hashstructure.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/mitchellh/hashstructure/include.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/mitchellh/hashstructure/v2/errors.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/mitchellh/mapstructure/CHANGELOG.md is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/mitchellh/mapstructure/LICENSE is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/mitchellh/mapstructure/README.md is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/mitchellh/mapstructure/decode_hooks.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/mitchellh/mapstructure/error.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/mitchellh/mapstructure/mapstructure.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/onsi/ginkgo/v2/ginkgo/run/run_command.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/onsi/ginkgo/v2/ginkgo/watch/watch_command.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/onsi/ginkgo/v2/reporters/default_reporter.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/onsi/ginkgo/v2/types/config.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/onsi/ginkgo/v2/types/errors.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/onsi/ginkgo/v2/types/version.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/decorators/operator.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/lib/codec/mapstructure.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/lib/comparison/equal.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/package-server/server/server.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/prometheus/common/expfmt/expfmt.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/prometheus/common/expfmt/text_create.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/prometheus/common/expfmt/text_parse.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/prometheus/common/model/labels.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/prometheus/common/model/labelset.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/prometheus/common/model/metric.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/prometheus/common/model/time.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/prometheus/common/model/value.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/prometheus/common/model/value_float.go is excluded by !**/vendor/**, !vendor/**
  • vendor/github.com/prometheus/common/model/value_histogram.go is excluded by !**/vendor/**, !vendor/**
  • vendor/k8s.io/apimachinery/pkg/api/validation/objectmeta.go is excluded by !**/vendor/**, !vendor/**
  • vendor/modules.txt is excluded by !**/vendor/**, !vendor/**
📒 Files selected for processing (16)
  • go.mod
  • pkg/manifests/csv.yaml
  • staging/operator-lifecycle-manager/.github/workflows/e2e-tests.yml
  • staging/operator-lifecycle-manager/.github/workflows/go-verdiff.yaml
  • staging/operator-lifecycle-manager/.github/workflows/goreleaser.yaml
  • staging/operator-lifecycle-manager/.github/workflows/quickstart.yml
  • staging/operator-lifecycle-manager/.github/workflows/sanity.yaml
  • staging/operator-lifecycle-manager/.github/workflows/unit.yml
  • staging/operator-lifecycle-manager/deploy/chart/templates/_packageserver.clusterserviceversion.yaml
  • staging/operator-lifecycle-manager/deploy/upstream/quickstart/olm.yaml
  • staging/operator-lifecycle-manager/go.mod
  • staging/operator-lifecycle-manager/pkg/controller/operators/decorators/operator.go
  • staging/operator-lifecycle-manager/pkg/lib/codec/mapstructure.go
  • staging/operator-lifecycle-manager/pkg/lib/comparison/equal.go
  • staging/operator-lifecycle-manager/pkg/package-server/server/server.go
  • staging/operator-lifecycle-manager/pkg/package-server/server/server_test.go
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@redhat-chai-bot

Copy link
Copy Markdown
Contributor Author

/hold

Attempting fix in parallel — see PR #1333 which makes applyClusterTLSProfile() non-fatal instead of reverting the entire upstream sync. Payload validation is running on the fix PR. Will release the hold if the fix doesn't work out.

@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 Jun 28, 2026
@openshift-ci openshift-ci Bot requested review from bentito and dtfranz June 28, 2026 22:23
@sosiouxme

Copy link
Copy Markdown
Member

not sure i have the auth but per slack thread it seems to me we should get this revert in if we can and send a fix upstream.

/hold cancel
/lgtm
/approve
/verified by TRT revert policy

also hoping this is a flake:
/test e2e-gcp-olm

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 29, 2026
@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jun 29, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@sosiouxme: This PR has been marked as verified by TRT revert policy.

Details

In response to this:

not sure i have the auth but per slack thread it seems to me we should get this revert in if we can and send a fix upstream.

/hold cancel
/lgtm
/approve
/verified by TRT revert policy

also hoping this is a flake:
/test e2e-gcp-olm

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jun 29, 2026
@openshift-ci

openshift-ci Bot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: redhat-chai-bot, sosiouxme
Once this PR has been reviewed and has the lgtm label, please assign joelanford 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

@openshift-ci

openshift-ci Bot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

@redhat-chai-bot: 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.

@stbenjam

Copy link
Copy Markdown
Member

/label approved

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 29, 2026
@openshift-merge-bot openshift-merge-bot Bot merged commit 93e5a5c into openshift:main Jun 29, 2026
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants