From: John Wolfe Date: Fri, 21 Jan 2022 00:48:46 +0000 (-0800) Subject: ContainerInfo: Remove 'default' namespace from the default allowed namespace list. X-Git-Tag: stable-12.0.0~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68b050ba00a6244fd71e93f95d06375c30a4aa3e;p=thirdparty%2Fopen-vm-tools.git ContainerInfo: Remove 'default' namespace from the default allowed namespace list. --- diff --git a/open-vm-tools/services/plugins/containerInfo/containerInfo.c b/open-vm-tools/services/plugins/containerInfo/containerInfo.c index 914a65819..faa55de5e 100644 --- a/open-vm-tools/services/plugins/containerInfo/containerInfo.c +++ b/open-vm-tools/services/plugins/containerInfo/containerInfo.c @@ -1,5 +1,5 @@ /********************************************************* - * Copyright (C) 2021 VMware, Inc. All rights reserved. + * Copyright (C) 2021-2022 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 @@ -87,7 +87,7 @@ VM_EMBED_VERSION(VMTOOLSD_VERSION_STRING); /** * Default value for allowed-namespaces conf key. */ -#define CONTAINERINFO_DEFAULT_ALLOWED_NAMESPACES "moby,k8s.io,default" +#define CONTAINERINFO_DEFAULT_ALLOWED_NAMESPACES "moby,k8s.io" /** * Name of the 'moby' namespace used by docker. diff --git a/open-vm-tools/tools.conf b/open-vm-tools/tools.conf index a49def4da..6d48ca783 100644 --- a/open-vm-tools/tools.conf +++ b/open-vm-tools/tools.conf @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2021 VMware, Inc. All rights reserved. +# Copyright (c) 2019-2022 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 @@ -302,7 +302,7 @@ # List of namespaces to be queried for the running containers. # The value for this key is a comman separated list. -#allowed-namespaces=moby,k8s.io,default +#allowed-namespaces=moby,k8s.io [servicediscovery]