From aa2cc67650958e263637e9d5f3bf936dae105c30 Mon Sep 17 00:00:00 2001 From: Praveen M Date: Tue, 21 May 2024 16:35:47 +0530 Subject: [PATCH] rebase: update k8s.io packages to v0.30.1 rebase: update kubernetes to 1.30 Signed-off-by: Praveen M --- go.mod | 6 ++--- go.sum | 4 ++-- .../test/e2e/framework/ginkgologger.go | 23 ++++++++++++++++--- vendor/modules.txt | 6 ++--- 4 files changed, 28 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index b8c6d7ec5..8b29083db 100644 --- a/go.mod +++ b/go.mod @@ -38,7 +38,7 @@ require ( k8s.io/client-go v12.0.0+incompatible k8s.io/cloud-provider v0.30.1 k8s.io/klog/v2 v2.120.1 - k8s.io/kubernetes v1.30.0 + k8s.io/kubernetes v1.30.1 k8s.io/mount-utils v0.29.3 k8s.io/pod-security-admission v0.30.1 k8s.io/utils v0.0.0-20230726121419-3b25d923346b @@ -174,7 +174,7 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/apiextensions-apiserver v0.30.0 // indirect + k8s.io/apiextensions-apiserver v0.30.1 // indirect k8s.io/apiserver v0.30.1 // indirect k8s.io/component-base v0.30.1 // indirect k8s.io/component-helpers v0.30.1 // indirect @@ -216,7 +216,7 @@ replace ( k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.1 k8s.io/endpointslice => k8s.io/endpointslice v0.30.1 k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.1 - k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.0 + k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.1 k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.1 k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.1 k8s.io/kubectl => k8s.io/kubectl v0.30.1 diff --git a/go.sum b/go.sum index e44bf0dc5..43a6e0118 100644 --- a/go.sum +++ b/go.sum @@ -2647,8 +2647,8 @@ k8s.io/kubectl v0.30.1 h1:sHFIRI3oP0FFZmBAVEE8ErjnTyXDPkBcvO88mH9RjuY= k8s.io/kubectl v0.30.1/go.mod h1:7j+L0Cc38RYEcx+WH3y44jRBe1Q1jxdGPKkX0h4iDq0= k8s.io/kubelet v0.30.1 h1:6gS1gWjrefUGfC/9n0ITOzxnKyt89FfkIhom70Bola4= k8s.io/kubelet v0.30.1/go.mod h1:5IUeAt3YlIfLNdT/YfRuCCONfEefm7qfcqz81b002Z8= -k8s.io/kubernetes v1.30.0 h1:u3Yw8rNlo2NDSGaDpoxoHXLPQnEu1tfqHATKOJe94HY= -k8s.io/kubernetes v1.30.0/go.mod h1:yPbIk3MhmhGigX62FLJm+CphNtjxqCvAIFQXup6RKS0= +k8s.io/kubernetes v1.30.1 h1:XlqS6KslLEA5mQzLK2AJrhr4Z1m8oJfkhHiWJ5lue+I= +k8s.io/kubernetes v1.30.1/go.mod h1:yPbIk3MhmhGigX62FLJm+CphNtjxqCvAIFQXup6RKS0= k8s.io/mount-utils v0.29.3 h1:iEcqPP7Vv8UClH8nnMfovtmy/04fIloRW9JuSXykoZ0= k8s.io/mount-utils v0.29.3/go.mod h1:9IWJTMe8tG0MYMLEp60xK9GYVeCdA3g4LowmnVi+t9Y= k8s.io/pod-security-admission v0.30.1 h1:r2NQSNXfnZDnm6KvLv1sYgai1ZXuO+m0qn11/Xymkf8= diff --git a/vendor/k8s.io/kubernetes/test/e2e/framework/ginkgologger.go b/vendor/k8s.io/kubernetes/test/e2e/framework/ginkgologger.go index 05f22eff3..6e2c95699 100644 --- a/vendor/k8s.io/kubernetes/test/e2e/framework/ginkgologger.go +++ b/vendor/k8s.io/kubernetes/test/e2e/framework/ginkgologger.go @@ -49,14 +49,16 @@ var ( func init() { // ktesting and testinit already registered the -v and -vmodule - // command line flags. To configure the textlogger instead, we - // need to swap out the flag.Value for those. + // command line flags. To configure the textlogger and klog + // consistently, we need to intercept the Set call. This + // can be done by swapping out the flag.Value for the -v and + // -vmodule flags with a wrapper which calls both. var fs flag.FlagSet logConfig.AddFlags(&fs) fs.VisitAll(func(loggerFlag *flag.Flag) { klogFlag := flag.CommandLine.Lookup(loggerFlag.Name) if klogFlag != nil { - klogFlag.Value = loggerFlag.Value + klogFlag.Value = &valueChain{Value: loggerFlag.Value, parentValue: klogFlag.Value} } }) @@ -75,6 +77,21 @@ func init() { klog.SetLoggerWithOptions(ginkgoLogger, opts...) } +type valueChain struct { + flag.Value + parentValue flag.Value +} + +func (v *valueChain) Set(value string) error { + if err := v.Value.Set(value); err != nil { + return err + } + if err := v.parentValue.Set(value); err != nil { + return err + } + return nil +} + func unwind(skip int) (string, int) { location := ginkgotypes.NewCodeLocation(skip + 1) return location.FileName, location.LineNumber diff --git a/vendor/modules.txt b/vendor/modules.txt index db85a2c2a..cb328e860 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1001,7 +1001,7 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apiextensions-apiserver v0.30.0 => k8s.io/apiextensions-apiserver v0.30.1 +# k8s.io/apiextensions-apiserver v0.30.1 => k8s.io/apiextensions-apiserver v0.30.1 ## explicit; go 1.22.0 k8s.io/apiextensions-apiserver/pkg/apis/apiextensions k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1 @@ -1654,7 +1654,7 @@ k8s.io/kubectl/pkg/util/podutils ## explicit; go 1.22.0 k8s.io/kubelet/pkg/apis k8s.io/kubelet/pkg/apis/stats/v1alpha1 -# k8s.io/kubernetes v1.30.0 +# k8s.io/kubernetes v1.30.1 ## explicit; go 1.22.0 k8s.io/kubernetes/pkg/api/legacyscheme k8s.io/kubernetes/pkg/api/service @@ -1825,7 +1825,7 @@ sigs.k8s.io/yaml/goyaml.v2 # k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.1 # k8s.io/endpointslice => k8s.io/endpointslice v0.30.1 # k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.1 -# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.0 +# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.1 # k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.1 # k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.1 # k8s.io/kubectl => k8s.io/kubectl v0.30.1