From: Katy Feng <fkaty@vmware.com>
Date: Mon, 6 Mar 2023 18:32:39 +0000 (-0800)
Subject: Add antrea and calico interface pattern to GUESTINFO_DEFAULT_IFACE_EXCLUDES.
X-Git-Tag: stable-12.3.0~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=813d8531e739f6a12a4e3c92f18786e10f46eacc;p=thirdparty%2Fopen-vm-tools.git

Add antrea and calico interface pattern to GUESTINFO_DEFAULT_IFACE_EXCLUDES.

Since k8s are more popular nowadays and their CNI also has IPs for pods,
we should also exclude the IP assigned by popular CNI.

Fixes issue: https://github.com/vmware/open-vm-tools/issues/638

Pull request: https://github.com/vmware/open-vm-tools/pull/639
---

diff --git a/open-vm-tools/AUTHORS b/open-vm-tools/AUTHORS
index ac5fd878e..c43c74034 100644
--- a/open-vm-tools/AUTHORS
+++ b/open-vm-tools/AUTHORS
@@ -88,3 +88,6 @@ Bernd Zeimetz   Fix building containerinfo plugin on i386
 
 Dirk Mueller    Detect the proto files for containerd grpc client on SUSE like systems
                 - https://github.com/vmware/open-vm-tools/pull/626
+
+Lubron Zhan     Add antrea and calico interfaces to GUESTINFO_DEFAULT_IFACE_EXCLUDES
+Naadir Jeewa    - https://github.com/vmware/open-vm-tools/pull/639
diff --git a/open-vm-tools/services/plugins/guestInfo/guestInfoServer.c b/open-vm-tools/services/plugins/guestInfo/guestInfoServer.c
index 321dc9d5e..d1d5f557b 100644
--- a/open-vm-tools/services/plugins/guestInfo/guestInfoServer.c
+++ b/open-vm-tools/services/plugins/guestInfo/guestInfoServer.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2022 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2023 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -93,7 +93,7 @@ VM_EMBED_VERSION(VMTOOLSD_VERSION_STRING);
 #if defined(_WIN32)
 #define GUESTINFO_DEFAULT_IFACE_EXCLUDES "vEthernet*"
 #else
-#define GUESTINFO_DEFAULT_IFACE_EXCLUDES "docker*,veth*,virbr*"
+#define GUESTINFO_DEFAULT_IFACE_EXCLUDES "docker*,veth*,virbr*,antrea-*,cali*"
 #endif
 
 /*
diff --git a/open-vm-tools/tools.conf b/open-vm-tools/tools.conf
index e5a03a9c9..61d85331c 100644
--- a/open-vm-tools/tools.conf
+++ b/open-vm-tools/tools.conf
@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2022 VMware, Inc.  All rights reserved.
+# Copyright (c) 2019-2023 VMware, Inc.  All rights reserved.
 
 # "CAUTION: tools.conf is highly syntax sensitive file. Use extreme caution
 # while editing it. If modified, it is automatically re-loaded by
@@ -232,7 +232,7 @@
 # Set a comma separated list of network interface names that shall be ignored.
 # Interface names can use wildcards like '*' and '?'.
 # Default for Linux and all non-Windows:
-#exclude-nics=veth*,docker*,virbr*
+#exclude-nics=veth*,docker*,virbr*,antrea-*,cali*
 # Default for Windows:
 #exclude-nics=vEthernet*