From 2090f5bde96124eaf8c941d2dea0227307e44619 Mon Sep 17 00:00:00 2001 From: Knative Automation Date: Fri, 16 Jun 2023 17:19:50 +0100 Subject: [PATCH] upgrade to latest dependencies (#1065) bumping knative.dev/networking 68947c5...b9dd5c2:%0A > b9dd5c2 upgrade to latest dependencies (# 816)%0Abumping knative.dev/pkg 74c4be5...eb63a40:%0A > eb63a40 Support to set qps and burst via env variable (# 2755) Signed-off-by: Knative Automation --- go.mod | 4 ++-- go.sum | 8 ++++---- .../knative.dev/pkg/environment/client_config.go | 16 ++++++++++++++-- vendor/modules.txt | 4 ++-- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 4814988cc..2bec966d5 100644 --- a/go.mod +++ b/go.mod @@ -21,8 +21,8 @@ require ( k8s.io/client-go v0.26.5 k8s.io/code-generator v0.26.5 knative.dev/hack v0.0.0-20230615155948-d7586a218601 - knative.dev/networking v0.0.0-20230615190548-68947c5b22d8 - knative.dev/pkg v0.0.0-20230612155445-74c4be5e935e + knative.dev/networking v0.0.0-20230616133350-b9dd5c201e19 + knative.dev/pkg v0.0.0-20230616134650-eb63a40adfb0 ) require ( diff --git a/go.sum b/go.sum index 3a74d7c5d..9bbf414c9 100644 --- a/go.sum +++ b/go.sum @@ -758,10 +758,10 @@ k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 h1:GfD9OzL11kvZN5iArC6oTS7RTj7oJ k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= knative.dev/hack v0.0.0-20230615155948-d7586a218601 h1:yMe29SMHrAIt3+J+APvf4WVP6cW7ZDtUhh5uxD5ERdA= knative.dev/hack v0.0.0-20230615155948-d7586a218601/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q= -knative.dev/networking v0.0.0-20230615190548-68947c5b22d8 h1:AOg8rlpIOlyF4VvLRXmE3YjmrroMZBppS0D5e12mEOE= -knative.dev/networking v0.0.0-20230615190548-68947c5b22d8/go.mod h1:uirMsX46DHHZixatHkFf8UFnvK3peyg97kl4/bVXcTk= -knative.dev/pkg v0.0.0-20230612155445-74c4be5e935e h1:koM+NopG2Yw738NlJhQF3ZwpyS+HHznuLm294VYlUKg= -knative.dev/pkg v0.0.0-20230612155445-74c4be5e935e/go.mod h1:dqC6IrvyBE7E+oZocs5PkVhq1G59pDTA7r8U17EAKMk= +knative.dev/networking v0.0.0-20230616133350-b9dd5c201e19 h1:yZXjdJbr+HgwjmGRkZ2QQRYB9r7fhVklStuTEMm6l6w= +knative.dev/networking v0.0.0-20230616133350-b9dd5c201e19/go.mod h1:xYtCGVLsoxLEHxUEQxVa0Ut7R/M5x2E49bHzEj09M5w= +knative.dev/pkg v0.0.0-20230616134650-eb63a40adfb0 h1:weQWWxEEbNOPuL4qtGiBZuMSFhcjF/Cu163uktd/xFE= +knative.dev/pkg v0.0.0-20230616134650-eb63a40adfb0/go.mod h1:dqC6IrvyBE7E+oZocs5PkVhq1G59pDTA7r8U17EAKMk= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/vendor/knative.dev/pkg/environment/client_config.go b/vendor/knative.dev/pkg/environment/client_config.go index 04d4220b0..aef33927e 100644 --- a/vendor/knative.dev/pkg/environment/client_config.go +++ b/vendor/knative.dev/pkg/environment/client_config.go @@ -19,8 +19,10 @@ package environment import ( "flag" "fmt" + "log" "math" "os" + "strconv" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" @@ -45,9 +47,19 @@ func (c *ClientConfig) InitFlags(fs *flag.FlagSet) { fs.StringVar(&c.Kubeconfig, "kubeconfig", os.Getenv("KUBECONFIG"), "Path to a kubeconfig. Only required if out-of-cluster.") - fs.IntVar(&c.Burst, "kube-api-burst", 0, "Maximum burst for throttle.") + fs.IntVar(&c.Burst, "kube-api-burst", int(envVarOrDefault("KUBE_API_BURST", 0)), "Maximum burst for throttle.") - fs.Float64Var(&c.QPS, "kube-api-qps", 0, "Maximum QPS to the server from the client.") + fs.Float64Var(&c.QPS, "kube-api-qps", envVarOrDefault("KUBE_API_QPS", 0.0), "Maximum QPS to the server from the client.") +} + +func envVarOrDefault(key string, val float64) float64 { + var err error + if v := os.Getenv(key); v != "" { + if val, err = strconv.ParseFloat(v, 64); err != nil { + log.Fatal(err) + } + } + return val } func (c *ClientConfig) GetRESTConfig() (*rest.Config, error) { diff --git a/vendor/modules.txt b/vendor/modules.txt index e029f8791..c1d6dc248 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -959,7 +959,7 @@ k8s.io/utils/trace # knative.dev/hack v0.0.0-20230615155948-d7586a218601 ## explicit; go 1.18 knative.dev/hack -# knative.dev/networking v0.0.0-20230615190548-68947c5b22d8 +# knative.dev/networking v0.0.0-20230616133350-b9dd5c201e19 ## explicit; go 1.18 knative.dev/networking/config knative.dev/networking/pkg @@ -1000,7 +1000,7 @@ knative.dev/networking/test/test_images/runtime/handlers knative.dev/networking/test/test_images/timeout knative.dev/networking/test/test_images/wsserver knative.dev/networking/test/types -# knative.dev/pkg v0.0.0-20230612155445-74c4be5e935e +# knative.dev/pkg v0.0.0-20230616134650-eb63a40adfb0 ## explicit; go 1.18 knative.dev/pkg/apis knative.dev/pkg/apis/duck