diff --git a/go.mod b/go.mod index 855a36249..296feb9be 100644 --- a/go.mod +++ b/go.mod @@ -18,9 +18,9 @@ require ( k8s.io/api v0.30.3 k8s.io/apimachinery v0.30.3 k8s.io/client-go v0.30.3 - knative.dev/hack v0.0.0-20241106013728-b7995315deb5 - knative.dev/networking v0.0.0-20241118132247-bbd3279aa3a4 - knative.dev/pkg v0.0.0-20241118074447-a7fd9b10bb9f + knative.dev/hack v0.0.0-20241128013751-1978b3a02667 + knative.dev/networking v0.0.0-20241213084654-8b69a35edbf3 + knative.dev/pkg v0.0.0-20241218051509-40afb7c5436e sigs.k8s.io/yaml v1.4.0 ) diff --git a/go.sum b/go.sum index 6ca65f5f9..250e56a81 100644 --- a/go.sum +++ b/go.sum @@ -678,12 +678,12 @@ k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/A k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -knative.dev/hack v0.0.0-20241106013728-b7995315deb5 h1:CfU5+6B+ylBd7mSGpvRqpzZV8H5ZQLGUwVygFzbE+1o= -knative.dev/hack v0.0.0-20241106013728-b7995315deb5/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY= -knative.dev/networking v0.0.0-20241118132247-bbd3279aa3a4 h1:z4rTFDTwkNrLfOZqFNzM4I8sUZFHHWaUwgqJhKW2jvY= -knative.dev/networking v0.0.0-20241118132247-bbd3279aa3a4/go.mod h1:nhaf+dGDhLRg0ez4Bm8aX79LD3ohZlSCgsGdu5TbRHU= -knative.dev/pkg v0.0.0-20241118074447-a7fd9b10bb9f h1:ggyD8WGF4LbTWfCiLo++EC/Q7rvYY4UI6CzuDt9dXkE= -knative.dev/pkg v0.0.0-20241118074447-a7fd9b10bb9f/go.mod h1:C2dxK66GlycMOS0SKqv0SMAnWkxsYbG4hkH32Xg1qD0= +knative.dev/hack v0.0.0-20241128013751-1978b3a02667 h1:cp3GfEBnL0H2OrqdxLZ7nZ2K7U4PMdQhdBogl4Vd5+E= +knative.dev/hack v0.0.0-20241128013751-1978b3a02667/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY= +knative.dev/networking v0.0.0-20241213084654-8b69a35edbf3 h1:nJzte4HE7qkVQ/AEWDgFm+3yOWuRjGcaRacmlD2vu9I= +knative.dev/networking v0.0.0-20241213084654-8b69a35edbf3/go.mod h1:nhaf+dGDhLRg0ez4Bm8aX79LD3ohZlSCgsGdu5TbRHU= +knative.dev/pkg v0.0.0-20241218051509-40afb7c5436e h1:pgdDEZT3R50XHwbHBYUYTb71PQ1oDR/2m3mRyQ57W8w= +knative.dev/pkg v0.0.0-20241218051509-40afb7c5436e/go.mod h1:C2dxK66GlycMOS0SKqv0SMAnWkxsYbG4hkH32Xg1qD0= 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/networking/pkg/status/status.go b/vendor/knative.dev/networking/pkg/status/status.go index 4ea161001..d48e57a36 100644 --- a/vendor/knative.dev/networking/pkg/status/status.go +++ b/vendor/knative.dev/networking/pkg/status/status.go @@ -23,8 +23,10 @@ import ( "net" "net/http" "net/url" + "os" "path" "reflect" + "strconv" "sync" "time" @@ -56,6 +58,19 @@ const ( initialDelay = 200 * time.Millisecond ) +var ( + // probeMaxRetryDelay defines the maximum delay between retries in the backoff of probing + probeMaxRetryDelay = 30 * time.Second +) + +func init() { + if val, ok := os.LookupEnv("PROBE_MAX_RETRY_DELAY_SECONDS"); ok { + if durationSeconds, err := strconv.Atoi(val); err == nil && durationSeconds > 0 { + probeMaxRetryDelay = time.Duration(durationSeconds) * time.Second + } + } +} + var dialContext = (&net.Dialer{Timeout: probeTimeout}).DialContext // ingressState represents the probing state of an Ingress @@ -144,7 +159,7 @@ func NewProber( workQueue: workqueue.NewNamedRateLimitingQueue( workqueue.NewMaxOfRateLimiter( // Per item exponential backoff - workqueue.NewItemExponentialFailureRateLimiter(50*time.Millisecond, 30*time.Second), + workqueue.NewItemExponentialFailureRateLimiter(50*time.Millisecond, probeMaxRetryDelay), // Global rate limiter &workqueue.BucketRateLimiter{Limiter: rate.NewLimiter(rate.Limit(50), 100)}, ), diff --git a/vendor/knative.dev/pkg/hack/update-codegen.sh b/vendor/knative.dev/pkg/hack/update-codegen.sh index e56abb7fc..4f9ffea2a 100644 --- a/vendor/knative.dev/pkg/hack/update-codegen.sh +++ b/vendor/knative.dev/pkg/hack/update-codegen.sh @@ -43,7 +43,7 @@ ${REPO_ROOT_DIR}/hack/generate-knative.sh "injection" \ K8S_TYPES=$(find ./vendor/k8s.io/api -type d -path '*/*/*/*/*/*' | cut -d'/' -f 5-6 | sort | sed 's@/@:@g' | grep -v "abac:" | \ grep -v "admission:" | \ - grep -v "admissionregistration:" \ + grep -v "admissionregistration:" | \ grep -v "componentconfig:" | \ grep -v "imagepolicy:" | \ grep -v "resource:" | \ diff --git a/vendor/modules.txt b/vendor/modules.txt index 30c8d2bad..c73ca09f2 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -895,10 +895,10 @@ k8s.io/utils/pointer k8s.io/utils/ptr k8s.io/utils/strings/slices k8s.io/utils/trace -# knative.dev/hack v0.0.0-20241106013728-b7995315deb5 +# knative.dev/hack v0.0.0-20241128013751-1978b3a02667 ## explicit; go 1.21 knative.dev/hack -# knative.dev/networking v0.0.0-20241118132247-bbd3279aa3a4 +# knative.dev/networking v0.0.0-20241213084654-8b69a35edbf3 ## explicit; go 1.22.7 knative.dev/networking/config knative.dev/networking/pkg @@ -944,7 +944,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-20241118074447-a7fd9b10bb9f +# knative.dev/pkg v0.0.0-20241218051509-40afb7c5436e ## explicit; go 1.22.7 knative.dev/pkg/apis knative.dev/pkg/apis/duck