Skip to content

Commit 91186d6

Browse files
authored
Merge pull request #1961 from SergeyKanzhelev/tryFix17
special handling of containerd 1.7 CNI installation
2 parents 59ba0dd + 78e6f2d commit 91186d6

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

.github/workflows/containerd.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,16 @@ jobs:
126126
mingw32-make.exe install
127127
working-directory: ${{ github.workspace }}/src/github.com/containerd/containerd
128128

129+
- name: Install cni on Linux (release-1.7)
130+
# TODO: Remove this step once containerd release/1.7 is no longer supported.
131+
if: startsWith(matrix.os, 'ubuntu') && matrix.version == 'release{0}1.7'
132+
shell: bash
133+
# See https://github.com/containerd/containerd/pull/12660
134+
run: |
135+
sudo -E PATH=$PATH script/setup/install-cni
136+
working-directory: src/github.com/containerd/containerd
129137
- name: Install cni on Linux
130-
if: startsWith(matrix.os, 'ubuntu')
138+
if: startsWith(matrix.os, 'ubuntu') && matrix.version != 'release{0}1.7'
131139
shell: bash
132140
run: |
133141
sudo -E PATH=$PATH script/setup/install-cni $(grep 'github.com/containernetworking/plugins' go.mod | awk '{print $2}')

0 commit comments

Comments
 (0)