Merge pull request #377 from Cray-HPE/CASMPET-6917

CASMPET-6917 - csi handoff bss-metadata should ignore Cilium lxc interfaces
Cray-HPE · Apr 11, 2024 · 228d394 · 228d394
2 parents 5bac47a + 2c59dee
commit 228d394
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/cmd/handoff-bss-metadata.go b/cmd/handoff-bss-metadata.go
@@ -308,7 +308,11 @@ func getMACsFromString(macAddrStrings string) (ncnMacs []string) {
 			interfaceName == "dummy" ||
 			interfaceName == "lo" ||
 			strings.Contains(interfaceName, "usb") ||
-			strings.Contains(interfaceName, "veth") {
+			strings.Contains(interfaceName, "veth") ||
+			strings.Contains(interfaceName, "weave") ||
+			strings.Contains(interfaceName, "cilium") ||
+			strings.Contains(interfaceName, "kube") ||
+			strings.Contains(interfaceName, "lxc") {
 			continue
 		}
 

diff --git a/pkg/pit/basecamp.go b/pkg/pit/basecamp.go
@@ -111,7 +111,7 @@ type BaseCampGlobals struct {
 	KubernetesWeaveMTU         string `json:"kubernetes-weave-mtu"`     // 1376
 	KubernetesCiliumOpReplicas string `json:"cilium-operator-replicas"` // 1
 	KubernetesPrimaryCNI       string `json:"k8s-primary-cni"`          // weave
-	KubernetesKubeProxyReplace string `json:"cilium-kube-proxy-replacement"`   // strict
+	KubernetesKubeProxyReplace string `json:"cilium-kube-proxy-replacement"`   // disabled
 
 	NumStorageNodes int `json:"num_storage_nodes"`
 }
@@ -166,7 +166,7 @@ var basecampGlobalString = `{
 	"kubernetes-weave-mtu": "1376",
 	"cilium-operator-replicas": "1",
 	"k8s-primary-cni": "weave",
-	"cilium-kube-proxy-replacement": "strict",
+	"cilium-kube-proxy-replacement": "disabled",
 	"rgw-virtual-ip": "~FIXME~ e.g. 10.252.2.100",
 	"wipe-ceph-osds": "yes",
 	"system-name": "~FIXME~",