Skip to content

Commit 30852a5

Browse files
authored
[cherry-pick] Update Kubernetes v1.18.9 dependencies (#239) (#242)
/cherry-pick Signed-off-by: 1gtm <1gtm@appscode.com>
1 parent de0721c commit 30852a5

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
k8s.io/apimachinery v0.18.9
1919
k8s.io/client-go v0.18.9
2020
k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6
21-
kmodules.xyz/client-go v0.0.0-20201105071625-0b277310b9b8
21+
kmodules.xyz/client-go v0.0.0-20201208053851-a1d7be95e006
2222
kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4
2323
kmodules.xyz/custom-resources v0.0.0-20201124062543-bd8d35c21b0c
2424
kmodules.xyz/offshoot-api v0.0.0-20201105074700-8675f5f686f2

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -963,6 +963,8 @@ k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 h1:d4vVOjXm687F1iLSP2q3lyPPuyvTU
963963
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
964964
kmodules.xyz/client-go v0.0.0-20201105071625-0b277310b9b8 h1:zs2+yI/Ola5HjdtfP29XD76Bx5BO4WchC2uN9lkhxQM=
965965
kmodules.xyz/client-go v0.0.0-20201105071625-0b277310b9b8/go.mod h1:WXDwZBmvrcLgGcuO9iZpI9jcfPuDFfWbxA4EnhAFtGw=
966+
kmodules.xyz/client-go v0.0.0-20201208053851-a1d7be95e006 h1:gNrNTwi0jViRqdszsb0W5CQF+ANNVFlvh/LO0A3R7dM=
967+
kmodules.xyz/client-go v0.0.0-20201208053851-a1d7be95e006/go.mod h1:WXDwZBmvrcLgGcuO9iZpI9jcfPuDFfWbxA4EnhAFtGw=
966968
kmodules.xyz/constants v0.0.0-20200923054614-6b87dbbae4d6/go.mod h1:DbiFk1bJ1KEO94t1SlAn7tzc+Zz95rSXgyUKa2nzPmY=
967969
kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4 h1:NWWv+Qju8xzHZT9hIk1+BbgQtIytNOoCU4g4vqUmh3M=
968970
kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4/go.mod h1:WrO3fryNyFCgqqyWnwI89lnzWA7kN072Ehya7ELGfzE=

vendor/kmodules.xyz/client-go/core/v1/kubernetes.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,16 @@ func EnsureContainerDeleted(containers []core.Container, name string) []core.Con
7171
func UpsertContainer(containers []core.Container, upsert core.Container) []core.Container {
7272
for i, container := range containers {
7373
if container.Name == upsert.Name {
74-
err := mergo.MergeWithOverwrite(&container, upsert)
74+
err := mergo.Merge(&container, upsert, mergo.WithOverride)
7575
if err != nil {
7676
panic(err)
7777
}
78+
// mergo does not overwrite "dst (container)" using empty "src (upsert)" values.
79+
// This causes problem we want to remove args or commands (eg, disable TLS).
80+
// TODO: should this be done for all the []string type fields (eg, EnvFrom etc.)?
81+
container.Command = upsert.Command
82+
container.Args = upsert.Args
83+
container.Env = upsert.Env
7884
containers[i] = container
7985
return containers
8086
}

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,7 @@ k8s.io/utils/net
844844
k8s.io/utils/path
845845
k8s.io/utils/pointer
846846
k8s.io/utils/trace
847-
# kmodules.xyz/client-go v0.0.0-20201105071625-0b277310b9b8
847+
# kmodules.xyz/client-go v0.0.0-20201208053851-a1d7be95e006
848848
kmodules.xyz/client-go
849849
kmodules.xyz/client-go/api/v1
850850
kmodules.xyz/client-go/apiextensions

0 commit comments

Comments
 (0)