From 1c537c977f28a2acbfbc281cfabc6e7f319e6f7f Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Thu, 9 Dec 2021 13:40:57 -0500
Subject: [PATCH] Vendor: updates for Alibaba cloud enablement
---
go.mod | 2 +-
go.sum | 4 ++--
vendor/k8s.io/klog/v2/OWNERS | 1 -
vendor/k8s.io/klog/v2/klog.go | 17 +++++++++++++++++
vendor/modules.txt | 4 ++--
5 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/go.mod b/go.mod
index 7155f5ebb..f3bec55eb 100644
--- a/go.mod
+++ b/go.mod
@@ -107,5 +107,5 @@ require (
replace (
github.com/go-logr/logr => github.com/go-logr/logr v0.4.0
- k8s.io/klog/v2 => k8s.io/klog/v2 v2.9.0
+ k8s.io/klog/v2 => k8s.io/klog/v2 v2.10.0
)
diff --git a/go.sum b/go.sum
index aecc03402..2b1f56e9d 100644
--- a/go.sum
+++ b/go.sum
@@ -1272,8 +1272,8 @@ k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUc
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
-k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM=
-k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
+k8s.io/klog/v2 v2.10.0 h1:R2HDMDJsHVTHA2n4RjwbeYXdOcBymXdX/JRb1v0VGhE=
+k8s.io/klog/v2 v2.10.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
k8s.io/kube-aggregator v0.18.0-beta.2/go.mod h1:O3Td9mheraINbLHH4pzoFP2gRzG0Wk1COqzdSL4rBPk=
k8s.io/kube-aggregator v0.22.0-rc.0/go.mod h1:g0xtiBSsbMKvewN7xR/Icib4TrHxtvrJcHtYvFsgw7k=
k8s.io/kube-aggregator v0.23.0 h1:IjY8CfGHH9WUvJXIaAsAxTzHDsaLVeaEqjkvo6MLMD0=
diff --git a/vendor/k8s.io/klog/v2/OWNERS b/vendor/k8s.io/klog/v2/OWNERS
index 380e514f2..f689c1641 100644
--- a/vendor/k8s.io/klog/v2/OWNERS
+++ b/vendor/k8s.io/klog/v2/OWNERS
@@ -15,5 +15,4 @@ approvers:
- tallclair
- piosz
- brancz
- - DirectXMan12
- lavalamp
diff --git a/vendor/k8s.io/klog/v2/klog.go b/vendor/k8s.io/klog/v2/klog.go
index 1e187f763..d24087def 100644
--- a/vendor/k8s.io/klog/v2/klog.go
+++ b/vendor/k8s.io/klog/v2/klog.go
@@ -1603,3 +1603,20 @@ func KRef(namespace, name string) ObjectRef {
Namespace: namespace,
}
}
+
+// KObjs returns slice of ObjectRef from an slice of ObjectMeta
+func KObjs(arg interface{}) []ObjectRef {
+ s := reflect.ValueOf(arg)
+ if s.Kind() != reflect.Slice {
+ return nil
+ }
+ objectRefs := make([]ObjectRef, 0, s.Len())
+ for i := 0; i < s.Len(); i++ {
+ if v, ok := s.Index(i).Interface().(KMetadata); ok {
+ objectRefs = append(objectRefs, KObj(v))
+ } else {
+ return nil
+ }
+ }
+ return objectRefs
+}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index e3486fe3d..7822bc1c7 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -912,7 +912,7 @@ k8s.io/component-base/config/v1alpha1
k8s.io/component-base/metrics
k8s.io/component-base/metrics/legacyregistry
k8s.io/component-base/version
-# k8s.io/klog/v2 v2.30.0 => k8s.io/klog/v2 v2.9.0
+# k8s.io/klog/v2 v2.30.0 => k8s.io/klog/v2 v2.10.0
## explicit; go 1.13
k8s.io/klog/v2
k8s.io/klog/v2/klogr
@@ -1102,4 +1102,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
## explicit; go 1.12
sigs.k8s.io/yaml
# github.com/go-logr/logr => github.com/go-logr/logr v0.4.0
-# k8s.io/klog/v2 => k8s.io/klog/v2 v2.9.0
+# k8s.io/klog/v2 => k8s.io/klog/v2 v2.10.0
--
GitLab