diff --git a/go.mod b/go.mod index e4ae5674fb..3c7d35ccb9 100644 --- a/go.mod +++ b/go.mod @@ -21,11 +21,11 @@ require ( k8s.io/client-go v0.26.5 k8s.io/code-generator v0.26.5 k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 - knative.dev/caching v0.0.0-20230906132213-a6afde1d97e9 - knative.dev/eventing v0.38.1-0.20230906134312-a7b39bc87990 + knative.dev/caching v0.0.0-20230907115913-4283c94087e3 + knative.dev/eventing v0.38.1-0.20230907060413-b08285068489 knative.dev/hack v0.0.0-20230906172513-760813ad2706 knative.dev/pkg v0.0.0-20230905144417-27252a376b30 - knative.dev/serving v0.38.1-0.20230906132413-aeb4e94d5752 + knative.dev/serving v0.38.1-0.20230908164815-a8a8be25a7e3 sigs.k8s.io/yaml v1.3.0 ) @@ -139,7 +139,7 @@ require ( k8s.io/gengo v0.0.0-20221011193443-fad74ee6edd9 // indirect k8s.io/klog/v2 v2.80.2-0.20221028030830-9ae4992afb54 // indirect k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect - knative.dev/networking v0.0.0-20230830115731-dfd6edf47b91 // indirect + knative.dev/networking v0.0.0-20230906132213-17b4f7b1ea4a // indirect sigs.k8s.io/controller-runtime v0.7.2 // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect diff --git a/go.sum b/go.sum index 74095566e5..3b0ca44923 100644 --- a/go.sum +++ b/go.sum @@ -1397,18 +1397,18 @@ k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 h1:GfD9OzL11kvZN5iArC6oTS7RTj7oJOIfnislxYlqTj8= k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -knative.dev/caching v0.0.0-20230906132213-a6afde1d97e9 h1:jwVftPnlpNSGHi5MPQaIjkLwhQWEZrm3SqMashXcA9g= -knative.dev/caching v0.0.0-20230906132213-a6afde1d97e9/go.mod h1:cupRWm54x4N6X691zx3SstFaC1R0hs7EzNtsIYiUk5M= -knative.dev/eventing v0.38.1-0.20230906134312-a7b39bc87990 h1:YflLmrwRJPBbN7Ayfw63HC2kmt2wRzYLY0LBsh9OkiA= -knative.dev/eventing v0.38.1-0.20230906134312-a7b39bc87990/go.mod h1:3iuqypXhO+GTuy4Bn/53aWFBOglcY+cOzx4UFBDqsTA= +knative.dev/caching v0.0.0-20230907115913-4283c94087e3 h1:2KvFrxqP6PwEjZwkEXg7/Gukb4klh/34foli34ded/w= +knative.dev/caching v0.0.0-20230907115913-4283c94087e3/go.mod h1:zBNGNn1uvHCpDqOxJbqs2qyn+RUYikCXlQAegkGpjqk= +knative.dev/eventing v0.38.1-0.20230907060413-b08285068489 h1:XTeecv4cC1XnmTCHhAXqcGyIJf69jdQNFZ8Nh//xR5s= +knative.dev/eventing v0.38.1-0.20230907060413-b08285068489/go.mod h1:V81fCtozZsKFXTLix6y0BXEguzUo+FCcJGzNfjL7JHc= knative.dev/hack v0.0.0-20230906172513-760813ad2706 h1:5/b4gPIUUNqVFkDKO9AMnEkdUvZrFVqf+z3r5rJ9w/U= knative.dev/hack v0.0.0-20230906172513-760813ad2706/go.mod h1:dx0YG3YWqJu653e9tjcT0Q1ZdS9JJXLKbUhzr4EB0g8= -knative.dev/networking v0.0.0-20230830115731-dfd6edf47b91 h1:D3Pca9E6Jk7w2QmDaXeSjSRL2apMMA57Dtjt8efgii8= -knative.dev/networking v0.0.0-20230830115731-dfd6edf47b91/go.mod h1:1voQlQD0tuot6U3Kldw+uch33mK2LV85fi3MfbV0CP8= +knative.dev/networking v0.0.0-20230906132213-17b4f7b1ea4a h1:xiF0cQfHuo0qBoaSeXjyk+56Cu1gYv0ezu6qMx9E8us= +knative.dev/networking v0.0.0-20230906132213-17b4f7b1ea4a/go.mod h1:nXiCx9KmJ5WgDofa8zOXA5poIQe8GeBL/neZtQyfobg= knative.dev/pkg v0.0.0-20230905144417-27252a376b30 h1:q8OCYCux80XnBIscEUTyK9kMAM5cYhPMXlU0b77maz0= knative.dev/pkg v0.0.0-20230905144417-27252a376b30/go.mod h1:KOCW7iby+PL0aSDG2Ta7Vf1kCn+VAqL7QaTyK0c4fuk= -knative.dev/serving v0.38.1-0.20230906132413-aeb4e94d5752 h1:AoeSPwhpamWSF9hqK+PsmXqCGFpwhNEgOg9juW6qxww= -knative.dev/serving v0.38.1-0.20230906132413-aeb4e94d5752/go.mod h1:n6R3LX2i+sIdOsSYlUN5W9HuSdG/3+QN13VwCSsmPMk= +knative.dev/serving v0.38.1-0.20230908164815-a8a8be25a7e3 h1:g1rzQl9jQvRhP935giIa8rSrx+SDxo9xiRK2W9Q/hEI= +knative.dev/serving v0.38.1-0.20230908164815-a8a8be25a7e3/go.mod h1:v3lJx+0X60fxa+0yu6DY94ez1qbf6bt1vp7iXglHipU= nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= pgregory.net/rapid v1.0.0 h1:iQaM2w5PZ6xvt6x7hbd7tiDS+nk7YPp5uCaEba+T/F4= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/vendor/knative.dev/serving/pkg/apis/serving/v1/route_lifecycle.go b/vendor/knative.dev/serving/pkg/apis/serving/v1/route_lifecycle.go index ba2908cd19..fe2a43223b 100644 --- a/vendor/knative.dev/serving/pkg/apis/serving/v1/route_lifecycle.go +++ b/vendor/knative.dev/serving/pkg/apis/serving/v1/route_lifecycle.go @@ -193,7 +193,7 @@ const ( // AutoTLSNotEnabledMessage is the message which is set on the // RouteConditionCertificateProvisioned condition when it is set to True // because AutoTLS was not enabled. - AutoTLSNotEnabledMessage = "autoTLS is not enabled" + AutoTLSNotEnabledMessage = "auto-tls is not enabled" // TLSNotEnabledForClusterLocalMessage is the message which is set on the // RouteConditionCertificateProvisioned condition when it is set to True @@ -202,7 +202,7 @@ const ( ) // MarkTLSNotEnabled sets RouteConditionCertificateProvisioned to true when -// certificate config such as autoTLS is not enabled or private cluster-local service. +// certificate config such as auto-tls is not enabled or private cluster-local service. func (rs *RouteStatus) MarkTLSNotEnabled(msg string) { routeCondSet.Manage(rs).MarkTrueWithReason(RouteConditionCertificateProvisioned, "TLSNotEnabled", msg) diff --git a/vendor/knative.dev/serving/pkg/apis/serving/v1beta1/domainmapping_lifecycle.go b/vendor/knative.dev/serving/pkg/apis/serving/v1beta1/domainmapping_lifecycle.go index 80fed9d336..830a65c964 100644 --- a/vendor/knative.dev/serving/pkg/apis/serving/v1beta1/domainmapping_lifecycle.go +++ b/vendor/knative.dev/serving/pkg/apis/serving/v1beta1/domainmapping_lifecycle.go @@ -62,7 +62,7 @@ const ( // AutoTLSNotEnabledMessage is the message which is set on the // DomainMappingConditionCertificateProvisioned condition when it is set to True // because AutoTLS was not enabled. - AutoTLSNotEnabledMessage = "autoTLS is not enabled" + AutoTLSNotEnabledMessage = "auto-tls is not enabled" // TLSCertificateProvidedExternally indicates that a TLS secret won't be created or managed // instead a reference to an existing TLS secret should have been provided in the DomainMapping spec TLSCertificateProvidedExternally = "TLS certificate was provided externally" diff --git a/vendor/knative.dev/serving/test/e2e-auto-tls-tests.sh b/vendor/knative.dev/serving/test/e2e-auto-tls-tests.sh index c8f3f1c874..143976a80e 100644 --- a/vendor/knative.dev/serving/test/e2e-auto-tls-tests.sh +++ b/vendor/knative.dev/serving/test/e2e-auto-tls-tests.sh @@ -67,15 +67,15 @@ function setup_auto_tls_common() { setup_custom_domain - toggle_feature autoTLS Enabled config-network - toggle_feature autocreateClusterDomainClaims true config-network + toggle_feature auto-tls Enabled config-network + toggle_feature autocreate-cluster-domain-claims true config-network } function cleanup_auto_tls_common() { cleanup_custom_domain - toggle_feature autoTLS Disabled config-network - toggle_feature autocreateClusterDomainClaims false config-network + toggle_feature auto-tls Disabled config-network + toggle_feature autocreate-cluster-domain-claims false config-network toggle_feature namespace-wildcard-cert-selector "" config-network kubectl delete kcert --all -n "${TLS_TEST_NAMESPACE}" } diff --git a/vendor/knative.dev/serving/test/e2e-tests.sh b/vendor/knative.dev/serving/test/e2e-tests.sh index 00bb9a045a..9966af0c13 100644 --- a/vendor/knative.dev/serving/test/e2e-tests.sh +++ b/vendor/knative.dev/serving/test/e2e-tests.sh @@ -50,7 +50,7 @@ fi if (( HTTPS )); then E2E_TEST_FLAGS+=" -https" - toggle_feature autoTLS Enabled config-network + toggle_feature auto-tls Enabled config-network kubectl apply -f "${E2E_YAML_DIR}"/test/config/autotls/certmanager/caissuer/ add_trap "kubectl delete -f ${E2E_YAML_DIR}/test/config/autotls/certmanager/caissuer/ --ignore-not-found" SIGKILL SIGTERM SIGQUIT fi @@ -64,14 +64,14 @@ if (( SHORT )); then fi -toggle_feature autocreateClusterDomainClaims true config-network || fail_test +toggle_feature autocreate-cluster-domain-claims true config-network || fail_test go_test_e2e -timeout=30m \ ${GO_TEST_FLAGS} \ ./test/conformance/api/... \ ./test/conformance/runtime/... \ ./test/e2e \ ${E2E_TEST_FLAGS} || failed=1 -toggle_feature autocreateClusterDomainClaims false config-network || fail_test +toggle_feature autocreate-cluster-domain-claims false config-network || fail_test toggle_feature tag-header-based-routing Enabled go_test_e2e -timeout=2m ./test/e2e/tagheader ${E2E_TEST_FLAGS} || failed=1 @@ -81,9 +81,9 @@ toggle_feature allow-zero-initial-scale true config-autoscaler || fail_test go_test_e2e -timeout=2m ./test/e2e/initscale ${E2E_TEST_FLAGS} || failed=1 toggle_feature allow-zero-initial-scale false config-autoscaler || fail_test -toggle_feature autocreateClusterDomainClaims true config-network || fail_test +toggle_feature autocreate-cluster-domain-claims true config-network || fail_test go_test_e2e -timeout=2m ./test/e2e/domainmapping ${E2E_TEST_FLAGS} || failed=1 -toggle_feature autocreateClusterDomainClaims false config-network || fail_test +toggle_feature autocreate-cluster-domain-claims false config-network || fail_test kubectl get cm "config-gc" -n "${SYSTEM_NAMESPACE}" -o yaml > "${TMP_DIR}"/config-gc.yaml add_trap "kubectl replace cm 'config-gc' -n ${SYSTEM_NAMESPACE} -f ${TMP_DIR}/config-gc.yaml" SIGKILL SIGTERM SIGQUIT @@ -123,17 +123,17 @@ toggle_feature secure-pod-defaults Disabled # Run HA tests separately as they're stopping core Knative Serving pods. # Define short -spoofinterval to ensure frequent probing while stopping pods. -toggle_feature autocreateClusterDomainClaims true config-network || fail_test +toggle_feature autocreate-cluster-domain-claims true config-network || fail_test go_test_e2e -timeout=25m -failfast -parallel=1 ./test/ha \ ${E2E_TEST_FLAGS} \ -replicas="${REPLICAS:-1}" \ -buckets="${BUCKETS:-1}" \ -spoofinterval="10ms" || failed=1 -toggle_feature autocreateClusterDomainClaims false config-network || fail_test +toggle_feature autocreate-cluster-domain-claims false config-network || fail_test if (( HTTPS )); then kubectl delete -f ${E2E_YAML_DIR}/test/config/autotls/certmanager/caissuer/ --ignore-not-found - toggle_feature autoTLS Disabled config-network + toggle_feature auto-tls Disabled config-network fi (( failed )) && fail_test diff --git a/vendor/modules.txt b/vendor/modules.txt index 49f201fcfa..098536d67c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1256,11 +1256,11 @@ k8s.io/utils/net k8s.io/utils/pointer k8s.io/utils/strings/slices k8s.io/utils/trace -# knative.dev/caching v0.0.0-20230906132213-a6afde1d97e9 +# knative.dev/caching v0.0.0-20230907115913-4283c94087e3 ## explicit; go 1.18 knative.dev/caching/pkg/apis/caching knative.dev/caching/pkg/apis/caching/v1alpha1 -# knative.dev/eventing v0.38.1-0.20230906134312-a7b39bc87990 +# knative.dev/eventing v0.38.1-0.20230907060413-b08285068489 ## explicit; go 1.19 knative.dev/eventing/pkg/apis/config knative.dev/eventing/pkg/apis/duck @@ -1353,7 +1353,7 @@ knative.dev/eventing/test/upgrade/prober/wathola/sender ## explicit; go 1.18 knative.dev/hack knative.dev/hack/shell -# knative.dev/networking v0.0.0-20230830115731-dfd6edf47b91 +# knative.dev/networking v0.0.0-20230906132213-17b4f7b1ea4a ## explicit; go 1.18 knative.dev/networking/pkg knative.dev/networking/pkg/apis/networking @@ -1448,7 +1448,7 @@ knative.dev/pkg/webhook knative.dev/pkg/webhook/certificates knative.dev/pkg/webhook/certificates/resources knative.dev/pkg/webhook/resourcesemantics/conversion -# knative.dev/serving v0.38.1-0.20230906132413-aeb4e94d5752 +# knative.dev/serving v0.38.1-0.20230908164815-a8a8be25a7e3 ## explicit; go 1.18 knative.dev/serving/pkg/apis/autoscaling knative.dev/serving/pkg/apis/autoscaling/v1alpha1