Skip to content

Commit 1b35d30

Browse files
backport: [1.30-strict] memory leak k8s-dqlite v1.1.12 (#4869) (#4876)
* backport: [1.30] memory leak k8s-dqlite v1.1.12 * update gh actions artifact * Trivy job fix
1 parent bfb86c3 commit 1b35d30

File tree

3 files changed

+19
-28
lines changed

3 files changed

+19
-28
lines changed

.github/workflows/build-installer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
- name: Create installer
5353
run: makensis.exe ${{ github.workspace }}/installer/windows/microk8s.nsi
5454
- name: Upload installer
55-
uses: actions/upload-artifact@v3
55+
uses: actions/upload-artifact@v4
5656
with:
5757
name: Windows installer
5858
path: ${{ github.workspace }}/installer/windows/microk8s-installer.exe

.github/workflows/build-snap.yml

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
sg lxd -c 'snapcraft --use-lxd'
2929
sudo mv microk8s*.snap microk8s.snap
3030
- name: Uploading snap
31-
uses: actions/upload-artifact@v3
31+
uses: actions/upload-artifact@v4
3232
with:
3333
name: microk8s.snap
3434
path: microk8s.snap
@@ -50,7 +50,7 @@ jobs:
5050
sudo apt-get -y install open-iscsi
5151
sudo systemctl enable iscsid
5252
- name: Fetch snap
53-
uses: actions/download-artifact@v3.0.2
53+
uses: actions/download-artifact@v4
5454
with:
5555
name: microk8s.snap
5656
path: build
@@ -75,7 +75,7 @@ jobs:
7575
sudo apt-get -y install open-iscsi
7676
sudo systemctl enable iscsid
7777
- name: Fetch snap
78-
uses: actions/download-artifact@v3.0.2
78+
uses: actions/download-artifact@v4
7979
with:
8080
name: microk8s.snap
8181
path: build
@@ -107,7 +107,7 @@ jobs:
107107
sudo apt-get -y install open-iscsi
108108
sudo systemctl enable iscsid
109109
- name: Fetch snap
110-
uses: actions/download-artifact@v3.0.2
110+
uses: actions/download-artifact@v4
111111
with:
112112
name: microk8s.snap
113113
path: build
@@ -143,7 +143,7 @@ jobs:
143143
sudo apt-get -y install open-iscsi
144144
sudo systemctl enable iscsid
145145
- name: Fetch snap
146-
uses: actions/download-artifact@v3.0.2
146+
uses: actions/download-artifact@v4
147147
with:
148148
name: microk8s.snap
149149
path: build
@@ -169,7 +169,7 @@ jobs:
169169
sudo pip3 install --upgrade pip
170170
sudo pip3 install -U pytest sh requests
171171
- name: Fetch snap
172-
uses: actions/download-artifact@v3.0.2
172+
uses: actions/download-artifact@v4
173173
with:
174174
name: microk8s.snap
175175
path: build
@@ -189,7 +189,7 @@ jobs:
189189
- name: Checking out repo
190190
uses: actions/checkout@v4
191191
- name: Fetch snap
192-
uses: actions/download-artifact@v3.0.2
192+
uses: actions/download-artifact@v4
193193
with:
194194
name: microk8s.snap
195195
path: build
@@ -211,39 +211,30 @@ jobs:
211211
- name: Checking out repo
212212
uses: actions/checkout@v4
213213
- name: Fetch snap
214-
uses: actions/download-artifact@v3.0.2
214+
uses: actions/download-artifact@v4
215215
with:
216216
name: microk8s.snap
217217
path: build
218-
- name: Setup Trivy vulnerability scanner
218+
- name: Create sarifs directory
219219
run: |
220220
mkdir -p sarifs
221-
VER=$(curl --silent -qI https://github.com/aquasecurity/trivy/releases/latest | awk -F '/' '/^location/ {print substr($NF, 1, length($NF)-1)}');
222-
wget https://github.com/aquasecurity/trivy/releases/download/${VER}/trivy_${VER#v}_Linux-64bit.tar.gz
223-
tar -zxvf ./trivy_${VER#v}_Linux-64bit.tar.gz
224-
- name: Run Trivy vulnerability scanner in repo mode
225-
uses: aquasecurity/trivy-action@master
226-
with:
227-
scan-type: "fs"
228-
ignore-unfixed: true
229-
format: "sarif"
230-
output: "trivy-microk8s-repo-scan--results.sarif"
231-
severity: "CRITICAL"
232-
- name: Gather Trivy repo scan results
233-
run: |
234-
cp trivy-microk8s-repo-scan--results.sarif ./sarifs/
221+
- name: Install Trivy vulnerability scanner
222+
uses: aquasecurity/[email protected]
223+
- name: Run Trivy vulnerability scanner on codebase
224+
run: |
225+
trivy fs . --format sarif --severity CRITICAL > sarifs/trivy-microk8s-repo-scan--results.sarif
235226
- name: Run Trivy vulnerability scanner on images
236227
run: |
237228
for i in $(cat ./build-scripts/images.txt) ; do
238229
name=$(echo $i | awk -F ':|/' '{print $(NF-1)}')
239-
./trivy image $i --format sarif > sarifs/$name.sarif
230+
trivy image $i --format sarif > sarifs/$name.sarif
240231
done
241232
- name: Run Trivy vulnerability scanner on the snap
242233
run: |
243234
cp build/microk8s.snap .
244235
unsquashfs microk8s.snap
245-
./trivy rootfs ./squashfs-root/ --format sarif > sarifs/snap.sarif
236+
trivy rootfs ./squashfs-root/ --format sarif > sarifs/snap.sarif
246237
- name: Upload Trivy scan results to GitHub Security tab
247-
uses: github/codeql-action/upload-sarif@v2
238+
uses: github/codeql-action/upload-sarif@v3
248239
with:
249240
sarif_file: "sarifs"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
22

3-
echo "v1.1.11"
3+
echo "v1.1.12"

0 commit comments

Comments
 (0)