Skip to content

Commit 4d245bd

Browse files
klihubklihub
authored
Merge pull request #1133 from marquiz/release-0.9
[release-0.9] Backport fixes from master
2 parents a9e445f + f91b433 commit 4d245bd

File tree

29 files changed

+62
-125
lines changed

29 files changed

+62
-125
lines changed

‎.github/workflows/common-codeql.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141

4242
- name: Upload PDF report as an artifact
4343
if: ${{ inputs.export-report }}
44-
uses: actions/upload-artifact@v3
44+
uses: actions/upload-artifact@v4
4545
with:
4646
name: codeql-report
4747
path: report.pdf

‎.github/workflows/common-trivy.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989

9090
- name: Upload CSV report as an artifact
9191
if: ${{ inputs.export-csv }}
92-
uses: actions/upload-artifact@v3
92+
uses: actions/upload-artifact@v4
9393
with:
9494
name: trivy-report
9595
path: trivy-report.csv

‎.github/workflows/common-verify-code.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
id: go
2121

2222
- name: Install golangci-lint
23-
run: curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.2
23+
run: curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.64.7
2424

2525
- name: Gofmt
2626
run: make format

‎.github/workflows/verify-pr-code.yaml

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
name: Verify code
22

33
on:
4-
pull_request:
5-
paths-ignore:
6-
- "docs/**"
7-
- "**.md"
4+
pull_request
85

96
permissions:
107
contents: read

‎.github/workflows/verify-pr-docs.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ jobs:
1717
verify-docs:
1818
uses: "./.github/workflows/common-build-docs.yaml"
1919
permissions:
20-
contents: read
20+
contents: write
2121
security-events: write

‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ GO_FMT := gofmt
1111
GO_CYCLO := gocyclo
1212
GO_LINT := golint
1313
GO_CILINT := golangci-lint
14-
GO_VERSION ?= 1.22.6
14+
GO_VERSION ?= 1.24.1
1515
GOLICENSES_VERSION ?= v1.5.0
1616

1717
# TEST_TAGS is the set of extra build tags passed for tests.
@@ -24,7 +24,7 @@ TEST_SETUP := test-setup.sh
2424
TEST_CLEANUP := test-cleanup.sh
2525

2626
# Disable some golangci_lint checkers for now until we have an more acceptable baseline...
27-
GO_CILINT_CHECKERS := -D unused,staticcheck,errcheck,deadcode,structcheck,gosimple -E revive,gofmt
27+
GO_CILINT_CHECKERS := -D unused,staticcheck,errcheck,deadcode,structcheck,gosimple,revive -E gofmt
2828
GO_CILINT_RUNFLAGS := --build-tags $(TEST_TAGS)
2929

3030
# Protoc compiler and protobuf definitions we might need to recompile.

‎cmd/cri-resmgr-agent/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG GO_VERSION=1.22
1+
ARG GO_VERSION=1.24
22

33
FROM golang:${GO_VERSION}-bullseye as builder
44

‎cmd/cri-resmgr-webhook/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG GO_VERSION=1.22
1+
ARG GO_VERSION=1.24
22

33
FROM golang:${GO_VERSION}-bullseye as builder
44

‎demo/lib/distro.bash

+21-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# shellcheck disable=SC2120
22
GO_URLDIR=https://golang.org/dl
3-
GO_VERSION=1.22.6
3+
GO_VERSION=1.24.1
44
GOLANG_URL=$GO_URLDIR/go$GO_VERSION.linux-amd64.tar.gz
55
CRICTL_VERSION=${CRICTL_VERSION:-"v1.25.0"}
66
MINIKUBE_VERSION=${MINIKUBE_VERSION:-v1.27.0}
@@ -176,6 +176,21 @@ debian-ssh-user() {
176176
echo debian
177177
}
178178

179+
ubuntu-apparmor-disable-runc() {
180+
vm-command "[ -f /etc/apparmor.d/runc ] && ln -s /etc/apparmor.d/runc /etc/apparmor.d/disable/ && apparmor_parser -R /etc/apparmor.d/runc"
181+
}
182+
183+
ubuntu-config-containerd() {
184+
ubuntu-apparmor-disable-runc
185+
default-config-containerd
186+
}
187+
188+
ubuntu-config-crio() {
189+
ubuntu-apparmor-disable-runc
190+
default-config-crio
191+
}
192+
193+
179194
debian-pkg-type() {
180195
echo deb
181196
}
@@ -268,7 +283,7 @@ debian-11-install-containerd() {
268283
}
269284
}
270285

271-
debian-sid-install-containerd-post() {
286+
debian-sid-config-containerd-post() {
272287
vm-command "sed -e 's|bin_dir = \"/usr/lib/cni\"|bin_dir = \"/opt/cni/bin\"|g' -i /etc/containerd/config.toml"
273288
}
274289

@@ -611,15 +626,11 @@ sles-install-utils() {
611626
}
612627

613628
opensuse-image-url() {
614-
opensuse-15_5-image-url
615-
}
616-
617-
opensuse-15_5-image-url() {
618-
echo "https://download.opensuse.org/pub/opensuse/distribution/leap/15.5/appliances/openSUSE-Leap-15.5-Minimal-VM.x86_64-Cloud.qcow2"
629+
opensuse-15_6-image-url
619630
}
620631

621-
opensuse-15_5-image-url() {
622-
echo "https://download.opensuse.org/pub/opensuse/distribution/leap/15.5/appliances/openSUSE-Leap-15.5-Minimal-VM.x86_64-Cloud.qcow2"
632+
opensuse-15_6-image-url() {
633+
echo "https://download.opensuse.org/pub/opensuse/distribution/leap/15.6/appliances/openSUSE-Leap-15.6-Minimal-VM.x86_64-Cloud.qcow2"
623634
}
624635

625636
opensuse-tumbleweed-image-url() {
@@ -716,7 +727,7 @@ opensuse-install-k8s() {
716727
vm-command "echo 1 > /proc/sys/net/ipv4/ip_forward"
717728
vm-command "zypper ls"
718729
if ! grep -q snappy <<< "$COMMAND_OUTPUT"; then
719-
distro-install-repo "http://download.opensuse.org/repositories/system:/snappy/openSUSE_Leap_15.5 snappy"
730+
distro-install-repo "http://download.opensuse.org/repositories/system:/snappy/openSUSE_Leap_15.6 snappy"
720731
distro-refresh-pkg-db
721732
fi
722733
distro-install-pkg "snapd apparmor-profiles socat ebtables conntrackd iptables ethtool cni-plugins"

‎dockerfiles/cross-build/Dockerfile.opensuse-leap-15.5 renamed to ‎dockerfiles/cross-build/Dockerfile.opensuse-leap-15.6

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# pull in base + a minimal set of useful packages
2-
FROM opensuse/leap:15.5 as suse-15.5-build
2+
FROM opensuse/leap:15.6 as suse-15.6-build
33

44
ARG GO_VERSION=x.yz
55
ARG GOLICENSES_VERSION

‎docs/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ FROM sphinxdoc/sphinx:5.3.0
33
RUN apt-get update && apt-get install -y wget git
44

55
# Note: Any golang version that can 'go list -m -f {{.Variable}}' is fine...
6-
ADD https://go.dev/dl/go1.18.3.linux-amd64.tar.gz /
6+
ADD https://go.dev/dl/go1.24.1.linux-amd64.tar.gz /
77

8-
RUN tar -C /usr/local -xzf /go1.18.3.linux-amd64.tar.gz && \
9-
rm /go1.18.3.linux-amd64.tar.gz
8+
RUN tar -C /usr/local -xzf /go1.24.1.linux-amd64.tar.gz && \
9+
rm /go1*.linux-amd64.tar.gz
1010

1111
ENV PATH=$PATH:/usr/local/go/bin
1212

‎docs/conf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ def gomod_versions(modules):
129129
# List of patterns, relative to source directory, that match files and
130130
# directories to ignore when looking for source files.
131131
# This pattern also affects html_static_path and html_extra_path.
132-
exclude_patterns = ['_build', '.github', '_work', 'generate', 'README.md', 'docs/releases']
132+
exclude_patterns = ['_build', '.github', '_work', 'generate', 'README.md', 'SECURITY.md', 'docs/releases']
133133

134134

135135
# -- Options for HTML output -------------------------------------------------

‎docs/developers-guide/e2e-test.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
Install:
66
- `docker`
7-
- `govm`
7+
- `govm` v0.95
88
In case of errors in building `govm` with `go get`, or creating a virtual machine (`Error when creating the new VM: repository name must be canonical`), these are the workarounds:
99
```
10-
GO111MODULE=off go get -d github.com/govm-project/govm && cd $GOPATH/src/github.com/govm-project/govm && go mod tidy && go mod download && go install && cd .. && docker build govm -f govm/Dockerfile -t govm/govm:latest
10+
git clone https://github.com/govm-project/govm -b 0.95 && cd govm && go install && docker build . -t govm/govm:latest
1111
```
1212

1313
## Usage

‎docs/developers-guide/figures/arch-overview.svg

-70
This file was deleted.

‎go.mod

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/intel/cri-resource-manager
22

3-
go 1.22.0
3+
go 1.24
44

55
require (
66
contrib.go.opencensus.io/exporter/jaeger v0.2.1
@@ -17,7 +17,7 @@ require (
1717
github.com/shurcooL/vfsgen v0.0.0-20230704071429-0000e147ea92
1818
github.com/stretchr/testify v1.8.4
1919
go.opencensus.io v0.24.0
20-
golang.org/x/sys v0.18.0
20+
golang.org/x/sys v0.31.0
2121
golang.org/x/time v0.5.0
2222
google.golang.org/grpc v1.60.1
2323
google.golang.org/protobuf v1.33.0
@@ -62,11 +62,11 @@ require (
6262
github.com/spf13/pflag v1.0.5 // indirect
6363
github.com/uber/jaeger-client-go v2.25.0+incompatible // indirect
6464
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
65-
golang.org/x/net v0.23.0 // indirect
65+
golang.org/x/net v0.37.0 // indirect
6666
golang.org/x/oauth2 v0.15.0 // indirect
67-
golang.org/x/sync v0.6.0 // indirect
68-
golang.org/x/term v0.18.0 // indirect
69-
golang.org/x/text v0.14.0 // indirect
67+
golang.org/x/sync v0.12.0 // indirect
68+
golang.org/x/term v0.30.0 // indirect
69+
golang.org/x/text v0.23.0 // indirect
7070
google.golang.org/api v0.155.0 // indirect
7171
google.golang.org/appengine v1.6.8 // indirect
7272
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect

‎go.sum

+12-12
Original file line numberDiff line numberDiff line change
@@ -379,8 +379,8 @@ golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qx
379379
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
380380
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
381381
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
382-
golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
383-
golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
382+
golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
383+
golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
384384
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
385385
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
386386
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -402,8 +402,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
402402
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
403403
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
404404
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
405-
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
406-
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
405+
golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
406+
golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
407407
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
408408
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
409409
golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -446,12 +446,12 @@ golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBc
446446
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
447447
golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
448448
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
449-
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
450-
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
449+
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
450+
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
451451
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
452452
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
453-
golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
454-
golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
453+
golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
454+
golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
455455
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
456456
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
457457
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -460,8 +460,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
460460
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
461461
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
462462
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
463-
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
464-
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
463+
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
464+
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
465465
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
466466
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
467467
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -510,8 +510,8 @@ golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc
510510
golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
511511
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
512512
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
513-
golang.org/x/tools v0.16.0 h1:GO788SKMRunPIBCXiQyo2AaexLstOrVhuAL5YwsckQM=
514-
golang.org/x/tools v0.16.0/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
513+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
514+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
515515
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
516516
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
517517
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎pkg/cgroups/cgroupblkio.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,6 @@ func (dpm defaultPlatform) writeToFile(filename string, content string) error {
351351
return err
352352
}
353353
defer f.Close()
354-
_, err = fmt.Fprintf(f, content)
354+
_, err = f.Write([]byte(content))
355355
return err
356356
}

‎pkg/cri/resource-manager/control/memory/memory.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ func (ctl *memctl) setToptierLimit(c cache.Container) error {
137137
group := cgroups.Memory.Group(dir)
138138
entry := toptierSoftLimitControl
139139

140-
if err := group.Write(entry, limit+"\n"); err != nil {
140+
if err := group.Write(entry, "%s\n", limit); err != nil {
141141
return err
142142
}
143143

‎pkg/cri/resource-manager/policy/builtin/topology-aware/resources.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -998,7 +998,7 @@ func (cr *request) String() string {
998998
isolated := map[bool]string{false: "", true: "isolated "}[cr.isolate]
999999
switch {
10001000
case cr.full == 0 && cr.fraction == 0:
1001-
return fmt.Sprintf("<CPU request "+cr.container.PrettyName()+": ->") + mem
1001+
return "<CPU request " + cr.container.PrettyName() + ": ->" + mem
10021002

10031003
case cr.full > 0 && cr.fraction > 0:
10041004
return fmt.Sprintf("<CPU request "+cr.container.PrettyName()+": "+

‎pkg/instrumentation/http/http_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
package http
1616

1717
import (
18-
"fmt"
1918
"io"
2019
"net/http"
2120
"testing"
@@ -81,7 +80,7 @@ type testHandler struct {
8180
}
8281

8382
func (h *testHandler) ServeHTTP(w http.ResponseWriter, _ *http.Request) {
84-
fmt.Fprintf(w, h.response)
83+
_, _ = w.Write([]byte(h.response))
8584
}
8685

8786
func TestPatternsp(t *testing.T) {

‎test/e2e/packages.test-suite/opensuse-15.5/binsrc.var

-1
This file was deleted.

‎test/e2e/packages.test-suite/opensuse-15.5/distro.var

-1
This file was deleted.

‎test/e2e/packages.test-suite/opensuse-15.6/binsrc.var

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
packages/opensuse-leap-15.6

‎test/e2e/packages.test-suite/opensuse-15.5/cri-resmgr.cfg renamed to ‎test/e2e/packages.test-suite/opensuse-15.6/cri-resmgr.cfg

File renamed without changes.

‎test/e2e/packages.test-suite/opensuse-15.6/distro.var

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
opensuse-15.6

‎test/e2e/packages.test-suite/opensuse-15.5/pkgtest/test01-systemd/code.var.sh renamed to ‎test/e2e/packages.test-suite/opensuse-15.6/pkgtest/test01-systemd/code.var.sh

File renamed without changes.

‎test/e2e/packages.test-suite/opensuse-15.5/pkgtest/topology.var.json renamed to ‎test/e2e/packages.test-suite/opensuse-15.6/pkgtest/topology.var.json

File renamed without changes.

‎test/e2e/packages.test-suite/opensuse-15.5/reinstall_cri_resmgr.var renamed to ‎test/e2e/packages.test-suite/opensuse-15.6/reinstall_cri_resmgr.var

File renamed without changes.

‎test/e2e/run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ usage() {
101101
echo " distro: Linux distribution to be / already installed on vm."
102102
echo " Supported values: debian-11, debian-12, debian-sid"
103103
echo " fedora, opensuse-tumbleweed,"
104-
echo " opensuse-15.5 (same as opensuse), sles,"
104+
echo " opensuse-15.6 (same as opensuse), sles,"
105105
echo " ubuntu-18.04, ubuntu-20.04, ubuntu-22.04, ubuntu-24.04"
106106
echo " If sles: set VM_SLES_REGCODE=<CODE> to use official packages."
107107
echo " cgroups: cgroups version in the VM, v1 or v2. The default is v1."

0 commit comments

Comments
 (0)