Add quotes to windows cni plugin template so that it's valid JSON even

before substitution (this helps with operator testing).
projectcalico · Jul 25, 2023 · 1a45192 · 1a45192
1 parent bca37df
commit 1a45192
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/cni-plugin/pkg/install/install_windows.go b/cni-plugin/pkg/install/install_windows.go
@@ -44,7 +44,7 @@ func defaultNetConf() string {
       },
       "log_level": "__LOG_LEVEL__",
       "log_file_path": "__LOG_FILE_PATH__",
-      "windows_loopback_DSR": __DSR_SUPPORT__,
+      "windows_loopback_DSR": "__DSR_SUPPORT__",
       "capabilities": {"dns": true},
       "DNS":  {
         "Nameservers":  [__KUBERNETES_DNS_SERVERS__],
@@ -154,9 +154,9 @@ func replacePlatformSpecificVars(c config, netconf string) string {
 	}
 	supportsDSR := (winVerInt == 1809 && buildNumInt >= 17763 && halVerInt >= 1432) || (winVerInt >= 1903 && buildNumInt >= 18317)
 	if supportsDSR {
-		netconf = strings.Replace(netconf, "__DSR_SUPPORT__", "true", -1)
+		netconf = strings.Replace(netconf, `"__DSR_SUPPORT__"`, "true", -1)
 	} else {
-		netconf = strings.Replace(netconf, "__DSR_SUPPORT__", "false", -1)
+		netconf = strings.Replace(netconf, `"__DSR_SUPPORT__"`, "false", -1)
 	}
 
 	return netconf