+
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: cri-o/cri-o
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: cri-o/cri-o
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: release-1.33
Choose a head ref
  • 20 commits
  • 26 files changed
  • 7 contributors

Commits on May 21, 2025

  1. sandbox: use created/stopped instead of infra container for readiness

    As we hit cases of deadlock when a sandbox is stuck stopping
    
    Signed-off-by: Peter Hunt <pehunt@redhat.com>
    haircommander authored and openshift-cherrypick-robot committed May 21, 2025
    Configuration menu
    Copy the full SHA
    7ca5aa7 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2025

  1. Merge pull request #9214 from openshift-cherrypick-robot/cherry-pick-…

    …9188-to-release-1.33
    
    [release-1.33] RFC: sandbox: use created/stopped instead of infra container for readiness
    openshift-merge-bot[bot] authored May 27, 2025
    Configuration menu
    Copy the full SHA
    24b9f1f View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2025

  1. version: bump to 1.33.1

    Signed-off-by: Kubernetes Release Robot <k8s-release-robot@users.noreply.github.com>
    k8s-release-robot committed Jun 1, 2025
    Configuration menu
    Copy the full SHA
    ce6f724 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2025

  1. Improve iptables error handling when there's no iptables binary

    If `iptables --version` failed, iptables.New() would log a warning
    and assume that the problem was that you had an implausibly ancient
    version of iptables installed. Change it to instead assume that the
    problem is that you don't have iptables installed at all (and only
    log at debug).
    
    Signed-off-by: Dan Winship <danwinship@redhat.com>
    danwinship authored and openshift-cherrypick-robot committed Jun 2, 2025
    Configuration menu
    Copy the full SHA
    219b88a View commit details
    Browse the repository at this point in the history
  2. Redo metaHostportManager construction, fix bug

    Add an internal constructor so that the unit tests share the same
    logic as the real constructor, and fix it to handle nil sub-managers
    correctly.
    
    Signed-off-by: Dan Winship <danwinship@redhat.com>
    danwinship authored and openshift-cherrypick-robot committed Jun 2, 2025
    Configuration menu
    Copy the full SHA
    4759426 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #9241 from openshift-cherrypick-robot/cherry-pick-…

    …9222-to-release-1.33
    
    [release-1.33] Fix HostPort manager when one backend is unavailable
    openshift-merge-bot[bot] authored Jun 2, 2025
    Configuration menu
    Copy the full SHA
    30a69d9 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #9237 from cri-o/release-1.33.1

    Bump version to 1.33.1
    openshift-merge-bot[bot] authored Jun 2, 2025
    Configuration menu
    Copy the full SHA
    de5978d View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2025

  1. server: only append default masked paths if any paths are specified

    otherwise, we break umasked proc mount type feature
    
    Signed-off-by: Peter Hunt <pehunt@redhat.com>
    haircommander authored and openshift-cherrypick-robot committed Jun 26, 2025
    Configuration menu
    Copy the full SHA
    f4dfced View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2025

  1. Merge pull request #9288 from openshift-cherrypick-robot/cherry-pick-…

    …9285-to-release-1.33
    
    [release-1.33] server: only append default masked paths if any paths are specified
    openshift-merge-bot[bot] authored Jun 27, 2025
    Configuration menu
    Copy the full SHA
    c318bad View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2025

  1. version: bump to 1.33.2

    Signed-off-by: Kubernetes Release Robot <k8s-release-robot@users.noreply.github.com>
    k8s-release-robot committed Jul 1, 2025
    Configuration menu
    Copy the full SHA
    8f3f8c8 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #9304 from cri-o/release-1.33.2

    Bump version to 1.33.2
    openshift-merge-bot[bot] authored Jul 1, 2025
    Configuration menu
    Copy the full SHA
    0da1b7c View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2025

  1. dependencies.yaml: bump/sync internal version.

    Signed-off-by: Krisztian Litkey <krisztian.litkey@intel.com>
    klihub committed Jul 3, 2025
    Configuration menu
    Copy the full SHA
    278712a View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2025

  1. fix deadlock when the container is in uninterruptible sleep

    Signed-off-by: Ayato Tokubi <atokubi@redhat.com>
    bitoku authored and openshift-cherrypick-robot committed Jul 4, 2025
    Configuration menu
    Copy the full SHA
    ea50bd3 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #9297 from klihub/fixes/release-1.33/bump-verified…

    …-internal-version
    
    dependencies.yaml: bump/sync internal version.
    openshift-merge-bot[bot] authored Jul 4, 2025
    Configuration menu
    Copy the full SHA
    15d8b7e View commit details
    Browse the repository at this point in the history
  3. Merge pull request #9320 from openshift-cherrypick-robot/cherry-pick-…

    …9256-to-release-1.33
    
    [release-1.33]: OCPBUGS-55485: Fix deadlock when stopping uninterruptible container
    openshift-merge-bot[bot] authored Jul 4, 2025
    Configuration menu
    Copy the full SHA
    cb609a5 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2025

  1. server: handle missing network namespace gracefully during networkStop

    After host reboot, network namespaces are destroyed but CRI-O attempts
    to clean them up during pod sandbox destruction, causing CNI plugin
    failures and preventing pods from restarting properly. The fix ensures
    pods can restart normally after host reboots.
    
    Signed-off-by: Sohan Kunkerkar <sohank2602@gmail.com>
    sohankunkerkar authored and openshift-cherrypick-robot committed Jul 11, 2025
    Configuration menu
    Copy the full SHA
    8daef88 View commit details
    Browse the repository at this point in the history
  2. test: add coverage for network recovery after reboot with destroyed n…

    …etns
    
    Signed-off-by: Sohan Kunkerkar <sohank2602@gmail.com>
    sohankunkerkar authored and openshift-cherrypick-robot committed Jul 11, 2025
    Configuration menu
    Copy the full SHA
    ff0ca8f View commit details
    Browse the repository at this point in the history
  3. test: use quay.io instead of registry.fedoraproject.org

    Signed-off-by: Sohan Kunkerkar <sohank2602@gmail.com>
    sohankunkerkar authored and openshift-cherrypick-robot committed Jul 11, 2025
    Configuration menu
    Copy the full SHA
    0ba1262 View commit details
    Browse the repository at this point in the history
  4. contrib/test/ci: skip network recovery after reboot test for kata

    Kata VMs use real infra containers that persist in storage, unlike normal
    containers that use spoofed infra containers. This fundamental architectural
    difference means the 'Network recovery after reboot with destroyed netns'
    test scenario doesn't apply to Kata VMs in the same way.
    
    Signed-off-by: Sohan Kunkerkar <sohank2602@gmail.com>
    sohankunkerkar authored and openshift-cherrypick-robot committed Jul 11, 2025
    Configuration menu
    Copy the full SHA
    e3326cb View commit details
    Browse the repository at this point in the history
  5. Merge pull request #9337 from openshift-cherrypick-robot/cherry-pick-…

    …9301-to-release-1.33
    
    [release-1.33] : server: handle missing network namespace gracefully during networkStop
    openshift-merge-bot[bot] authored Jul 11, 2025
    Configuration menu
    Copy the full SHA
    fcb351d View commit details
    Browse the repository at this point in the history
Loading
点击 这是indexloc提供的php浏览器服务,不要输入任何密码和下载