Skip to content

Commit

Permalink
upgrade to latest dependencies
Browse files Browse the repository at this point in the history
bumping knative.dev/serving 7222bf9...0d73dfe:
  > 0d73dfe Update performance tests (# 14289)
  > d02702e Support gRPC probe (# 14134)
  > 5b1eab3 upgrade to latest dependencies (# 14413)
  > 59ddac3 Update net-contour nightly (# 14412)
  > ecbe40a Update net-certmanager nightly (# 14409)
  > fcb4979 Update net-istio nightly (# 14411)
  > 167d794 Update net-gateway-api nightly (# 14410)
  > 127a351 Cleanup knative-internal-tls secrets (# 14394)
  > d33249b Drop unnecessary `routing-id` in Knative Service certificate (# 14393)
  > 6c602da Update net-contour nightly (# 14405)
  > 7c2a5c6 Update net-certmanager nightly (# 14404)
  > 8818499 Update net-gateway-api nightly (# 14398)
  > 28e75ab Update net-kourier nightly (# 14397)
  > f2fb095 Update net-istio nightly (# 14396)
  > 28effd9 upgrade to latest dependencies (# 14401)
  > 2002b38 test fixture didn't make sense (# 14400)
  > 022f553 Update net-certmanager nightly (# 14362)
  > 50eb65a upgrade to latest dependencies (# 14395)
bumping knative.dev/eventing 5acf974...ceecbb0:
  > ceecbb0 Subscription allows overriding namespace for Subscriber and Reply (# 7272)
  > 4e7d0f5 [main] Upgrade to latest dependencies (# 7271)
  > 81d8e96 Option to specify different namespace for resources (# 7269)
  > 8a69f32 [main] Upgrade to latest dependencies (# 7267)
  > e407152 Adding description for the built-in event types of our duck sources (# 7263)
  > 401068c [main] Upgrade to latest dependencies (# 7262)
bumping knative.dev/pkg 7fe699e...8761ceb:
  > 8761ceb upgrade to latest dependencies (# 2827)
bumping knative.dev/networking 6feaf0c...6aa8805:
  > 6aa8805 Verify and reconcile new keys' value instead of obsleted keys' in secret (# 863)
  > 7f9a4a8 upgrade to latest dependencies (# 862)
bumping knative.dev/hack 0bb79ff...c4a34c3:
  > c4a34c3 Collect LICENSE files from all dependencies, even without vendor dir (# 316)
  > 38316f2 Upgrade the Go tools to latest ones (# 312)

Signed-off-by: Knative Automation <automation@knative.team>
  • Loading branch information
knative-automation committed Sep 22, 2023
1 parent 0b8c5d4 commit d92b98d
Show file tree
Hide file tree
Showing 10 changed files with 236 additions and 51 deletions.
10 changes: 5 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ require (
k8s.io/client-go v0.26.5
k8s.io/code-generator v0.26.5
knative.dev/client-pkg v0.0.0-20230914131734-b21a925efce6
knative.dev/eventing v0.38.1-0.20230918195630-5acf97450f78
knative.dev/hack v0.0.0-20230914013105-0bb79ff2d162
knative.dev/networking v0.0.0-20230918152419-6feaf0cf4a0e
knative.dev/pkg v0.0.0-20230918163324-7fe699e4f743
knative.dev/serving v0.38.1-0.20230918165406-7222bf9fe259
knative.dev/eventing v0.38.1-0.20230921080814-ceecbb01e116
knative.dev/hack v0.0.0-20230921145603-c4a34c34512e
knative.dev/networking v0.0.0-20230921070414-6aa88055400d
knative.dev/pkg v0.0.0-20230920131713-8761ceb9297f
knative.dev/serving v0.38.1-0.20230921205527-0d73dfe0f295
sigs.k8s.io/yaml v1.3.0
)

Expand Down
20 changes: 10 additions & 10 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -834,16 +834,16 @@ k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 h1:GfD9OzL11kvZN5iArC6oTS7RTj7oJ
k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
knative.dev/client-pkg v0.0.0-20230914131734-b21a925efce6 h1:TYwrsutijYhQcgP3SIwjjAkn/9r58P/2mboDxyKqVDc=
knative.dev/client-pkg v0.0.0-20230914131734-b21a925efce6/go.mod h1:GRVZm1rKOy0lpPBGRM1ugK5joDbhXFEvULINHqPoA9U=
knative.dev/eventing v0.38.1-0.20230918195630-5acf97450f78 h1:7ck/w/2+Gg0e9fWk6QrP7q0Jk3JvRwzuYUCfu3Sl1No=
knative.dev/eventing v0.38.1-0.20230918195630-5acf97450f78/go.mod h1:drwtJr2Wan4oW+K9DLoN+mkG5LaRgH9LhuxV646hBKk=
knative.dev/hack v0.0.0-20230914013105-0bb79ff2d162 h1:5IYUAmyfUsvSoP5ZQmqBetYLMv/EUEayC4uHEuhTnCo=
knative.dev/hack v0.0.0-20230914013105-0bb79ff2d162/go.mod h1:dx0YG3YWqJu653e9tjcT0Q1ZdS9JJXLKbUhzr4EB0g8=
knative.dev/networking v0.0.0-20230918152419-6feaf0cf4a0e h1:53Z4C003PKNKQGgfWIfKkveo7J0y6eRxN18K1TAgqaQ=
knative.dev/networking v0.0.0-20230918152419-6feaf0cf4a0e/go.mod h1:t5rGgqqJ55N1KdGcaT/S/3mVJfttqQx0xa/wxcLC09w=
knative.dev/pkg v0.0.0-20230918163324-7fe699e4f743 h1:AI7nF2yLlbzifEYbNpyQFqqnI2cvUVwxeLeTckD+/Fg=
knative.dev/pkg v0.0.0-20230918163324-7fe699e4f743/go.mod h1:zIkWt0Gh4IZF4lWyU2UN46f+8icvkkjZBVP7Kfhz4oA=
knative.dev/serving v0.38.1-0.20230918165406-7222bf9fe259 h1:2qBW7GM92sbBjszKLu/EJrhPJbPvQ6RSKXq3r/15DIw=
knative.dev/serving v0.38.1-0.20230918165406-7222bf9fe259/go.mod h1:5wCFY88XFzaEMCtRGWUl8uWm7AnWPAGUZRJ2+DCGxBw=
knative.dev/eventing v0.38.1-0.20230921080814-ceecbb01e116 h1:6uRelTonJAo0gBvWRGLmkUYX2C6ujXor6XkcaPp+mSg=
knative.dev/eventing v0.38.1-0.20230921080814-ceecbb01e116/go.mod h1:SvR+RVODiRXu1H083BdBqlAPJxaxsaVJ0arpUrWqDBA=
knative.dev/hack v0.0.0-20230921145603-c4a34c34512e h1:6Va+yK7+Sjtnck9dsCDsgk/1k+K0Hx9HPZ2ZJ7mRJFs=
knative.dev/hack v0.0.0-20230921145603-c4a34c34512e/go.mod h1:dx0YG3YWqJu653e9tjcT0Q1ZdS9JJXLKbUhzr4EB0g8=
knative.dev/networking v0.0.0-20230921070414-6aa88055400d h1:avwL7zSaTNm9rdi0gVKLYLQ71iYmM7LKP71xrQV/AH4=
knative.dev/networking v0.0.0-20230921070414-6aa88055400d/go.mod h1:5MM0oDUBDW1Y6pqxr3FPSpHL07ajdKSzHGtjV+j0BZw=
knative.dev/pkg v0.0.0-20230920131713-8761ceb9297f h1:ZapGIwjj8yUNfXhLo6f/DuDnNGV4UrqTIwVgxRir9HI=
knative.dev/pkg v0.0.0-20230920131713-8761ceb9297f/go.mod h1:a133faJchgmFZIJyOOcFq34NbWnrUcOvwVKgK6hfrHE=
knative.dev/serving v0.38.1-0.20230921205527-0d73dfe0f295 h1:5RkvBIstu7qLoQXLa1vD8HkjEQJFAPR5pX04LTePuPQ=
knative.dev/serving v0.38.1-0.20230921205527-0d73dfe0f295/go.mod h1:ffb3XgwjQx5z3XZtWBSdc+O3fHvwBpUZUQg+cG6+xPw=
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=
Expand Down
171 changes: 171 additions & 0 deletions vendor/knative.dev/hack/go.work.sum

Large diffs are not rendered by default.

36 changes: 16 additions & 20 deletions vendor/knative.dev/hack/library.sh
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ function report_go_test() {
logfile="${logfile/.xml/.jsonl}"
echo "Running go test with args: ${go_test_args[*]}"
local gotest_retcode=0
go_run gotest.tools/gotestsum@v1.8.0 \
go_run gotest.tools/gotestsum@v1.10.1 \
--format "${GO_TEST_VERBOSITY:-testname}" \
--junitfile "${xml}" \
--junitfile-testsuite-name relative \
Expand All @@ -510,14 +510,14 @@ function report_go_test() {
echo "Test log (JSONL) written to ${logfile}"

ansilog="${logfile/.jsonl/-ansi.log}"
go_run github.com/haveyoudebuggedit/gotestfmt/v2/cmd/gotestfmt@v2.3.1 \
go_run github.com/gotesttools/gotestfmt/v2/cmd/gotestfmt@v2.5.0 \
-input "${logfile}" \
-showteststatus \
-nofail > "$ansilog"
echo "Test log (ANSI) written to ${ansilog}"

htmllog="${logfile/.jsonl/.html}"
go_run github.com/buildkite/terminal-to-html/v3/cmd/terminal-to-html@v3.6.1 \
go_run github.com/buildkite/terminal-to-html/v3/cmd/terminal-to-html@v3.9.1 \
--preview < "$ansilog" > "$htmllog"
echo "Test log (HTML) written to ${htmllog}"

Expand Down Expand Up @@ -731,26 +731,22 @@ function __go_update_deps_for_module() {
fi
eval "$orig_pipefail_opt"

if ! [[ "${FORCE_VENDOR:-false}" == "true" ]] && ! [ -d vendor ]; then
return 0
fi

group "Removing unwanted vendor files"
if [[ "${FORCE_VENDOR:-false}" == "true" ]] || [ -d vendor ]; then
group "Removing unwanted vendor files"
find vendor/ \( -name "OWNERS" \
-o -name "OWNERS_ALIASES" \
-o -name "BUILD" \
-o -name "BUILD.bazel" \
-o -name "*_test.go" \) -exec rm -f {} +

# Remove unwanted vendor files
find vendor/ \( -name "OWNERS" \
-o -name "OWNERS_ALIASES" \
-o -name "BUILD" \
-o -name "BUILD.bazel" \
-o -name "*_test.go" \) -exec rm -f {} +
export GOFLAGS=-mod=vendor

export GOFLAGS=-mod=vendor
group "Removing broken symlinks"
remove_broken_symlinks ./vendor
fi

group "Updating licenses"
update_licenses third_party/VENDOR-LICENSE "./..."

group "Removing broken symlinks"
remove_broken_symlinks ./vendor
)
}

Expand Down Expand Up @@ -793,15 +789,15 @@ function update_licenses() {
local dst=$1
local dir=$2
shift
go_run github.com/google/go-licenses@v1.2.1 \
go_run github.com/google/go-licenses@v1.6.0 \
save "${dir}" --save_path="${dst}" --force || \
{ echo "--- FAIL: go-licenses failed to update licenses"; return 1; }
}

# Run go-licenses to check for forbidden licenses.
function check_licenses() {
# Check that we don't have any forbidden licenses.
go_run github.com/google/go-licenses@v1.2.1 \
go_run github.com/google/go-licenses@v1.6.0 \
check "${REPO_ROOT_DIR}/..." || \
{ echo "--- FAIL: go-licenses failed the license check"; return 1; }
}
Expand Down
17 changes: 17 additions & 0 deletions vendor/knative.dev/serving/pkg/apis/serving/fieldmask.go
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,7 @@ func HandlerMask(in *corev1.ProbeHandler) *corev1.ProbeHandler {
out.Exec = in.Exec
out.HTTPGet = in.HTTPGet
out.TCPSocket = in.TCPSocket
out.GRPC = in.GRPC

return out

Expand Down Expand Up @@ -429,6 +430,22 @@ func TCPSocketActionMask(in *corev1.TCPSocketAction) *corev1.TCPSocketAction {
return out
}

// GRPCActionMask performs a _shallow_ copy of the Kubernetes GRPCAction object to a new
// Kubernetes GRPCAction object bringing over only the fields allowed in the Knative API. This
// does not validate the contents or the bounds of the provided fields.
func GRPCActionMask(in *corev1.GRPCAction) *corev1.GRPCAction {
if in == nil {
return nil
}
out := new(corev1.GRPCAction)

// Allowed fields
out.Port = in.Port
out.Service = in.Service

return out
}

// ContainerPortMask performs a _shallow_ copy of the Kubernetes ContainerPort object to a new
// Kubernetes ContainerPort object bringing over only the fields allowed in the Knative API. This
// does not validate the contents or the bounds of the provided fields.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -832,9 +832,13 @@ func validateProbe(p *corev1.Probe, port corev1.ContainerPort) *apis.FieldError
handlers = append(handlers, "exec")
errs = errs.Also(apis.CheckDisallowedFields(*h.Exec, *ExecActionMask(h.Exec))).ViaField("exec")
}
if h.GRPC != nil {
handlers = append(handlers, "gRPC")
errs = errs.Also(apis.CheckDisallowedFields(*h.GRPC, *GRPCActionMask(h.GRPC))).ViaField("grpc")
}

if len(handlers) == 0 {
errs = errs.Also(apis.ErrMissingOneOf("httpGet", "tcpSocket", "exec"))
errs = errs.Also(apis.ErrMissingOneOf("httpGet", "tcpSocket", "exec", "grpc"))
} else if len(handlers) > 1 {
errs = errs.Also(apis.ErrMultipleOneOf(handlers...))
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,15 @@ func (*RevisionSpec) applyProbes(container *corev1.Container) {
}
if container.ReadinessProbe.TCPSocket == nil &&
container.ReadinessProbe.HTTPGet == nil &&
container.ReadinessProbe.Exec == nil {
container.ReadinessProbe.Exec == nil &&
container.ReadinessProbe.GRPC == nil {
container.ReadinessProbe.TCPSocket = &corev1.TCPSocketAction{}
}

if container.ReadinessProbe.GRPC != nil && container.ReadinessProbe.GRPC.Service == nil {
container.ReadinessProbe.GRPC.Service = ptr.String("")
}

if container.ReadinessProbe.SuccessThreshold == 0 {
container.ReadinessProbe.SuccessThreshold = 1
}
Expand Down
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/test/conformance.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ const (
Timeout = "timeout"
Volumes = "volumes"
WorkingDir = "workingdir"
SlowStart = "slowstart"

// Constants for test image output.
PizzaPlanetText1 = "What a spaceport!"
Expand Down
9 changes: 0 additions & 9 deletions vendor/knative.dev/serving/test/e2e-common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ export ENABLE_HA=${ENABLE_HA:-0}
export ENABLE_TLS=${ENABLE_TLS:-0}
export MESH=${MESH:-0}
export AMBIENT=${AMBIENT:-0}
export PERF=${PERF:-0}
export KIND=${KIND:-0}
export CLUSTER_DOMAIN=${CLUSTER_DOMAIN:-cluster.local}

Expand Down Expand Up @@ -131,10 +130,6 @@ function parse_flags() {
readonly MESH=0
return 1
;;
--perf)
readonly PERF=1
return 1
;;
--enable-ha)
readonly ENABLE_HA=1
return 1
Expand Down Expand Up @@ -312,10 +307,6 @@ function install() {
YTT_FILES+=("${REPO_ROOT_DIR}/test/config/ytt/ha")
fi

if (( PERF )); then
YTT_FILES+=("${REPO_ROOT_DIR}/test/config/ytt/performance")
fi

if (( KIND )); then
YTT_FILES+=("${REPO_ROOT_DIR}/test/config/ytt/kind/core")
fi
Expand Down
10 changes: 5 additions & 5 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -943,7 +943,7 @@ k8s.io/utils/trace
# knative.dev/client-pkg v0.0.0-20230914131734-b21a925efce6
## explicit; go 1.18
knative.dev/client-pkg/pkg/kn/plugin
# knative.dev/eventing v0.38.1-0.20230918195630-5acf97450f78
# knative.dev/eventing v0.38.1-0.20230921080814-ceecbb01e116
## explicit; go 1.19
knative.dev/eventing/pkg/apis/config
knative.dev/eventing/pkg/apis/duck
Expand Down Expand Up @@ -972,10 +972,10 @@ knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1
knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1/fake
knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2
knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/fake
# knative.dev/hack v0.0.0-20230914013105-0bb79ff2d162
# knative.dev/hack v0.0.0-20230921145603-c4a34c34512e
## explicit; go 1.18
knative.dev/hack
# knative.dev/networking v0.0.0-20230918152419-6feaf0cf4a0e
# knative.dev/networking v0.0.0-20230921070414-6aa88055400d
## explicit; go 1.18
knative.dev/networking/pkg
knative.dev/networking/pkg/apis/networking
Expand All @@ -990,7 +990,7 @@ knative.dev/networking/pkg/http/probe
knative.dev/networking/pkg/http/proxy
knative.dev/networking/pkg/http/stats
knative.dev/networking/pkg/k8s
# knative.dev/pkg v0.0.0-20230918163324-7fe699e4f743
# knative.dev/pkg v0.0.0-20230920131713-8761ceb9297f
## explicit; go 1.18
knative.dev/pkg/apis
knative.dev/pkg/apis/duck
Expand Down Expand Up @@ -1040,7 +1040,7 @@ knative.dev/pkg/tracing/config
knative.dev/pkg/tracing/propagation
knative.dev/pkg/tracing/propagation/tracecontextb3
knative.dev/pkg/tracker
# knative.dev/serving v0.38.1-0.20230918165406-7222bf9fe259
# knative.dev/serving v0.38.1-0.20230921205527-0d73dfe0f295
## explicit; go 1.18
knative.dev/serving/pkg/apis/autoscaling
knative.dev/serving/pkg/apis/autoscaling/v1alpha1
Expand Down

0 comments on commit d92b98d

Please sign in to comment.