Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: openshift/operator-framework-operator-controller
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: openshift/operator-framework-operator-controller
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: release-4.19
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 12 commits
  • 3,981 files changed
  • 8 contributors

Commits on May 23, 2025

  1. UPSTREAM: <carry>: [release-4.19] fix: don't template registry+v1 man…

    …ifests
    
    Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
    joelanford authored and openshift-merge-bot[bot] committed May 23, 2025
    Configuration menu
    Copy the full SHA
    fbfe799 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2025

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

    Signed-off-by: Jian Zhang <jiazha@redhat.com>
    jianzhangbjz authored and openshift-merge-bot[bot] committed May 26, 2025
    Configuration menu
    Copy the full SHA
    b64dbc9 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2025

  1. UPSTREAM: <carry>: [DefaultCatalogTests]: Add initial implementation

    From:
    - #320
    - #345
    - #348
    - #347
    - #350
    - #351
    - #355
    - #358
    
    NOTE: The commits were squashed but no changes are applied.
    camilamacedo86 authored and openshift-merge-bot[bot] committed May 28, 2025
    Configuration menu
    Copy the full SHA
    97be334 View commit details
    Browse the repository at this point in the history
  2. UPSTREAM: <carry>: Bump catalog versions to 4.19

    Signed-off-by: Todd Short <todd.short@me.com>
    (cherry picked from commit c25c411)
    tmshort authored and openshift-merge-bot[bot] committed May 28, 2025
    Configuration menu
    Copy the full SHA
    1f882bc View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2025

  1. UPSTREAM: <carry>: [Default Catalog Consistency Test]: fix junit outp…

    …ut format to allow generate xml
    camilamacedo86 authored and openshift-merge-bot[bot] committed Jun 9, 2025
    Configuration menu
    Copy the full SHA
    2dbc033 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    91325e7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    416a2d3 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2025

  1. UPSTREAM: <carry>: Safely handle changes to description fields (#2023)

    Motivation:
    
    When attempting to upgrade argocd-operator from v0.5.0 to v0.7.0, the upgrade process fails during the preflight CRD safety validation. The validation correctly detects that the `argocds.argoproj.io` CRD has been modified between the two versions.
    
    The specific error reported is:
    
    ```
    CustomResourceDefinition argocds.argoproj.io failed upgrade safety validation. "ChangeValidator" validation failed: version "v1alpha1", field "^.status.applicationController" has unknown change, refusing to determine that change is safe
    ```
    
    However, changes between the CRD versions in this instance are limited to non-functional updates in the description fields of various properties (e.g., status.applicationController).`ChangeValidator` lacks a specific rule to classify a description-only update as safe, which blocks legitimate and otherwise safe operator upgrades.
    
    Solution:
    
    This PR enhances the CRD upgrade safety validation logic to correctly handle changes to description fields by introducing a new `ChangeValidation` check for `Description`, and registering the check by adding it to the default list of `ChangeValidations` used by `ChangeValidator`.
    
    Result:
    
    Non-functional updates to documentation fields are now deemed safe(which resolves the upgrade failure for argocd-operator from v0.5.0 to v0.7.0)
    anik120 authored and openshift-merge-bot[bot] committed Jul 3, 2025
    Configuration menu
    Copy the full SHA
    8f42f09 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2025

  1. UPSTREAM: 1981: Backporting NetworkPolicy support for OLM bundles

    This is a hack to backport "NetworkPolicy object kind in bundles" support from
    operator-framework/operator-registry#1675
    The feature was introduced in OCP 4.20 with a operator-registry bump to v1.55.0.
    Ref:
    1. operator-registry v1.55.0 release: https://github.com/operator-framework/operator-registry/releases/tag/v1.55.0
    2. operator-registry bump in OCP 4.20: operator-framework/operator-controller#1981
    Because the upstream PR is not being backported in operator-registry to older tags (with new z stream releases),
    this achieves a downstream-only backport for this feature.
    anik120 authored and openshift-merge-bot[bot] committed Aug 13, 2025
    Configuration menu
    Copy the full SHA
    376a11c View commit details
    Browse the repository at this point in the history
  2. UPSTREAM: 2078: Add Network Policy to e2e test bundles

    Adds a Netwok Policy to the end-to-end test bundles and adds a check to
    the tests that the Network Policy resources are created.
    
    Signed-off-by: Tayler Geiger <tayler@redhat.com>
    trgeiger authored and openshift-merge-bot[bot] committed Aug 13, 2025
    Configuration menu
    Copy the full SHA
    abf9503 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2025

  1. Configuration menu
    Copy the full SHA
    cc0c7d5 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2025

  1. Merge pull request #543 from camilamacedo86/crd-upgrade-safety

    OPRUN-4216, OCPBUGS-63405: Port CRD upgrade safety carry from 4.20 without bumping deps
    openshift-merge-bot[bot] authored Nov 11, 2025
    Configuration menu
    Copy the full SHA
    4b3ad17 View commit details
    Browse the repository at this point in the history
Loading