Skip to content

Conversation

@openshift-bot
Copy link

@openshift-bot openshift-bot commented Nov 7, 2025

The downstream repository has been updated with the following following upstream commits:

Date Commit Author Message
2025-11-11 09:43:51 operator-framework/operator-controller@c8526e9 Camila Macedo (fix): Change make generate to not delete vendor files (#2320)
2025-11-11 09:38:20 operator-framework/operator-controller@936797b Predrag Knezevic 🌱 Add health probes to test-operator bundles (#2311)
2025-11-10 16:09:33 operator-framework/operator-controller@b634dac dependabot[bot] 🌱 Bump golang.org/x/sync from 0.17.0 to 0.18.0 (#2317)
2025-11-10 14:13:16 operator-framework/operator-controller@0268fae Todd Short ✨ Add e2e profiling toolchain for heap and CPU analysis (#2298)
2025-11-10 14:07:51 operator-framework/operator-controller@d4e93be Camila Macedo fix: improve boxcutter logging levels (#2314)
2025-11-07 01:25:17 operator-framework/operator-controller@b3f85d5 Todd Short Revert "Upgrade compatible bingo binaries ( kind/kustomize/opm/envtest ) (#2306)" (#2312)
2025-11-06 16:31:13 operator-framework/operator-controller@9530175 dependabot[bot] 🌱 Bump github.com/containerd/containerd from 1.7.28 to 1.7.29 (#2310)
2025-11-06 01:41:19 operator-framework/operator-controller@05ee601 Todd Short 📊 Calibrate Prometheus alert thresholds using memory profiling data (#2308)

The vendor/ directory has been updated and the following commits were carried:

Date Commit Author Message
2025-11-05 15:03:47 openshift/operator-framework-operator-controller@596608c dtfranz UPSTREAM: <carry>: Add OpenShift specific files
2025-11-05 15:03:49 openshift/operator-framework-operator-controller@8782110 Camila Macedo UPSTREAM: <carry>: Add new tests for single/own namespaces install modes
2025-11-05 15:03:49 openshift/operator-framework-operator-controller@e964249 Camila Macedo UPSTREAM: <carry>: Upgrade OCP image from 4.20 to 4.21
2025-11-05 15:03:50 openshift/operator-framework-operator-controller@4eaf694 Camila Macedo UPSTREAM: <carry>: [Default Catalog Tests] - Change logic to get ocp images from openshift/catalogd/manifests.yaml
2025-11-05 15:03:51 openshift/operator-framework-operator-controller@d92579c Todd Short UPSTREAM: <carry>: Update OCP catalogs to v4.21
2025-11-05 15:03:52 openshift/operator-framework-operator-controller@05c715e Kui Wang UPSTREAM: <carry>: support singleown cases in disconnected
2025-11-05 15:03:52 openshift/operator-framework-operator-controller@34f08ed Kui Wang UPSTREAM: <carry>: fix cases 81696 and 74618 for product code changes
2025-11-05 15:03:53 openshift/operator-framework-operator-controller@e7f4764 Camila Macedo UPSTREAM: <carry>: Define Default timeouts and apply their usage accross to avoid flakes
2025-11-05 15:03:54 openshift/operator-framework-operator-controller@046b856 Todd Short UPSTREAM: <carry>: Update to new feature-gate options in helm
2025-11-05 15:03:55 openshift/operator-framework-operator-controller@199c93e Camila Macedo UPSTREAM: <carry>: Fix flake for single/own ns tests by ensuring uniquess and waiting for k8s cleanups
2025-11-05 15:03:55 openshift/operator-framework-operator-controller@a83a6af Camila Macedo UPSTREAM: <carry>: [OTE]: Enhance single/own ns based on review comments ( Follow-Up of: 714977c )
2025-11-05 15:04:39 openshift/operator-framework-operator-controller@f5aab1b Kui Wang UPSTREAM: <carry>: Update OwnSingle template to use spec.config.inline.watchNamespace
2025-11-04 22:57:22 openshift/operator-framework-operator-controller@93b01c6 Camila Macedo UPSTREAM: <carry>: [OTE]: Add webhook cleanup validation on extension uninstall
2025-11-07 16:10:51 openshift/operator-framework-operator-controller@f1dd891 Kui Wang UPSTREAM: <carry>: Add [OTP] to migrated cases
2025-11-08 09:15:26 openshift/operator-framework-operator-controller@ad0222c Camila Macedo UPSTREAM: <carry>: [OTE]: Upgrade dependencies used
2025-11-10 19:00:13 openshift/operator-framework-operator-controller@9498b0a Camila Macedo UPSTREAM: <carry>: fix(OTE): fix OpenShift Kubernetes replace version format

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-framework

tmshort and others added 3 commits November 6, 2025 01:41
…#2308)

Analyze baseline memory usage patterns and adjust Prometheus alert thresholds
to eliminate false positives while maintaining sensitivity to real issues.

This is based on memory profiling done against BoxcutterRuntime, which has
increased memory load.

**Memory Analysis:**
- Peak RSS: 107.9MB, Peak Heap: 54.74MB during e2e tests
- Memory stabilizes at 106K heap (heap19-21 show 0K growth for 3 snapshots)
- Conclusion: NOT a memory leak, but normal operational behavior

**Memory Breakdown:**
- JSON Deserialization: 24.64MB (45%) - inherent to OLM's dynamic nature
- Informer Lists: 9.87MB (18%) - optimization possible via field selectors
- OpenAPI Schemas: 3.54MB (6%) - already optimized (73% reduction)
- Runtime Overhead: 53.16MB (49%) - normal for Go applications

**Alert Threshold Updates:**
- operator-controller-memory-growth: 100kB/sec → 200kB/sec
- operator-controller-memory-usage: 100MB → 150MB
- catalogd-memory-growth: 100kB/sec → 200kB/sec

**Rationale:**
Baseline profiling showed 132.4kB/sec episodic growth during informer sync
and 107.9MB peak usage are normal. Previous thresholds caused false positive
alerts during normal e2e test execution.

**Verification:**
- Baseline test (old thresholds): 2 alerts triggered (false positives)
- Verification test (new thresholds): 0 alerts triggered ✅
- Memory patterns remain consistent (~55MB heap, 79-171MB RSS)
- Transient spikes don't trigger alerts due to "for: 5m" clause

**Recommendation:**
Accept 107.9MB as normal operational behavior for test/development
environments. Production deployments may need different thresholds based
on workload characteristics (number of resources, reconciliation frequency).

**Non-viable Optimizations:**
- Cannot replace unstructured with typed clients (breaks OLM flexibility)
- Cannot reduce runtime overhead (inherent to Go)
- JSON deserialization is unavoidable for dynamic resource handling

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Signed-off-by: Todd Short <tshort@redhat.com>
Co-authored-by: Claude <noreply@anthropic.com>
Bumps [github.com/containerd/containerd](https://github.com/containerd/containerd) from 1.7.28 to 1.7.29.
- [Release notes](https://github.com/containerd/containerd/releases)
- [Changelog](https://github.com/containerd/containerd/blob/main/RELEASES.md)
- [Commits](containerd/containerd@v1.7.28...v1.7.29)

---
updated-dependencies:
- dependency-name: github.com/containerd/containerd
  dependency-version: 1.7.29
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@openshift-bot openshift-bot added tide/merge-method-merge Denotes a PR that should use a standard merge by tide when it merges. kind/sync labels Nov 7, 2025
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 7, 2025
@openshift-ci-robot
Copy link

@openshift-bot: This pull request explicitly references no jira issue.

In response to this:

The downstream repository has been updated with the following following upstream commits:

Date Commit Author Message
2025-11-07 01:25:17 operator-framework/operator-controller@b3f85d5 Todd Short Revert "Upgrade compatible bingo binaries ( kind/kustomize/opm/envtest ) (#2306)" (#2312)
2025-11-06 16:31:13 operator-framework/operator-controller@9530175 dependabot[bot] 🌱 Bump github.com/containerd/containerd from 1.7.28 to 1.7.29 (#2310)
2025-11-06 01:41:19 operator-framework/operator-controller@05ee601 Todd Short 📊 Calibrate Prometheus alert thresholds using memory profiling data (#2308)

The vendor/ directory has been updated and the following commits were carried:

Date Commit Author Message
2025-11-05 15:03:47 openshift/operator-framework-operator-controller@596608c dtfranz UPSTREAM: <carry>: Add OpenShift specific files
2025-11-05 15:03:49 openshift/operator-framework-operator-controller@8782110 Camila Macedo UPSTREAM: <carry>: Add new tests for single/own namespaces install modes
2025-11-05 15:03:49 openshift/operator-framework-operator-controller@e964249 Camila Macedo UPSTREAM: <carry>: Upgrade OCP image from 4.20 to 4.21
2025-11-05 15:03:50 openshift/operator-framework-operator-controller@4eaf694 Camila Macedo UPSTREAM: <carry>: [Default Catalog Tests] - Change logic to get ocp images from openshift/catalogd/manifests.yaml
2025-11-05 15:03:51 openshift/operator-framework-operator-controller@d92579c Todd Short UPSTREAM: <carry>: Update OCP catalogs to v4.21
2025-11-05 15:03:52 openshift/operator-framework-operator-controller@05c715e Kui Wang UPSTREAM: <carry>: support singleown cases in disconnected
2025-11-05 15:03:52 openshift/operator-framework-operator-controller@34f08ed Kui Wang UPSTREAM: <carry>: fix cases 81696 and 74618 for product code changes
2025-11-05 15:03:53 openshift/operator-framework-operator-controller@e7f4764 Camila Macedo UPSTREAM: <carry>: Define Default timeouts and apply their usage accross to avoid flakes
2025-11-05 15:03:54 openshift/operator-framework-operator-controller@046b856 Todd Short UPSTREAM: <carry>: Update to new feature-gate options in helm
2025-11-05 15:03:55 openshift/operator-framework-operator-controller@199c93e Camila Macedo UPSTREAM: <carry>: Fix flake for single/own ns tests by ensuring uniquess and waiting for k8s cleanups
2025-11-05 15:03:55 openshift/operator-framework-operator-controller@a83a6af Camila Macedo UPSTREAM: <carry>: [OTE]: Enhance single/own ns based on review comments ( Follow-Up of: 714977c )
2025-11-05 15:04:39 openshift/operator-framework-operator-controller@f5aab1b Kui Wang UPSTREAM: <carry>: Update OwnSingle template to use spec.config.inline.watchNamespace
2025-11-04 22:57:22 openshift/operator-framework-operator-controller@93b01c6 Camila Macedo UPSTREAM: <carry>: [OTE]: Add webhook cleanup validation on extension uninstall

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-framework

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-bot openshift-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 7, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 7, 2025

@openshift-bot: GitHub didn't allow me to request PR reviews from the following users: openshift/openshift-team-operator-framework.

Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

The downstream repository has been updated with the following following upstream commits:

Date Commit Author Message
2025-11-07 01:25:17 operator-framework/operator-controller@b3f85d5 Todd Short Revert "Upgrade compatible bingo binaries ( kind/kustomize/opm/envtest ) (#2306)" (#2312)
2025-11-06 16:31:13 operator-framework/operator-controller@9530175 dependabot[bot] 🌱 Bump github.com/containerd/containerd from 1.7.28 to 1.7.29 (#2310)
2025-11-06 01:41:19 operator-framework/operator-controller@05ee601 Todd Short 📊 Calibrate Prometheus alert thresholds using memory profiling data (#2308)

The vendor/ directory has been updated and the following commits were carried:

Date Commit Author Message
2025-11-05 15:03:47 openshift/operator-framework-operator-controller@596608c dtfranz UPSTREAM: <carry>: Add OpenShift specific files
2025-11-05 15:03:49 openshift/operator-framework-operator-controller@8782110 Camila Macedo UPSTREAM: <carry>: Add new tests for single/own namespaces install modes
2025-11-05 15:03:49 openshift/operator-framework-operator-controller@e964249 Camila Macedo UPSTREAM: <carry>: Upgrade OCP image from 4.20 to 4.21
2025-11-05 15:03:50 openshift/operator-framework-operator-controller@4eaf694 Camila Macedo UPSTREAM: <carry>: [Default Catalog Tests] - Change logic to get ocp images from openshift/catalogd/manifests.yaml
2025-11-05 15:03:51 openshift/operator-framework-operator-controller@d92579c Todd Short UPSTREAM: <carry>: Update OCP catalogs to v4.21
2025-11-05 15:03:52 openshift/operator-framework-operator-controller@05c715e Kui Wang UPSTREAM: <carry>: support singleown cases in disconnected
2025-11-05 15:03:52 openshift/operator-framework-operator-controller@34f08ed Kui Wang UPSTREAM: <carry>: fix cases 81696 and 74618 for product code changes
2025-11-05 15:03:53 openshift/operator-framework-operator-controller@e7f4764 Camila Macedo UPSTREAM: <carry>: Define Default timeouts and apply their usage accross to avoid flakes
2025-11-05 15:03:54 openshift/operator-framework-operator-controller@046b856 Todd Short UPSTREAM: <carry>: Update to new feature-gate options in helm
2025-11-05 15:03:55 openshift/operator-framework-operator-controller@199c93e Camila Macedo UPSTREAM: <carry>: Fix flake for single/own ns tests by ensuring uniquess and waiting for k8s cleanups
2025-11-05 15:03:55 openshift/operator-framework-operator-controller@a83a6af Camila Macedo UPSTREAM: <carry>: [OTE]: Enhance single/own ns based on review comments ( Follow-Up of: 714977c )
2025-11-05 15:04:39 openshift/operator-framework-operator-controller@f5aab1b Kui Wang UPSTREAM: <carry>: Update OwnSingle template to use spec.config.inline.watchNamespace
2025-11-04 22:57:22 openshift/operator-framework-operator-controller@93b01c6 Camila Macedo UPSTREAM: <carry>: [OTE]: Add webhook cleanup validation on extension uninstall

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-framework

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.

@openshift-bot openshift-bot added the lgtm Indicates that a PR is ready to be merged. label Nov 7, 2025
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Nov 10, 2025
@jianzhangbjz
Copy link
Contributor

/verified bypass

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Nov 10, 2025
@openshift-ci-robot
Copy link

@jianzhangbjz: The verified label has been added.

In response to this:

/verified bypass

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.

camilamacedo86 and others added 2 commits November 10, 2025 14:07
- Use Error level for all error conditions (validation, collision, engine failures)
- Move verbose success reports to V(1) debug mode
- Include full diagnostic reports when errors occur

Co-authored-by: Todd Short <tmshort@users.noreply.github.com>
Introduces automated memory and CPU profiling for e2e tests with:
- Automatic port-forwarding to Kubernetes deployment pprof endpoints
- Configurable periodic heap and CPU profile collection with differential timing
- Analysis report generation with growth metrics and top allocators
- Makefile targets: start-profiling, stop-profiling, analyze-profiles

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Signed-off-by: Todd Short <tshort@redhat.com>
Co-authored-by: Claude <noreply@anthropic.com>
@tmshort
Copy link
Contributor

tmshort commented Nov 10, 2025

/close
This is dangerous to merge since it doesn't include #547 the auto-bumper-on-merge is failing.

@openshift-ci openshift-ci bot closed this Nov 10, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 10, 2025

@tmshort: Closed this PR.

In response to this:

/close
This is dangerous to merge since it doesn't include #547 the auto-bumper-on-merge is failing.

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.

@tmshort
Copy link
Contributor

tmshort commented Nov 10, 2025

/repoen
My mistake, #547 was already included.

@tmshort
Copy link
Contributor

tmshort commented Nov 10, 2025

/reopen

@openshift-ci openshift-ci bot reopened this Nov 10, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 10, 2025

@tmshort: Reopened this PR.

In response to this:

/reopen

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.

@openshift-ci-robot
Copy link

@openshift-bot: This pull request explicitly references no jira issue.

In response to this:

The downstream repository has been updated with the following following upstream commits:

Date Commit Author Message
2025-11-07 01:25:17 operator-framework/operator-controller@b3f85d5 Todd Short Revert "Upgrade compatible bingo binaries ( kind/kustomize/opm/envtest ) (#2306)" (#2312)
2025-11-06 16:31:13 operator-framework/operator-controller@9530175 dependabot[bot] 🌱 Bump github.com/containerd/containerd from 1.7.28 to 1.7.29 (#2310)
2025-11-06 01:41:19 operator-framework/operator-controller@05ee601 Todd Short 📊 Calibrate Prometheus alert thresholds using memory profiling data (#2308)

The vendor/ directory has been updated and the following commits were carried:

Date Commit Author Message
2025-11-05 15:03:47 openshift/operator-framework-operator-controller@596608c dtfranz UPSTREAM: <carry>: Add OpenShift specific files
2025-11-05 15:03:49 openshift/operator-framework-operator-controller@8782110 Camila Macedo UPSTREAM: <carry>: Add new tests for single/own namespaces install modes
2025-11-05 15:03:49 openshift/operator-framework-operator-controller@e964249 Camila Macedo UPSTREAM: <carry>: Upgrade OCP image from 4.20 to 4.21
2025-11-05 15:03:50 openshift/operator-framework-operator-controller@4eaf694 Camila Macedo UPSTREAM: <carry>: [Default Catalog Tests] - Change logic to get ocp images from openshift/catalogd/manifests.yaml
2025-11-05 15:03:51 openshift/operator-framework-operator-controller@d92579c Todd Short UPSTREAM: <carry>: Update OCP catalogs to v4.21
2025-11-05 15:03:52 openshift/operator-framework-operator-controller@05c715e Kui Wang UPSTREAM: <carry>: support singleown cases in disconnected
2025-11-05 15:03:52 openshift/operator-framework-operator-controller@34f08ed Kui Wang UPSTREAM: <carry>: fix cases 81696 and 74618 for product code changes
2025-11-05 15:03:53 openshift/operator-framework-operator-controller@e7f4764 Camila Macedo UPSTREAM: <carry>: Define Default timeouts and apply their usage accross to avoid flakes
2025-11-05 15:03:54 openshift/operator-framework-operator-controller@046b856 Todd Short UPSTREAM: <carry>: Update to new feature-gate options in helm
2025-11-05 15:03:55 openshift/operator-framework-operator-controller@199c93e Camila Macedo UPSTREAM: <carry>: Fix flake for single/own ns tests by ensuring uniquess and waiting for k8s cleanups
2025-11-05 15:03:55 openshift/operator-framework-operator-controller@a83a6af Camila Macedo UPSTREAM: <carry>: [OTE]: Enhance single/own ns based on review comments ( Follow-Up of: 714977c )
2025-11-05 15:04:39 openshift/operator-framework-operator-controller@f5aab1b Kui Wang UPSTREAM: <carry>: Update OwnSingle template to use spec.config.inline.watchNamespace
2025-11-04 22:57:22 openshift/operator-framework-operator-controller@93b01c6 Camila Macedo UPSTREAM: <carry>: [OTE]: Add webhook cleanup validation on extension uninstall
2025-11-07 16:10:51 openshift/operator-framework-operator-controller@f1dd891 Kui Wang UPSTREAM: <carry>: Add [OTP] to migrated cases

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

/cc @openshift/openshift-team-operator-framework

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.

@tmshort
Copy link
Contributor

tmshort commented Nov 10, 2025

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 10, 2025
@tmshort
Copy link
Contributor

tmshort commented Nov 10, 2025

My mistake, it seems to be missing #544

@tmshort
Copy link
Contributor

tmshort commented Nov 10, 2025

/hold due to missing #544

ci-robot and others added 20 commits November 11, 2025 10:09
Signed-off-by: dtfranz <dfranz@redhat.com>

UPSTREAM: <carry>: Update generate-manifests to handle new directory

The `default` directory was renamed `base`.

Signed-off-by: Todd Short <todd.short@me.com>

The `base` directory was moved to `base\operator-controller`.

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: Drop commitchecker

Signed-off-by: Alexander Greene <greene.al1991@gmail.com>

UPSTREAM: <carry>: Updating ose-olm-operator-controller-container image to be consistent with ART
Reconciling with https://github.com/openshift/ocp-build-data/tree/4022cd290f00a44d667dda03f2d78d84a488c7ed/images/ose-olm-operator-controller.yml

UPSTREAM: <carry>: update owners

* Remove alumni from owners
* Add m1kola to approvers

Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>

UPSTREAM: <carry>: Add pointer to tooling README

UPSTREAM: <carry>: Disable Validating Admission Policy APIs downstream

Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>

UPSTREAM: <carry>: Updating ose-olm-operator-controller-container image to be consistent with ART for 4.16
Reconciling with https://github.com/openshift/ocp-build-data/tree/6250d54c4686a708ca5985afb73080e8ca9a1f7f/images/ose-olm-operator-controller.yml

UPSTREAM: <carry>: Enable Validating Admission Policy APIs downstream

* This reverts commit 3f079c4.
* Includes Validating Admission Policy manifests

Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>

UPSTREAM: <carry>: manifests: set required-scc for openshift workloads

UPSTREAM: <carry>: Updating ose-olm-operator-controller-container image to be consistent with ART for 4.17
Reconciling with https://github.com/openshift/ocp-build-data/tree/4c1326094222f9209876f06833179a1b9178faf7/images/ose-olm-operator-controller.yml

UPSTREAM: <carry>: add everettraven to approvers+reviewers

Signed-off-by: everettraven <everettraven@gmail.com>

UPSTREAM: <carry>: add openshift kustomize overlay

to enable TLS communication with catalogd. Configure the CA certs
using the configmap injection method via service-ca-operator

Signed-off-by: everettraven <everettraven@gmail.com>

UPSTREAM: <carry>: Add tmshort to approvers

Also `s/runtime/framework/g` in the DOWNSTREAM_OWNERS

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: Updating ose-olm-operator-controller-container image to be consistent with ART for 4.18
Reconciling with https://github.com/openshift/ocp-build-data/tree/dd68246f3237db5db458127566fc7b05b55e1660/images/ose-olm-operator-controller.yml

UPSTREAM: <carry>: Properly copy and call kustomize

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: manifests: add hostPath mount for /etc/containers

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>

UPSTREAM: <carry>: Add test-e2e target for downstream Makefile to be run by openshift/release.

Signed-off-by: dtfranz <dfranz@redhat.com>

UPSTREAM: <carry>: Add downstream verify makefile target

Signed-off-by: dtfranz <dfranz@redhat.com>

UPSTREAM: <carry>: openshift: template log verbosity to be managed by cluster-olm-operator

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>

UPSTREAM: <carry>: Add global-pull-secret flag

Pass global-pull-secret to the manager container.

Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>

UPSTREAM: <carry>: Update openshift CAs to operator-controller

The /run/secrets/kubernetes.io/serviceaccount/ directory is projected
into the pod and contains the following CA certificates:

* configmap/kube-root-ca.crt as ca.crt
* configmap/openshift-service-ca.crt as service-ca.crt

Update the --ca-certs-dir argument to reference the directory.

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: Add HowTo for origin tests

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: Add e2e registry Dockerfile

Signed-off-by: dtfranz <dfranz@redhat.com>

UPSTREAM: <carry>: add nodeSelector and tolerations to operator-controller deployment via kustomize patch

Signed-off-by: everettraven <everettraven@gmail.com>

UPSTREAM: <carry>: namespace: use privileged PSA for audit and warn levels

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>

UPSTREAM: <carry>: Enable downstream e2e

Signed-off-by: dtfranz <dfranz@redhat.com>

UPSTREAM: <carry>: Remove m1kola from owners

Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>

UPSTREAM: <carry>: Updating ose-olm-operator-controller-container image to be consistent with ART for 4.19
Reconciling with https://github.com/openshift/ocp-build-data/tree/a39508c86497b4e5e463d7b2c78e51e577be9e7d/images/ose-olm-operator-controller.yml

UPSTREAM: <carry>: generate and mount service-ca server cert

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>

UPSTREAM: <carry>: Add support for proxy trustedCAs

Just map the list of trusted ca certs into the deployment

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: Fix error to build the image

Copy correct (new) executable name for operator-controller

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: Fix make verify for mac os envs

Joe Lanford <joe.lanford@gmail.com>

UPSTREAM: <carry>: Move operator-controller openshift files to its own dir

UPSTREAM: <carry>: Upgrade OCP images from 4.18 to 4.19

UPSTREAM: <carry>: Add Openshift's catalogd manifests

- Move to openshift/catalogd the specific manifest under: https://github.com/openshift/operator-framework-catalogd/tree/main/openshift
- Add call to generate catalogd manifest to 'make manifest'. Make verify test is now done for catalogd and operator-controller Openshift's manifests

UPSTREAM: <carry>: resolve issue with pre-mature mounting of trusted CA configmap

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>

UPSTREAM: <carry>: Add /etc/docker to the operator-controller and catalogd deployments

This allows for use of the any image.config.openshift.io trusted CAs

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: fixup catalogd.Dockerfile paths

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>

UPSTREAM: <carry>: Resolve issue with pre-mature mounting of service CA configmap

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: use projected volume for CAs to avoid subPath limitations

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>

UPSTREAM: <carry>: Revert "UPSTREAM: <carry>: use projected volume for CAs to avoid subPath limitations"

This reverts commit 548caa4.

UPSTREAM: <carry>: use projected volume for CAs to avoid subPath limitations

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>

UPSTREAM: <carry>: Remove vet from openshift verify

The `vet` target was removed upstream.

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: Skip another upstream test

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: Cleanup openshift/Makefile by removing no longer required comments regards catalogd e2e tests

UPSTREAM: <carry>: Enable OCP metrics collection by default

Enables OCP to collect Prometheus metrics for both catalogd and
operator-controller by default. This is accomplished
via ServiceMonitor CRs which are now created for both projects.

UPSTREAM: <carry>: Fix catalogd.Dockerfile to use new paths

The root catalogd directory has been removed

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: Update DOWNSTREAM_OWNERS_ALIASES

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: Add openshift node selector annotation

Signed-off-by: Catherine Chan-Tse <cchantse@redhat.com>
(cherry picked from commit 9b4a113)

UPSTREAM: <carry>: Add caalogd-cas-dir option to op-con

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: set the SElinux type

Signed-off-by: Jian Zhang <jiazha@redhat.com>

UPSTREAM: <carry>: Add initial stack to run tests to validate the catalogs

UPSTREAM: <carry>: Add vendor files for the catalog-sync tests

UPSTREAM: <carry>: Bump catalog versions to 4.19

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: revert "Bump catalog versions to 4.19"

This reverts commit a98980b.

UPSTREAM: <carry>: Update HOWTO-origin-tests

techpreview is no longer a required option.

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: [DefaultCatalogTests]: Allow to pass auth path for docker credentials"

UPSTREAM: <carry>: fix: set NoLchown=true to allow image unpack on OCPci

UPSTREAM: <carry>: [DefaultCatalogTests]: Moving parse of ENVVAR to the caller (follow-up 345)

UPSTREAM: <carry>: [Default Catalog]: Create tmp dir to extract layers with right permissions to avoid issues scenarios

UPSTREAM: <carry>: [Default Catalog](cleanp) Remove hack directory which is not used

UPSTREAM: <carry>: Change code implementation to extract layers in OCP env

UPSTREAM: <carry>: Add vendor files for change in the extract code implementation

UPSTREAM: <carry>: [Default Catalog Tests]: Final cleanups and enhancements of initial implementation

UPSTREAM: <carry>: SELinux type for operator-controller

Signed-off-by: Jian Zhang <jiazha@redhat.com>

UPSTREAM: <carry>: Bump catalog versions to 4.19

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: [Default Catalog Consistency Test] (feat) add check for executable files in filesystem

Checks if given paths exist and point to executable files or valid symlinks.

UPSTREAM: <carry>: [Default Catalog Consistency Test]: fix junit output format to allow generate xml

UPSTREAM: <carry>: [Default Catalog Consistency Test] (feat) add check to validate multi-arch support

UPSTREAM: <carry>: [Default Catalog Consistency Test]: Enable CatalogChecks

UPSTREAM: <carry>: [Default Catalog Consistency Test]: Rename Tests suite and small cleanups

UPSTREAM: <carry>: Updating ose-olm-operator-controller-container image to be consistent with ART for 4.20
Reconciling with https://github.com/openshift/ocp-build-data/tree/dfb5c7d531490cfdc61a3b88bc533702b9624997/images/ose-olm-operator-controller.yml

UPSTREAM: <carry>: Updating ose-olm-catalogd-container image to be consistent with ART for 4.20
Reconciling with https://github.com/openshift/ocp-build-data/tree/dfb5c7d531490cfdc61a3b88bc533702b9624997/images/ose-olm-catalogd.yml

UPSTREAM: <carry>: Update e2e registry to use 1.24/4.20

Update the e2e registry Dockerfile to use golang 1.24/OCP 4.20

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: [Catalog Default Tests]: Upgrade go version to 1.24.3, dependencies and fix new lint issue

UPSTREAM: <carry>: Add structure to allow move the orgin tests using OTE

This commit introduces a binary and supporting structure to enable the
execution of OpenShift origin (olmv1) tests using the Open Test Environment (OTE).

It lays the groundwork for moving origin test in openshift/origin to
be executed from this repository using OTE.

UPSTREAM: <carry>: Add support for experimental manifests

Update the openshift kustomize configuration for both operator-controller
and catalogd.

Update the manifest generation scripts to put the core generation code
into a function (ignore-whitespace will help with the review), so that
it can be called twice; once for standard, and once for experimental.

Move around some of the kustomization directives to
* Create a patch kustomization (Component) file and move the patch directives from olmv1-ns there. This allows it to be referenced from a different directory.
* Add a kustomization file for tusted-ca. This allows it to be referenced from a different directory.
* Move the setting of the namePrefix for operator-controller; this makes the generation compatible with upstream feature components.
* Define experimental kustomization files that reference existing components.
* Reference the correct CRDs (standard or experimental).
* Add references to upstream feature components into the experimental manifests.

This *will* add `--feature-gates` options from the upstream feature
components to the experimental manifests. The cluster-olm-operator will
strip those arguments from the deployments before adding the enabled
feature gates.

Update the Dockerfiles to include the experimental manifests and a copy
script (`cp-manifests`) into the image containers. The complexity of
having multiple sets of manifests mean that the simple initContainer
copy mechanism found in cluster-olm-operator is no longer sufficient.

This attempts to keep backwards compatibility with older versions of
cluster-olm-operator, specifically by keeping the original (standard)
manifests in the original location, and adding the experimental
manifests in a new directory. The new `cp-manifests` script is used
by newer versions of cluster-olm-operator.

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: [OTE] - chore: follow up openshift#383 – remove unreachable target call

UPSTREAM: <carry>: Remove build of test image registry

Upstream now uses a different image

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: Add test-experimental-e2e target to openshift Makefile

This adds a test-experimental-e2e target to allow the CI to run the
experimental e2e test.

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: [OTE]: Add binary in the operator controller image to allow proper integration with OCP tests

UPSTREAM: <carry>: Fix experimental manifest copying

The standard manifest was being copied rather than the experimental
manifest. This meant that the expected feature-flags are not present.
This is failing now that we are doing a check for those feature-flags.

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: Update manifest generation for upstream rbac/webhooks

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: [OTE] - Add tracking mechanism

UPSTREAM: <carry>: Update OTE dep to get fix

UPSTREAM: <carry>: [OTE] Add Readme

UPSTREAM: <carry>: set GIT_COMMIT env from SOURCE_GIT_COMMIT in Dockerfiles for operator-controller and catalogd

Signed-off-by: Rashmi Gottipati <chowdary.grashmi@gmail.com>

UPSTREAM: <carry>: add openshift specific build target to pass commit info downstream

Signed-off-by: Ankita Thomas <ankithom@redhat.com>

UPSTREAM: <carry>: add source commit into binaries when linking

- Removes extra GIT_COMMIT set
- fixup Dockerfiles after rebase
- consider "" unset so build-info can fill commit/date
- double quote go flags & honor GIT_COMMIT if set
- improve robustness of build-info parsing
- Trim whitespace on all version fields
- isUnset and valueOrUnknown now call strings.TrimSpace
- Avoid clobbering values injected via ldflags
- set repoState from build-info only when repoState is still unset
- set version from build-info only when unset and build-info value is non-empty

UPSTREAM: <carry>: OTE add first test from openshift/origin olmv1.go

UPSTREAM: <carry>: Migrate tasks from openshift/origin olm v1.go file which are remaining

This commit moves the final OLMv1 tests from openshift/origin/test/extended/olm/olmv1.go to their proper location in this repository. This migration is part of a larger effort to streamline development by co-locating tests with the component they validate. This will reduce CI overhead and allow for faster, more atomic changes.

Assisted-by: Gemini

UPSTREAM: <carry>: OTE - How to test locally with OCP instances

UPSTREAM: <carry>: [OTE] Refac: refac helper and olmv1 test to create namespace instead to use pre-existent

UPSTREAM: <carry>: [OTE] add webhook tests

Migrates OLMv1 webhook operator tests from using external YAML files to
defining resources in Go structs. This change removes file dependencies,
improving test reliability and simplifying test setup.

The migration is a refactoring of code from openshift/origin#30059.
The new code uses better naming conventions and adapts the tests to work
with a controller-runtime client, enhancing test consistency and maintainability.

The migration covers all core test scenarios:
- Validating, mutating, and conversion webhooks.
- Certificate and secret rotation tolerance.

Assisted-by: Gemini

UPSTREAM: <carry>: OTE: rewrite the upgrade incompatible operator test

This test replaces the existing upgrade incompatible test.
The main change is that operator and catalog bundles are created on-the-fly
to support OCP 4.20. This means we are no longer dependent on public
operators for this test.

This creates new bundles in the OCP ImageRegistry, this requires using
a number of OCP APIs, including using a raw API URL to invoke the build.
This is done by invoking an external k8s client (either `oc` or `kubectl`),
and passing it a tarball of the bundle to be created. So, it can't be done
by the golang k8sClient normally available (i.e. the create input is a
tarball not a YAML file).

This introduces the use of go-bindata to store the bundle contents.

It also pulls in openshift mage, buld and operator APIs.

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: Handle service-ca cert availability/rotation

There is problem when the service-ca certificate is not available at pod start.
This is an issue because the SystemCertPool is created from SSL_CERT_DIR,
which may include the empty service-ca. The SystemCertPool is never regenerated
during the lifetime of the program execution, so it will never get updated when
the service-ca is filled. Thus, we need to use --pull-cas-dir to reference the
CAs that we want to use. This will also allow OLMv1 to reload the service-ca
when it is reloaded (after 2 years, mind you). Removing the SSL_CERT_DIR setting,
and adding the --pull-cas-dir flag ought to be equivalent to what we have now
(i.e. SSL_CERT_DIR and no --pull-cas-dir), except that rotation will be handled
better.

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: [OTE] add webhook tests

Revert "UPSTREAM: <carry>: [OTE] add webhook tests"

This reverts commit 9963614.

UPSTREAM: <carry>: Upgrade OCP Catalog images from 4.19 to 4.20

UPSTREAM: <carry>: Remove bindata generation from build

Using go-bindata is causing problems with ART builds.

This removes the use of go-bindata from the builds.

This will subsequently require that users MANUALLY run
the `bindata` target to refresh the bindata, or use
the `build-update` target.

This is a quickfix to put out the fire.

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: [OTE] Add webhook tests

- Add dumping of container logs and `kubectl describe pods` output for better diagnostics.
- Include targeted certificate details dump (`tls.crt` parse) when failures occur.
- Add additional check to verify webhook responsiveness after certificate rotation.

This change is a refactor of code from openshift/origin#30059.

Assisted-by: Gemini

UPSTREAM: <carry>: OTE add logs and dumps for olmv1 test and fix helper for clusterextensions

UPSTREAM: <carry>: [OTE] Migrate preflight checks from openshift/origin

Migrated OLMv1 operator preflight checks from using external YAML files to
defining ClusterRole permissions directly in Go structs. This improves test
reliability and simplifies test setup by removing file dependencies.

The changes ensure precise replication of original test scenarios,
including specific permission omissions for services, create verbs,
ClusterRoleBindings, ConfigMap resourceNames, and escalate/bind verbs.

Assisted-by: Gemini

UPSTREAM: <carry>: [OTE] Add webhook to validate openshift-service-ca certificate rotation

This change is a refactor of code from openshift/origin#30059.

Assisted-by: Gemini

UPSTREAM: <carry>: Adds ResourceVersion checks to the tls secret deletion test, mirroring the logic used in the certificate rotation test. This makes the test more robust by ensuring a new secret is created, not just that an existing one is still present.

UPSTREAM: <carry>: [OTE] - Readme:Add info to help use payload-aggregate with new tests

UPSTREAM: <carry>: remove obsolete owners

Signed-off-by: grokspawn <jordan@nimblewidget.com>

UPSTREAM: <carry>: [OTE] add catalog tests from openshift/origin

This commit migrates the olmv1_catalog set of tests from openshift/origin
to OTE as part the broad effort to migrate all tests.

Assisted-by: Gemini

UPSTREAM: <carry>: Migrate single/own namespace tests

This commit migrates the OLMv1 single and own namespace watch mode tests from openshift/origin/test/extended/olm/olmv1-singleownnamespace.go to this repository. This is part of the effort to move component-specific tests into their respective downstream locations.

Assisted-by: Gemini

UPSTREAM: <carry>: Adds ResourceVersion checks to the tls secret deletion test, mirroring the logic used in the certificate rotation test. This makes the test more robust by ensuring a new secret is created, not just that an existing one is still present.

This reverts commit 0bb1953.

UPSTREAM: <carry>: [OTE] Add webhook to validate openshift-service-ca certificate rotation

This reverts commit e9e3220.

UPSTREAM: <carry>: Ensure unique name for bad-catalog tests

UPSTREAM: <carry>: Revert "Handle service-ca cert availability/rotation"

This reverts commit 9cc13d8.

UPSTREAM: <carry>: grant QE approver permission for OTE

UPSTREAM: <carry>: Update webhook ote tests to use latest webhook-operator

Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>

UPSTREAM: <carry>: update operator-controller to v1.5.1

UPSTREAM: <carry>: configure watchnamespace using spec.config for OTE tests

UPSTREAM: <carry>: add jiazha to approvers

UPSTREAM: <carry>: Create combined manifests for comparison

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: Use Helm charts for openshift manifests

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: add support for tests-private cases and add the case

UPSTREAM: <carry>: Fix cp-manifests copying of helm charts

The method used to copy the helm charts is including an extra `helm`
directory in the destination path, that is making the cluster-olm-operator
code just a bit more complicated than it needs to be.

This fixes the copy location.

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: Remove kustomize manifests from images and repo

Now that helm manifests are being used to dynamically generate the
manifests, the pre-generated manifests are no longer needed. So,
we can remove them from the repo and the images.

However, because we still want to verify the manifests are "good",
we are still creating a "single-file" version of the manifests
for verification purposes, and to allow us to see what changes
are happening to the manifests (from upstream and/or downstream
sources).

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: Add pedjak and trgeiger as reviewers

UPSTREAM: <carry>: migrate more cases from tests-private and enhance suites with filters

UPSTREAM: <carry>: Updating ose-olm-operator-controller-container image to be consistent with ART for 4.21
Reconciling with https://github.com/openshift/ocp-build-data/tree/4fbe3fab45239dc4be6f5d9d98a0bf36e0274ec9/images/ose-olm-operator-controller.yml

UPSTREAM: <carry>: Updating ose-olm-catalogd-container image to be consistent with ART for 4.21
Reconciling with https://github.com/openshift/ocp-build-data/tree/4fbe3fab45239dc4be6f5d9d98a0bf36e0274ec9/images/ose-olm-catalogd.yml

UPSTREAM: <carry>: OTE: Enable disconnected environment and build test operator controller image

Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>

UPSTREAM: <carry>: for incompatible test add func to wait builder and deployer SA creation by OCP controller

UPSTREAM: <carry>: Fix VERSION replacement in catalog bindata

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: check kubeconfig only run-test and run-suite

UPSTREAM: <carry>: Clean up cp-manifests

There is no longer a need to copy conditionally

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: Update does-not-exist and simple install to work in a disconnected environment

Signed-off-by: Todd Short <todd.short@me.com>

UPSTREAM: <carry>: support webhook case in disconnected

UPSTREAM: <carry>: Consolidate build API

This consolidates the in-cluster building of a bundle and catalog.
The catalog and bundle bindata are inputs, along with a set of
replacements so that catalog and bundle templates can be used to
create the images.

This can be done in the BeforeEach() for a set of tests that use the
same data.

Signed-off-by: Todd Short <todd.short@me.com>
…images from openshift/catalogd/manifests.yaml
Signed-off-by: Todd Short <todd.short@me.com>
Signed-off-by: Todd Short <todd.short@me.com>
…uess and waiting for k8s cleanups

Co-Author: kuiwang@redhat.com
… format

Fix k8s.io/kubernetes replace version from v1.30.1-0... to v0.0.0-... format to resolve
bumper tool verification failures. Add hack/ocp-replace.sh script to manage OCP fork
replaces properly.

Assisted-by: Cursor
@openshift-bot openshift-bot added the lgtm Indicates that a PR is ready to be merged. label Nov 11, 2025
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Nov 11, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 11, 2025

New changes are detected. LGTM label has been removed.

@openshift-bot openshift-bot added the lgtm Indicates that a PR is ready to be merged. label Nov 11, 2025
@camilamacedo86
Copy link
Contributor

/hold cancel

/lgtm
/approved

@tmshort now we can move forward :-)

@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 Nov 11, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 11, 2025

@openshift-bot: all tests passed!

Full PR test history. Your PR dashboard.

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.

@tmshort
Copy link
Contributor

tmshort commented Nov 11, 2025

Now, we just need this verified...

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. kind/sync lgtm Indicates that a PR is ready to be merged. tide/merge-method-merge Denotes a PR that should use a standard merge by tide when it merges.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants