From c549a517f74cd7d5d83daef3a986a17e06a6b7db Mon Sep 17 00:00:00 2001 From: lgtm <1gtm@users.noreply.github.com> Date: Thu, 8 Oct 2020 21:04:28 -0700 Subject: [PATCH] [cherry-pick] Update Kubernetes v1.18.9 dependencies (#83) (#84) /cherry-pick Signed-off-by: 1gtm <1gtm@appscode.com> --- go.mod | 2 +- go.sum | 4 ++-- vendor/kmodules.xyz/client-go/meta/annotations.go | 13 +++++++++++++ vendor/modules.txt | 2 +- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 6dddc5cf4..a30d9c720 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( k8s.io/client-go v12.0.0+incompatible k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6 k8s.io/kubernetes v1.18.9 // indirect - kmodules.xyz/client-go v0.0.0-20201007024140-3223988adf40 + kmodules.xyz/client-go v0.0.0-20201008164401-74d81f261ec5 kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4 kmodules.xyz/custom-resources v0.0.0-20201008012351-6d8090f759d4 kmodules.xyz/objectstore-api v0.0.0-20200922210707-59bab27e5d41 // indirect diff --git a/go.sum b/go.sum index 55cbd77f1..f87386715 100644 --- a/go.sum +++ b/go.sum @@ -1267,8 +1267,8 @@ kmodules.xyz/client-go v0.0.0-20200903033732-dab39b86c81b/go.mod h1:sY/eoe4ktxZE kmodules.xyz/client-go v0.0.0-20200915091229-7df16c29f4e8 h1:C6+M9aTLhPCmsJ8dmhPvkr7Qe2MN+iiY3kZvbonhS9E= kmodules.xyz/client-go v0.0.0-20200915091229-7df16c29f4e8/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY= kmodules.xyz/client-go v0.0.0-20200922200830-63d86b6e5b63/go.mod h1:JZN34jqk6ZlR+QOnBPpnUVBab4rmfamqxfSvLaulBMY= -kmodules.xyz/client-go v0.0.0-20201007024140-3223988adf40 h1:XQLn2whq+TYbGxVloiyopxSM9jsqjqvWQjltXFKd+aA= -kmodules.xyz/client-go v0.0.0-20201007024140-3223988adf40/go.mod h1:pnRh7gtJ6ErPJQBkQeRlpD95KRtxhD4eGrYagZEU8RM= +kmodules.xyz/client-go v0.0.0-20201008164401-74d81f261ec5 h1:mGySTT2dC8u2FQDUFbDLcOt7GM+IkXqlH2xzATyddKg= +kmodules.xyz/client-go v0.0.0-20201008164401-74d81f261ec5/go.mod h1:pnRh7gtJ6ErPJQBkQeRlpD95KRtxhD4eGrYagZEU8RM= kmodules.xyz/constants v0.0.0-20200506032633-a21e58ceec72/go.mod h1:DbiFk1bJ1KEO94t1SlAn7tzc+Zz95rSXgyUKa2nzPmY= kmodules.xyz/crd-schema-fuzz v0.0.0-20200521005638-2433a187de95 h1:v0S/+ftzL6Xrs9XevgchAOJyPKlRQXPiZf87xotj3X4= kmodules.xyz/crd-schema-fuzz v0.0.0-20200521005638-2433a187de95/go.mod h1:jpu8xFsDKd6kAWUAKk8oTu/GQGBWqhrcaDeOJdaCJnk= diff --git a/vendor/kmodules.xyz/client-go/meta/annotations.go b/vendor/kmodules.xyz/client-go/meta/annotations.go index dc5c372ea..3fd4822ee 100644 --- a/vendor/kmodules.xyz/client-go/meta/annotations.go +++ b/vendor/kmodules.xyz/client-go/meta/annotations.go @@ -187,3 +187,16 @@ func GetStringValueForKeys(m map[string]string, key string, alts ...string) (str } return "", kutil.ErrNotFound } + +func GetBytesForKeys(m map[string][]byte, key string, alts ...string) ([]byte, error) { + if m == nil { + return nil, kutil.ErrNotFound + } + keys := append([]string{key}, alts...) + for _, k := range keys { + if v, ok := m[k]; ok { + return v, nil + } + } + return nil, kutil.ErrNotFound +} diff --git a/vendor/modules.txt b/vendor/modules.txt index 2f60062ec..b56200f9e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -843,7 +843,7 @@ k8s.io/utils/net k8s.io/utils/path k8s.io/utils/pointer k8s.io/utils/trace -# kmodules.xyz/client-go v0.0.0-20201007024140-3223988adf40 +# kmodules.xyz/client-go v0.0.0-20201008164401-74d81f261ec5 kmodules.xyz/client-go kmodules.xyz/client-go/api/v1 kmodules.xyz/client-go/apiextensions