From aa54326a7270fbb53068856ad3b487d9dadb0c23 Mon Sep 17 00:00:00 2001
From: lgtm <1gtm@users.noreply.github.com>
Date: Mon, 7 Dec 2020 22:55:23 -0800
Subject: [PATCH] Update Kubernetes v1.18.9 dependencies (#561)

Signed-off-by: 1gtm <1gtm@appscode.com>
---
 go.mod                                              | 2 +-
 go.sum                                              | 2 ++
 vendor/kmodules.xyz/client-go/core/v1/kubernetes.go | 8 +++++++-
 vendor/modules.txt                                  | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 05b4abd47..2c51b4590 100644
--- a/go.mod
+++ b/go.mod
@@ -15,7 +15,7 @@ require (
 	k8s.io/client-go v0.18.9
 	k8s.io/component-base v0.18.9
 	k8s.io/kubectl v0.18.9
-	kmodules.xyz/client-go v0.0.0-20201105071625-0b277310b9b8
+	kmodules.xyz/client-go v0.0.0-20201208053851-a1d7be95e006
 	kmodules.xyz/custom-resources v0.0.0-20201124062543-bd8d35c21b0c
 	kmodules.xyz/monitoring-agent-api v0.0.0-20201105074044-be7a1044891a
 	kmodules.xyz/objectstore-api v0.0.0-20201105133858-cbb2af88d50a
diff --git a/go.sum b/go.sum
index 19f3c1b84..214babb2d 100644
--- a/go.sum
+++ b/go.sum
@@ -1380,6 +1380,8 @@ k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 h1:d4vVOjXm687F1iLSP2q3lyPPuyvTU
 k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
 kmodules.xyz/client-go v0.0.0-20201105071625-0b277310b9b8 h1:zs2+yI/Ola5HjdtfP29XD76Bx5BO4WchC2uN9lkhxQM=
 kmodules.xyz/client-go v0.0.0-20201105071625-0b277310b9b8/go.mod h1:WXDwZBmvrcLgGcuO9iZpI9jcfPuDFfWbxA4EnhAFtGw=
+kmodules.xyz/client-go v0.0.0-20201208053851-a1d7be95e006 h1:gNrNTwi0jViRqdszsb0W5CQF+ANNVFlvh/LO0A3R7dM=
+kmodules.xyz/client-go v0.0.0-20201208053851-a1d7be95e006/go.mod h1:WXDwZBmvrcLgGcuO9iZpI9jcfPuDFfWbxA4EnhAFtGw=
 kmodules.xyz/constants v0.0.0-20200923054614-6b87dbbae4d6/go.mod h1:DbiFk1bJ1KEO94t1SlAn7tzc+Zz95rSXgyUKa2nzPmY=
 kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4/go.mod h1:WrO3fryNyFCgqqyWnwI89lnzWA7kN072Ehya7ELGfzE=
 kmodules.xyz/custom-resources v0.0.0-20201105075444-3c6af51b4f79 h1:BKPPUY/w0ac4R6g172zrejs+MLae2CHGqHCFpzrbRLc=
diff --git a/vendor/kmodules.xyz/client-go/core/v1/kubernetes.go b/vendor/kmodules.xyz/client-go/core/v1/kubernetes.go
index 1ac6cb833..5acc264d0 100644
--- a/vendor/kmodules.xyz/client-go/core/v1/kubernetes.go
+++ b/vendor/kmodules.xyz/client-go/core/v1/kubernetes.go
@@ -71,10 +71,16 @@ func EnsureContainerDeleted(containers []core.Container, name string) []core.Con
 func UpsertContainer(containers []core.Container, upsert core.Container) []core.Container {
 	for i, container := range containers {
 		if container.Name == upsert.Name {
-			err := mergo.MergeWithOverwrite(&container, upsert)
+			err := mergo.Merge(&container, upsert, mergo.WithOverride)
 			if err != nil {
 				panic(err)
 			}
+			// mergo does not overwrite "dst (container)" using empty "src (upsert)" values.
+			// This causes problem we want to remove args or commands (eg, disable TLS).
+			// TODO: should this be done for all the []string type fields (eg, EnvFrom etc.)?
+			container.Command = upsert.Command
+			container.Args = upsert.Args
+			container.Env = upsert.Env
 			containers[i] = container
 			return containers
 		}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 740037956..fa17974e2 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -461,7 +461,7 @@ k8s.io/utils/exec
 k8s.io/utils/integer
 k8s.io/utils/pointer
 k8s.io/utils/trace
-# kmodules.xyz/client-go v0.0.0-20201105071625-0b277310b9b8
+# kmodules.xyz/client-go v0.0.0-20201208053851-a1d7be95e006
 kmodules.xyz/client-go
 kmodules.xyz/client-go/api/v1
 kmodules.xyz/client-go/apiextensions