Skip to content

Commit 398ffd1

Browse files
authored
Update Kubernetes v1.18.9 dependencies (#1293)
/cherry-pick Signed-off-by: 1gtm <1gtm@appscode.com>
1 parent d06c4f1 commit 398ffd1

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ require (
3838
k8s.io/client-go v0.18.9
3939
k8s.io/kube-aggregator v0.18.9
4040
k8s.io/kubernetes v1.18.9
41-
kmodules.xyz/client-go v0.0.0-20201208053851-a1d7be95e006
41+
kmodules.xyz/client-go v0.0.0-20201229202653-b029d8e7bcbb
4242
kmodules.xyz/constants v0.0.0-20200923054614-6b87dbbae4d6
4343
kmodules.xyz/custom-resources v0.0.0-20201124062543-bd8d35c21b0c
4444
kmodules.xyz/objectstore-api v0.0.0-20201105133858-cbb2af88d50a

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1154,6 +1154,8 @@ kmodules.xyz/client-go v0.0.0-20201105071625-0b277310b9b8 h1:zs2+yI/Ola5HjdtfP29
11541154
kmodules.xyz/client-go v0.0.0-20201105071625-0b277310b9b8/go.mod h1:WXDwZBmvrcLgGcuO9iZpI9jcfPuDFfWbxA4EnhAFtGw=
11551155
kmodules.xyz/client-go v0.0.0-20201208053851-a1d7be95e006 h1:gNrNTwi0jViRqdszsb0W5CQF+ANNVFlvh/LO0A3R7dM=
11561156
kmodules.xyz/client-go v0.0.0-20201208053851-a1d7be95e006/go.mod h1:WXDwZBmvrcLgGcuO9iZpI9jcfPuDFfWbxA4EnhAFtGw=
1157+
kmodules.xyz/client-go v0.0.0-20201229202653-b029d8e7bcbb h1:0+O24HfkERssXHqDHVVc9nUnq8nowQVDm1YtRIMeQr8=
1158+
kmodules.xyz/client-go v0.0.0-20201229202653-b029d8e7bcbb/go.mod h1:WXDwZBmvrcLgGcuO9iZpI9jcfPuDFfWbxA4EnhAFtGw=
11571159
kmodules.xyz/constants v0.0.0-20200923054614-6b87dbbae4d6 h1:9b61GdwFN3IC9tPmBvgXdo2kBlQKvyFUy5y4Q0fwB5E=
11581160
kmodules.xyz/constants v0.0.0-20200923054614-6b87dbbae4d6/go.mod h1:DbiFk1bJ1KEO94t1SlAn7tzc+Zz95rSXgyUKa2nzPmY=
11591161
kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4/go.mod h1:WrO3fryNyFCgqqyWnwI89lnzWA7kN072Ehya7ELGfzE=

vendor/kmodules.xyz/client-go/tools/queue/handler.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,12 @@ func NewChangeHandler(queue workqueue.RateLimitingInterface) cache.ResourceEvent
9999
queue: queue,
100100
enqueueAdd: nil,
101101
enqueueUpdate: func(old, nu interface{}) bool {
102-
return (nu.(metav1.Object)).GetDeletionTimestamp() != nil ||
102+
oldObj := old.(metav1.Object)
103+
nuObj := nu.(metav1.Object)
104+
return nuObj.GetDeletionTimestamp() != nil ||
103105
!meta_util.MustAlreadyReconciled(nu) ||
106+
!reflect.DeepEqual(oldObj.GetLabels(), nuObj.GetLabels()) ||
107+
!reflect.DeepEqual(oldObj.GetAnnotations(), nuObj.GetAnnotations()) ||
104108
!statusEqual(old, nu)
105109
},
106110
enqueueDelete: true,

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1128,7 +1128,7 @@ k8s.io/utils/net
11281128
k8s.io/utils/path
11291129
k8s.io/utils/pointer
11301130
k8s.io/utils/trace
1131-
# kmodules.xyz/client-go v0.0.0-20201208053851-a1d7be95e006
1131+
# kmodules.xyz/client-go v0.0.0-20201229202653-b029d8e7bcbb
11321132
kmodules.xyz/client-go
11331133
kmodules.xyz/client-go/admissionregistration/v1beta1
11341134
kmodules.xyz/client-go/api/v1

0 commit comments

Comments
 (0)