diff --git a/go.mod b/go.mod index 7fcf37a45..72c0b12e2 100644 --- a/go.mod +++ b/go.mod @@ -14,11 +14,11 @@ require ( k8s.io/client-go v0.30.3 k8s.io/code-generator v0.30.3 k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8 - knative.dev/caching v0.0.0-20240812133420-93e6a0a5b46d - knative.dev/hack v0.0.0-20240814130635-06f7aff93954 - knative.dev/networking v0.0.0-20240808015019-d4c57cd4a1b3 - knative.dev/pkg v0.0.0-20240812053209-cd3311cbab65 - knative.dev/serving v0.42.1-0.20240814142753-446e6909be99 + knative.dev/caching v0.0.0-20240815051508-3a2a1b64338c + knative.dev/hack v0.0.0-20240904112633-9724320e463f + knative.dev/networking v0.0.0-20240905103434-0efcb4cb6806 + knative.dev/pkg v0.0.0-20240905103434-a1469cf54480 + knative.dev/serving v0.42.1-0.20240906121735-b50a09e08cd2 ) require ( diff --git a/go.sum b/go.sum index 9a53d5866..633c3337d 100644 --- a/go.sum +++ b/go.sum @@ -802,16 +802,16 @@ k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8 h1:1Wof1cGQgA5pqgo8MxKPtf k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8/go.mod h1:Os6V6dZwLNii3vxFpxcNaTmH8LJJBkOTg1N0tOA0fvA= 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/caching v0.0.0-20240812133420-93e6a0a5b46d h1:pj+XufdayIdxV/PUFpuIB1Y/pFoiWPJT6VrAXja4OcE= -knative.dev/caching v0.0.0-20240812133420-93e6a0a5b46d/go.mod h1:vxgDv5XOAYFa2LrreP8quBiyKB2HB2fqWG6nc6LmDR4= -knative.dev/hack v0.0.0-20240814130635-06f7aff93954 h1:dGMK5VoL75szvrYQTL9NqhPYHu1f5dGaXx1hJI8fAFM= -knative.dev/hack v0.0.0-20240814130635-06f7aff93954/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY= -knative.dev/networking v0.0.0-20240808015019-d4c57cd4a1b3 h1:KfIea0RVx0QfHK0gHruJfacT2kBVb4hZE8Sgzs32KKo= -knative.dev/networking v0.0.0-20240808015019-d4c57cd4a1b3/go.mod h1:QsOtfjxoHEzWvLa8y+mSts95UKUmzTvmgPxWoi7XHMQ= -knative.dev/pkg v0.0.0-20240812053209-cd3311cbab65 h1:9r795uNPp2f/dIUzHlJW4Prz3U+8+1ZpW4z6EBUxpwc= -knative.dev/pkg v0.0.0-20240812053209-cd3311cbab65/go.mod h1:2kizutszzGp+EcVXivdigNd6dUM7O77QaLUTZeKaN5s= -knative.dev/serving v0.42.1-0.20240814142753-446e6909be99 h1:O6PldVVrAII0OxqCbO9MS8aBZjMS/LnVNXoKjX38FCs= -knative.dev/serving v0.42.1-0.20240814142753-446e6909be99/go.mod h1:b0WWAvtG1b0IQpn4IjSpqumcaUmW0EdEztjOGb5SK9Q= +knative.dev/caching v0.0.0-20240815051508-3a2a1b64338c h1:P5sSufoQ9Tt0CX5ekOTVwmkJvYWlrTq9e/ZkqTLewsA= +knative.dev/caching v0.0.0-20240815051508-3a2a1b64338c/go.mod h1:uMf7GneKb3AIglKbZQSARDaRdfvDw332fxQemyRZCrU= +knative.dev/hack v0.0.0-20240904112633-9724320e463f h1:UQcD5RVBSEitzbNRQOfoJHJ1Rs29hiii7bzhUvU8s8A= +knative.dev/hack v0.0.0-20240904112633-9724320e463f/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY= +knative.dev/networking v0.0.0-20240905103434-0efcb4cb6806 h1:Y8oeLfGVE1gcxK8ZV3HtvQsfdAFeCNflj3qRobbpEEo= +knative.dev/networking v0.0.0-20240905103434-0efcb4cb6806/go.mod h1:i7nMwzWWbsorxAL9e88yTl/PugUDvtL6KtG5H/L0sg8= +knative.dev/pkg v0.0.0-20240905103434-a1469cf54480 h1:Y9zHlLhIF8BobwQ8JQTROsJoQTgfkxCZIzCXW0Q/b9k= +knative.dev/pkg v0.0.0-20240905103434-a1469cf54480/go.mod h1:eNnDbxvf6coy9eh+qgucG/sZgnDVbBUYPU6PhrwFQnM= +knative.dev/serving v0.42.1-0.20240906121735-b50a09e08cd2 h1:1/p8miABTzWbB38K4beXW+pii8chPE9c7eAzSHDTaUA= +knative.dev/serving v0.42.1-0.20240906121735-b50a09e08cd2/go.mod h1:VPSQw5+SNNS2rbBb/nocNzbPM/pMz84Ubugb/+Hm5U8= 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/hack/codegen-library.sh b/vendor/knative.dev/hack/codegen-library.sh index 01a43132d..42ece681c 100644 --- a/vendor/knative.dev/hack/codegen-library.sh +++ b/vendor/knative.dev/hack/codegen-library.sh @@ -133,16 +133,18 @@ function restore-changes-if-its-copyright-year-only() { local difflist log "Cleaning up generated code" difflist="$(mktemp)" - git diff --exit-code --name-only > "$difflist" - # list git changes and skip those which differ only in the boilerplate year - while read -r file; do - # check if the file contains just the change in the boilerplate year - if [ "$(LANG=C git diff --exit-code --shortstat -- "$file")" = ' 1 file changed, 1 insertion(+), 1 deletion(-)' ] && \ - [[ "$(git diff --exit-code -U1 -- "$file" | grep -Ec '^[+-]\s*[*#]?\s*Copyright 2[0-9]{3}')" -eq 2 ]]; then - # restore changes to that file - git checkout -- "$file" - fi - done < "$difflist" + if ! git diff --exit-code --name-only > /dev/null; then + # list git changes and skip those which differ only in the boilerplate year + git diff --name-only > "$difflist" + while read -r file; do + # check if the file contains just the change in the boilerplate year + if [ "$(LANG=C git diff --exit-code --shortstat -- "$file")" = ' 1 file changed, 1 insertion(+), 1 deletion(-)' ] && \ + [[ "$(git diff --exit-code -U1 -- "$file" | grep -Ec '^[+-]\s*[*#]?\s*Copyright 2[0-9]{3}')" -eq 2 ]]; then + # restore changes to that file + git checkout -- "$file" + fi + done < "$difflist" + fi rm -f "$difflist" } diff --git a/vendor/knative.dev/hack/library.sh b/vendor/knative.dev/hack/library.sh index 08f2dba16..d487a1495 100644 --- a/vendor/knative.dev/hack/library.sh +++ b/vendor/knative.dev/hack/library.sh @@ -774,7 +774,7 @@ function go_update_deps() { function __clean_goworksum_if_exists() { if [ -f "$REPO_ROOT_DIR/go.work.sum" ]; then log.step 'Cleaning the go.work.sum file' - truncate --size 0 "$REPO_ROOT_DIR/go.work.sum" + truncate -s 0 "$REPO_ROOT_DIR/go.work.sum" fi } diff --git a/vendor/modules.txt b/vendor/modules.txt index b5cd10a36..f157a673e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1119,7 +1119,7 @@ k8s.io/utils/pointer k8s.io/utils/ptr k8s.io/utils/strings/slices k8s.io/utils/trace -# knative.dev/caching v0.0.0-20240812133420-93e6a0a5b46d +# knative.dev/caching v0.0.0-20240815051508-3a2a1b64338c ## explicit; go 1.22.0 knative.dev/caching/pkg/apis/caching knative.dev/caching/pkg/apis/caching/v1alpha1 @@ -1137,11 +1137,11 @@ knative.dev/caching/pkg/client/injection/client/fake knative.dev/caching/pkg/client/injection/informers/caching/v1alpha1/image knative.dev/caching/pkg/client/injection/informers/factory knative.dev/caching/pkg/client/listers/caching/v1alpha1 -# knative.dev/hack v0.0.0-20240814130635-06f7aff93954 +# knative.dev/hack v0.0.0-20240904112633-9724320e463f ## explicit; go 1.21 knative.dev/hack -# knative.dev/networking v0.0.0-20240808015019-d4c57cd4a1b3 -## explicit; go 1.22 +# knative.dev/networking v0.0.0-20240905103434-0efcb4cb6806 +## explicit; go 1.22.0 knative.dev/networking/pkg knative.dev/networking/pkg/apis/networking knative.dev/networking/pkg/apis/networking/v1alpha1 @@ -1175,7 +1175,7 @@ knative.dev/networking/pkg/http/stats knative.dev/networking/pkg/ingress knative.dev/networking/pkg/k8s knative.dev/networking/pkg/prober -# knative.dev/pkg v0.0.0-20240812053209-cd3311cbab65 +# knative.dev/pkg v0.0.0-20240905103434-a1469cf54480 ## explicit; go 1.22.0 knative.dev/pkg/apis knative.dev/pkg/apis/duck @@ -1242,7 +1242,7 @@ knative.dev/pkg/version knative.dev/pkg/webhook knative.dev/pkg/webhook/certificates/resources knative.dev/pkg/websocket -# knative.dev/serving v0.42.1-0.20240814142753-446e6909be99 +# knative.dev/serving v0.42.1-0.20240906121735-b50a09e08cd2 ## explicit; go 1.22.0 knative.dev/serving/pkg/activator knative.dev/serving/pkg/apis/autoscaling