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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 4 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 21 additions & 10 deletions
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‎

Lines changed: 1 addition & 1 deletion
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

0 commit comments

Comments
 (0)