check: update tunneling detection logic

make the feature detection logic compatible with the new flag introduced in v1.14 in [1] [1] cilium/cilium#24561 Signed-off-by: Gilberto Bertin <[email protected]>
cilium · May 24, 2023 · 3237c9b · 3237c9b
1 parent 61491cb
commit 3237c9b
Showing 1 changed file with 18 additions and 7 deletions.
diff --git a/connectivity/check/features.go b/connectivity/check/features.go
@@ -196,13 +196,24 @@ func (ct *ConnectivityTest) extractFeaturesFromConfigMap(ctx context.Context, cl
 		Mode:    mode,
 	}
 
-	mode = "disabled"
-	if v, ok := cm.Data["tunnel"]; ok {
-		mode = v
-	}
-	result[FeatureTunnel] = FeatureStatus{
-		Enabled: mode != "disabled",
-		Mode:    mode,
+	if versioncheck.MustCompile("<1.14.0")(ct.CiliumVersion) {
+		mode = "disabled"
+		if v, ok := cm.Data["tunnel"]; ok {
+			mode = v
+		}
+		result[FeatureTunnel] = FeatureStatus{
+			Enabled: mode != "disabled",
+			Mode:    mode,
+		}
+	} else {
+		mode = "native"
+		if v, ok := cm.Data["routing-mode"]; ok {
+			mode = v
+		}
+		result[FeatureTunnel] = FeatureStatus{
+			Enabled: mode != "native",
+			Mode:    mode,
+		}
 	}
 
 	result[FeatureIPv4] = FeatureStatus{