Add check to ensure jq can be found in $PATH when enabling switchdev …

…mode
kubeovn · Dec 5, 2023 · 69ea6a2 · 69ea6a2
1 parent 44f4043
commit 69ea6a2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/bindata/manifests/switchdev-config/files/switchdev-configuration-before-nm.sh.yaml b/bindata/manifests/switchdev-config/files/switchdev-configuration-before-nm.sh.yaml
@@ -13,6 +13,8 @@ contents:
       exit
     fi
 
+    which jq
+
     append_to_file(){
       content="$1"
       file_name="$2"

diff --git a/controllers/sriovnetworknodepolicy_controller.go b/controllers/sriovnetworknodepolicy_controller.go
@@ -359,7 +359,7 @@ func (r *SriovNetworkNodePolicyReconciler) syncSriovNetworkNodeState(np *sriovne
 			}
 		}
 		newVersion.Spec.DpConfigVersion = cksum
-		if equality.Semantic.DeepDerivative(newVersion.Spec, found.Spec) {
+		if equality.Semantic.DeepEqual(newVersion.Spec, found.Spec) {
 			logger.Info("SriovNetworkNodeState did not change, not updating")
 			return nil
 		}