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: v1.31.2
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: v1.31.3
Choose a head ref
  • 13 commits
  • 17 files changed
  • 5 contributors

Commits on Nov 6, 2024

  1. nix: don't build gpgme with --enable-fixed-path

    Don't use the fixed path to allow searching in system local paths.
    
    Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
    saschagrunert authored and openshift-cherrypick-robot committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    c918a52 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #8745 from openshift-cherrypick-robot/cherry-pick-…

    …8708-to-release-1.31
    
    [release-1.31] nix: don't build gpgme with `--enable-fixed-path`
    openshift-merge-bot[bot] authored Nov 6, 2024
    Configuration menu
    Copy the full SHA
    448124c View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2024

  1. RuntimeHandler inheritance

    This allows defining a RuntimeHandler with custom
    annotations or other fields while inheriting the
    runtime type from the default runtime.
    
    This behavior is useful for layered projects
    that are not in control of the runtime selection
    but need to tweak the specific behavior while
    inheriting the node global runtime.
    
    Signed-off-by: Martin Sivak <msivak@redhat.com>
    MarSik authored and openshift-cherrypick-robot committed Nov 18, 2024
    Configuration menu
    Copy the full SHA
    c65eb63 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #8762 from openshift-cherrypick-robot/cherry-pick-…

    …8754-to-release-1.31
    
    [release-1.31] RuntimeHandler inheritance
    openshift-merge-bot[bot] authored Nov 18, 2024
    Configuration menu
    Copy the full SHA
    43e9d9d View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2024

  1. RuntimeHandler inheritance bug-fix

    The original PR missed few important bits
    
    - the reload code path was not the only one that loads configs
    - an empty RuntimePath has a special meaning and inheriting it
      does not inherit the parent runtime
    - golang does a copy during interation, not a reference and the
      updated values were forgotten
    - the unit test ignores some of the checks during CI when not
      on a bare metal
    
    This patch fixes all of these and adds better logging
    and also tests that actually catch the above mistakes.
    
    Signed-off-by: Martin Sivak <msivak@redhat.com>
    MarSik authored and openshift-cherrypick-robot committed Nov 19, 2024
    Configuration menu
    Copy the full SHA
    d3f39ea View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2024

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

    …8768-to-release-1.31
    
    [release-1.31] RuntimeHandler inheritance bug-fix
    openshift-merge-bot[bot] authored Nov 20, 2024
    Configuration menu
    Copy the full SHA
    2a28261 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2024

  1. Add --pull-progress-timeout / pull_progress_timeout option

    Add the option to be able to fine-tune the pull progress timeout or even
    disable it.
    
    Fixes #8764 and #8760
    
    Follow-up on: #7887
    
    Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
    saschagrunert authored and openshift-cherrypick-robot committed Nov 25, 2024
    Configuration menu
    Copy the full SHA
    1655049 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #8776 from openshift-cherrypick-robot/cherry-pick-…

    …8765-to-release-1.31
    
    [release-1.31] Add `--pull-progress-timeout` / `pull_progress_timeout` option
    openshift-merge-bot[bot] authored Nov 25, 2024
    Configuration menu
    Copy the full SHA
    d8d378f View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2024

  1. Only restore container if all bind mounts are defined

    To avoid the situation where a container that is restored via a registry
    mounts unexpected host paths into the container, this changes the
    restore behaviour of CRI-O.
    
    Previously all bind mounted paths in the original container which were
    defined for example like this:
    
        volumeMounts:
        - mountPath: /data
          name: data-volume
      volumes:
      - name: data-volume
        hostPath:
          path: /srv/container/data
    
    Were automatically mounted in the restored container without and
    definition necessary. This lead to the situation that the user does not
    know which path will be mounted if starting a restored container.
    
    Now CRI-O will refuse to restore a container if not all bind mounts are
    defined via the CRI CreateContainer RPC in the CreateContainerRequest
    message.
    
    CRI-O will now return an error that will look something likes this:
    
    Error: the container to restore (7f...be) expects following bind mounts defined (/data,/data2)
    
    Now the user has to explicitly add those bind mounts in the same way as
    it was done during initial container creation.
    
    Signed-off-by: Adrian Reber <areber@redhat.com>
    adrianreber authored and kwilczynski committed Nov 28, 2024
    Configuration menu
    Copy the full SHA
    6aa6cbc View commit details
    Browse the repository at this point in the history
  2. Fix container restore lint report

    Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
    saschagrunert authored and kwilczynski committed Nov 28, 2024
    Configuration menu
    Copy the full SHA
    ee2d732 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2024

  1. Merge pull request #8792 from kwilczynski/feature/backport-commit-429…

    …ef7c36-to-release-1.31
    
    [release-1.31] Only restore container if all bind mounts are defined
    openshift-merge-bot[bot] authored Nov 29, 2024
    Configuration menu
    Copy the full SHA
    88f5ee7 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2024

  1. version: bump to 1.31.3

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

Commits on Dec 2, 2024

  1. Merge pull request #8799 from cri-o/release-1.31.3

    Bump version to 1.31.3
    openshift-merge-bot[bot] authored Dec 2, 2024
    Configuration menu
    Copy the full SHA
    5865976 View commit details
    Browse the repository at this point in the history
Loading