Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): bump github.com/vektra/mockery/v2 from 2.46.0 to 2.46.3 #6709

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/projectcontour/contour

go 1.22.7
go 1.23

require (
dario.cat/mergo v1.0.1
Expand Down Expand Up @@ -28,7 +28,7 @@ require (
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.9.0
github.com/tsaarni/certyaml v0.10.0
github.com/vektra/mockery/v2 v2.46.0
github.com/vektra/mockery/v2 v2.46.3
go.uber.org/automaxprocs v1.6.0
golang.org/x/net v0.31.0
golang.org/x/oauth2 v0.23.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -387,8 +387,8 @@ github.com/tsaarni/certyaml v0.10.0 h1:8ZWHO4Zg4VHUf7YblZNju44PcG5M+YtlJawiArYUH
github.com/tsaarni/certyaml v0.10.0/go.mod h1:rI1wDTE/VQIglHOyGbjfvqb+5mWTVT5uLFVDDcT1sq8=
github.com/tsaarni/x500dn v1.0.0 h1:LvaWTkqRpse4VHBhB5uwf3wytokK4vF9IOyNAEyiA+U=
github.com/tsaarni/x500dn v1.0.0/go.mod h1:QaHa3EcUKC4dfCAZmj8+ZRGLKukWgpGv9H3oOCsAbcE=
github.com/vektra/mockery/v2 v2.46.0 h1:DKIFj6hAPGwmOYiWfWzdsQtBgU8ozPXo3Bwbmf+Ku80=
github.com/vektra/mockery/v2 v2.46.0/go.mod h1:XNTE9RIu3deGAGQRVjP1VZxGpQNm0YedZx4oDs3prr8=
github.com/vektra/mockery/v2 v2.46.3 h1:Aia4iShZeNTy6CZJcvweK4X97XOzXcqb+k9jm8IqBS0=
github.com/vektra/mockery/v2 v2.46.3/go.mod h1:dDivqi0ShM8A29mLgZn13yZ14MdXlTM4V360u8JDWCQ=
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc=
Expand Down
4 changes: 4 additions & 0 deletions hack/generate-api-docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ readonly REPO=$(cd "${HERE}/.." && pwd)
# Optional first arg is the package root to scan for documentation.
readonly PKGROOT="${1:-github.com/projectcontour/contour/apis/projectcontour}"

# Workaround for https://github.com/projectcontour/contour/pull/6709#issuecomment-2466179766
readonly GODEBUG=gotypesalias=0
export GODEBUG

gendoc::build() {
go install github.com/ahmetb/gen-crd-api-reference-docs
}
Expand Down
4 changes: 4 additions & 0 deletions hack/generate-crd-deepcopy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ readonly GO111MODULE=on

export GO111MODULE

# Workaround for https://github.com/projectcontour/contour/pull/6709#issuecomment-2466179766
readonly GODEBUG=gotypesalias=0
export GODEBUG

boilerplate() {
cat <<EOF
/*
Expand Down
5 changes: 4 additions & 1 deletion hack/generate-crd-yaml.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ readonly TEMPDIR=$(mktemp -d crd-XXXXXX)
# Optional first arg is the paths pattern.
readonly PATHS="${1:-"./apis/..."}"

# Workaround for https://github.com/projectcontour/contour/pull/6709#issuecomment-2466179766
readonly GODEBUG=gotypesalias=0
export GODEBUG

trap 'rm -rf "$TEMPDIR"; exit' 0 1 2 15

cd "${REPO}"
Expand All @@ -32,4 +36,3 @@ go run sigs.k8s.io/controller-tools/cmd/controller-gen \
ls "${TEMPDIR}"/*.yaml | xargs cat | sed '/^$/d' \
| awk '/group: projectcontour.io/{print " preserveUnknownFields: false"}1' \
> "${REPO}/examples/contour/01-crds.yaml"

6 changes: 2 additions & 4 deletions internal/k8s/mocks/cache.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.