From 09a15401f798693e3091264c047951d0893a8108 Mon Sep 17 00:00:00 2001 From: Pierangelo Di Pilato Date: Thu, 2 Jan 2025 11:28:08 +0100 Subject: [PATCH] Point to real eventing dep Signed-off-by: Pierangelo Di Pilato --- go.mod | 10 ++++------ go.sum | 14 ++++++++------ vendor/knative.dev/hack/infra-library.sh | 2 +- vendor/knative.dev/pkg/hack/update-codegen.sh | 2 +- vendor/modules.txt | 11 +++++------ 5 files changed, 19 insertions(+), 20 deletions(-) diff --git a/go.mod b/go.mod index c6e6b833e7..e6d8f83448 100644 --- a/go.mod +++ b/go.mod @@ -35,10 +35,10 @@ require ( k8s.io/apiserver v0.30.3 k8s.io/client-go v0.30.3 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 - knative.dev/eventing v0.43.1-0.20241029203049-7c97e6ff8358 - knative.dev/hack v0.0.0-20241106013728-b7995315deb5 - knative.dev/pkg v0.0.0-20241118074447-a7fd9b10bb9f - knative.dev/reconciler-test v0.0.0-20241106013737-0619dc3ecbcf + knative.dev/eventing v0.43.1-0.20241223131119-c9047a198255 + knative.dev/hack v0.0.0-20241227080210-e92a16ae0893 + knative.dev/pkg v0.0.0-20241223131119-4c901591eb4a + knative.dev/reconciler-test v0.0.0-20241223131247-96258bea6ce4 sigs.k8s.io/controller-runtime v0.12.3 sigs.k8s.io/yaml v1.4.0 ) @@ -141,5 +141,3 @@ require ( sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect ) - -replace knative.dev/eventing => ../eventing diff --git a/go.sum b/go.sum index a70c7f6ad0..5bb764dcf2 100644 --- a/go.sum +++ b/go.sum @@ -1214,12 +1214,14 @@ k8s.io/utils v0.0.0-20200912215256-4140de9c8800/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= 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/pkg v0.0.0-20241118074447-a7fd9b10bb9f h1:ggyD8WGF4LbTWfCiLo++EC/Q7rvYY4UI6CzuDt9dXkE= -knative.dev/pkg v0.0.0-20241118074447-a7fd9b10bb9f/go.mod h1:C2dxK66GlycMOS0SKqv0SMAnWkxsYbG4hkH32Xg1qD0= -knative.dev/reconciler-test v0.0.0-20241106013737-0619dc3ecbcf h1:FMgW5irj5xRPSRmtVICeLNHnZsnn7t8IFO0Fj3Kf+jo= -knative.dev/reconciler-test v0.0.0-20241106013737-0619dc3ecbcf/go.mod h1:W9Kmdoxelg2mswUpDKerL/4Ih1/ouVhlSMeZeJ5LX9c= +knative.dev/eventing v0.43.1-0.20241223131119-c9047a198255 h1:pgj6ZnPAklWTTeef9d35/avLBb2rREX7Y5+BwZp6W0I= +knative.dev/eventing v0.43.1-0.20241223131119-c9047a198255/go.mod h1:eBhIxUaRBUAJUQ98189X+KBps/UoWJY4B/MZk+FiVIM= +knative.dev/hack v0.0.0-20241227080210-e92a16ae0893 h1:zy7LwNJ2S7obPMHVAtxQgZPXxBTZzoxHbtb6uhxOl7Q= +knative.dev/hack v0.0.0-20241227080210-e92a16ae0893/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY= +knative.dev/pkg v0.0.0-20241223131119-4c901591eb4a h1:31rLKAGHeQEkxMOc/h4XCmHOTiR/1R4NRPvJ3wg05WY= +knative.dev/pkg v0.0.0-20241223131119-4c901591eb4a/go.mod h1:C2dxK66GlycMOS0SKqv0SMAnWkxsYbG4hkH32Xg1qD0= +knative.dev/reconciler-test v0.0.0-20241223131247-96258bea6ce4 h1:6t8hbwR0tHc1AzUExhLrc7SWVmN4e9mdXkHAC38Y/h0= +knative.dev/reconciler-test v0.0.0-20241223131247-96258bea6ce4/go.mod h1:zDapuiJIFS67XEVBJWdEnVN5KHE8EvFGooLQGXeDH/c= 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/infra-library.sh b/vendor/knative.dev/hack/infra-library.sh index 83eacfa66c..ba5b181809 100644 --- a/vendor/knative.dev/hack/infra-library.sh +++ b/vendor/knative.dev/hack/infra-library.sh @@ -21,7 +21,7 @@ source "$(dirname "${BASH_SOURCE[0]:-$0}")/library.sh" # Default Kubernetes version to use for GKE, if not overridden with # the `--cluster-version` parameter. -readonly GKE_DEFAULT_CLUSTER_VERSION="1.28" +readonly GKE_DEFAULT_CLUSTER_VERSION="1.30" # Dumps the k8s api server metrics. Spins up a proxy, waits a little bit and # dumps the metrics to ${ARTIFACTS}/k8s.metrics.txt diff --git a/vendor/knative.dev/pkg/hack/update-codegen.sh b/vendor/knative.dev/pkg/hack/update-codegen.sh index e56abb7fc4..4f9ffea2a6 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 bf10a085c9..31d55cb8f0 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1169,7 +1169,7 @@ k8s.io/utils/pointer k8s.io/utils/ptr k8s.io/utils/strings/slices k8s.io/utils/trace -# knative.dev/eventing v0.43.1-0.20241029203049-7c97e6ff8358 => ../eventing +# knative.dev/eventing v0.43.1-0.20241223131119-c9047a198255 ## explicit; go 1.22.7 knative.dev/eventing/cmd/event_display knative.dev/eventing/cmd/heartbeats @@ -1350,10 +1350,10 @@ knative.dev/eventing/test/upgrade/prober/wathola/fetcher knative.dev/eventing/test/upgrade/prober/wathola/forwarder knative.dev/eventing/test/upgrade/prober/wathola/receiver knative.dev/eventing/test/upgrade/prober/wathola/sender -# knative.dev/hack v0.0.0-20241106013728-b7995315deb5 +# knative.dev/hack v0.0.0-20241227080210-e92a16ae0893 ## explicit; go 1.21 knative.dev/hack -# knative.dev/pkg v0.0.0-20241118074447-a7fd9b10bb9f +# knative.dev/pkg v0.0.0-20241223131119-4c901591eb4a ## explicit; go 1.22.7 knative.dev/pkg/apiextensions/storageversion knative.dev/pkg/apiextensions/storageversion/cmd/migrate @@ -1473,8 +1473,8 @@ knative.dev/pkg/webhook/resourcesemantics knative.dev/pkg/webhook/resourcesemantics/conversion knative.dev/pkg/webhook/resourcesemantics/defaulting knative.dev/pkg/webhook/resourcesemantics/validation -# knative.dev/reconciler-test v0.0.0-20241106013737-0619dc3ecbcf -## explicit; go 1.22.0 +# knative.dev/reconciler-test v0.0.0-20241223131247-96258bea6ce4 +## explicit; go 1.22.7 knative.dev/reconciler-test/cmd/eventshub knative.dev/reconciler-test/pkg/environment knative.dev/reconciler-test/pkg/eventshub @@ -1523,4 +1523,3 @@ sigs.k8s.io/structured-merge-diff/v4/value ## explicit; go 1.12 sigs.k8s.io/yaml sigs.k8s.io/yaml/goyaml.v2 -# knative.dev/eventing => ../eventing