Skip to content

Commit 617f898

Browse files
authored
fix: bump minimum cni to 1.4.7 for reconcile flow (#948)
Signed-off-by: Evan Baker <[email protected]>
1 parent 29391f4 commit 617f898

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -497,6 +497,9 @@ test-cyclonus:
497497
kind:
498498
kind create cluster --config ./test/kind/kind.yaml
499499

500+
version: ## prints the version
501+
@echo $(VERSION)
502+
500503
$(TOOLS_DIR)/go.mod:
501504
cd $(TOOLS_DIR); go mod init && go mod tidy
502505

cns/cnireconciler/version.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ import (
88
"k8s.io/utils/exec"
99
)
1010

11-
const lastCNIWithoutDumpStateVer = "1.4.1"
11+
// >= 1.4.7 is required due to a bug in CNI when the statefile is empty
12+
// even though the command existed since 1.4.2.
13+
const lastCNIWithoutDumpStateVer = "1.4.6"
1214

1315
// IsDumpStateVer checks if the CNI executable is a version that
1416
// has the dump state command required to initialize CNS from CNI

cns/cnireconciler/version_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ func TestIsDumpStateVer(t *testing.T) {
3838
},
3939
{
4040
name: "good ver",
41-
exec: newCNIVersionFakeExec(`Azure CNI Version v1.4.2`),
41+
exec: newCNIVersionFakeExec(`Azure CNI Version v1.4.7`),
4242
want: true,
4343
wantErr: false,
4444
},
4545
{
4646
name: "good dirty ver",
47-
exec: newCNIVersionFakeExec(`Azure CNI Version v1.4.2-7-g7b97e1eb`),
47+
exec: newCNIVersionFakeExec(`Azure CNI Version v1.4.7-7-g7b97e1eb`),
4848
want: true,
4949
wantErr: false,
5050
},

0 commit comments

Comments
 (0)