Skip to content

Commit 07763d6

Browse files
authored
[cherry-pick] Update Kubernetes v1.18.9 dependencies (#330) (#336)
/cherry-pick Signed-off-by: 1gtm <1gtm@appscode.com>
1 parent 8727e7f commit 07763d6

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
k8s.io/apimachinery v0.18.9
1818
k8s.io/client-go v0.18.9
1919
k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6
20-
kmodules.xyz/client-go v0.0.0-20201013083546-b17c1e15f1a3
20+
kmodules.xyz/client-go v0.0.0-20201021051118-03dac1aea508
2121
kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4
2222
kmodules.xyz/custom-resources v0.0.0-20201008012351-6d8090f759d4
2323
kmodules.xyz/offshoot-api v0.0.0-20200922211229-36acc531abab

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -949,8 +949,8 @@ kmodules.xyz/client-go v0.0.0-20200818143024-600fef263e03/go.mod h1:sY/eoe4ktxZE
949949
kmodules.xyz/client-go v0.0.0-20200922200830-63d86b6e5b63/go.mod h1:JZN34jqk6ZlR+QOnBPpnUVBab4rmfamqxfSvLaulBMY=
950950
kmodules.xyz/client-go v0.0.0-20201011221802-3180ab67d845 h1:7ytqOvrfdq5Ul5SicCyy0s1YnnBSGu33hSZaBEcTbXs=
951951
kmodules.xyz/client-go v0.0.0-20201011221802-3180ab67d845/go.mod h1:pnRh7gtJ6ErPJQBkQeRlpD95KRtxhD4eGrYagZEU8RM=
952-
kmodules.xyz/client-go v0.0.0-20201013083546-b17c1e15f1a3 h1:vP8h3s+JdqXQHhhmvoTgKZOtpraF4X1NxA/y4OFTn+I=
953-
kmodules.xyz/client-go v0.0.0-20201013083546-b17c1e15f1a3/go.mod h1:pnRh7gtJ6ErPJQBkQeRlpD95KRtxhD4eGrYagZEU8RM=
952+
kmodules.xyz/client-go v0.0.0-20201021051118-03dac1aea508 h1:LjidyEzvw1rSlwRQLWNfElleLJ6vr9Uu5tn5H6JO+QA=
953+
kmodules.xyz/client-go v0.0.0-20201021051118-03dac1aea508/go.mod h1:pnRh7gtJ6ErPJQBkQeRlpD95KRtxhD4eGrYagZEU8RM=
954954
kmodules.xyz/constants v0.0.0-20200506032633-a21e58ceec72/go.mod h1:DbiFk1bJ1KEO94t1SlAn7tzc+Zz95rSXgyUKa2nzPmY=
955955
kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4 h1:NWWv+Qju8xzHZT9hIk1+BbgQtIytNOoCU4g4vqUmh3M=
956956
kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4/go.mod h1:WrO3fryNyFCgqqyWnwI89lnzWA7kN072Ehya7ELGfzE=

vendor/kmodules.xyz/client-go/api/v1/conditions.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,11 @@ func SetCondition(conditions []Condition, newCondition Condition) []Condition {
117117
// The desired conditions is not in the condition list or is not in its desired state.
118118
// Update it if present in the condition list, or append the new condition if it does not present.
119119
newCondition.LastTransitionTime = metav1.Now()
120-
if idx != -1 {
121-
conditions[idx] = newCondition
122-
} else {
120+
if idx == -1 {
123121
conditions = append(conditions, newCondition)
122+
} else if newCondition.ObservedGeneration >= curCond.ObservedGeneration {
123+
// only update if the new condition is based on observed generation at least as updated as the current condition
124+
conditions[idx] = newCondition
124125
}
125126
return conditions
126127
}

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -843,7 +843,7 @@ k8s.io/utils/net
843843
k8s.io/utils/path
844844
k8s.io/utils/pointer
845845
k8s.io/utils/trace
846-
# kmodules.xyz/client-go v0.0.0-20201013083546-b17c1e15f1a3
846+
# kmodules.xyz/client-go v0.0.0-20201021051118-03dac1aea508
847847
kmodules.xyz/client-go
848848
kmodules.xyz/client-go/api/v1
849849
kmodules.xyz/client-go/apiextensions

0 commit comments

Comments
 (0)