Skip to content

Commit

Permalink
Update CRI-O to v1.26.2
Browse files Browse the repository at this point in the history
Signed-off-by: Sascha Grunert <[email protected]>
  • Loading branch information
saschagrunert authored and k8s-ci-robot committed Mar 10, 2023
1 parent e323619 commit f00acea
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 8 deletions.
20 changes: 19 additions & 1 deletion dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,29 @@ dependencies:
match: VERSION

- name: CRI-O
version: v1.26.1
version: v1.26.2
refPaths:
- path: hack/ci/install-cri-o.sh
match: TAG

- name: crun
version: v1.8.1
refPaths:
- path: examples/baseprofile-crun.yaml
match: name
- path: test/tc_base_profiles_test.go
match: baseProfileNameCrun

- name: runc
version: v1.1.4
refPaths:
- path: examples/baseprofile-runc.yaml
match: name
- path: test/tc_base_profiles_test.go
match: baseProfileNameRunc
- path: installation-usage.md
match: baseProfileName

- name: audit2rbac
version: v0.9.0
refPaths:
Expand Down
3 changes: 1 addition & 2 deletions examples/baseprofile-crun.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apiVersion: security-profiles-operator.x-k8s.io/v1beta1
kind: SeccompProfile
metadata:
name: crun-v1.5
name: crun-v1.8.1
spec:
defaultAction: SCMP_ACT_ERRNO
architectures:
Expand Down Expand Up @@ -54,7 +54,6 @@ spec:
- setresgid
- setresuid
- setsid
- statfs
- statx
- symlinkat
- umask
Expand Down
4 changes: 2 additions & 2 deletions hack/ci/install-cri-o.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

set -euo pipefail

TAG=v1.26.1
TAG=v1.26.2

curl_retry() {
curl -sSfL --retry 5 --retry-delay 3 "$@"
Expand All @@ -36,7 +36,7 @@ curl_retry -o /usr/bin/bom \
chmod +x /usr/bin/bom
bom version

curl_retry "https://raw.githubusercontent.com/cri-o/cri-o/main/scripts/get" |
curl_retry "https://raw.githubusercontent.com/cri-o/cri-o/$TAG/scripts/get" |
bash -s -- -t "$TAG"

. /etc/os-release
Expand Down
2 changes: 1 addition & 1 deletion installation-usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ metadata:
name: profile1
spec:
defaultAction: SCMP_ACT_ERRNO
baseProfileName: runc-v1.0.0
baseProfileName: runc-v1.1.4
syscalls:
- action: SCMP_ACT_ALLOW
names:
Expand Down
9 changes: 7 additions & 2 deletions test/tc_base_profiles_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,20 @@ import (
"time"
)

const (
baseProfileNameRunc = "runc-v1.1.4"
baseProfileNameCrun = "crun-v1.8.1"
)

func (e *e2e) testCaseBaseProfile([]string) {
e.seccompOnlyTestCase()

baseProfilePath := "examples/baseprofile-runc.yaml"
baseProfileName := "runc-v1.1.4"
baseProfileName := baseProfileNameRunc

if clusterType == clusterTypeVanilla && e.containerRuntime != containerRuntimeDocker {
baseProfilePath = "examples/baseprofile-crun.yaml"
baseProfileName = "crun-v1.5"
baseProfileName = baseProfileNameCrun
}

helloProfile := fmt.Sprintf(`
Expand Down

0 comments on commit f00acea

Please sign in to comment.