contour
contour copied to clipboard
build(deps): bump github.com/vektra/mockery/v2 from 2.46.0 to 2.46.3
Bumps github.com/vektra/mockery/v2 from 2.46.0 to 2.46.3.
Release notes
Sourced from github.com/vektra/mockery/v2's releases.
v2.46.3
Changelog
- 4d3bfa7 Merge pull request #824 from DimaGolomozy/patch-1
- 2e2b9bc add git
- f55598e add ssh
v2.46.2
Changelog
- 87fdecc Merge pull request #819 from pieter-irsan/patch-1
- 0d1b1a2 Merge pull request #821 from Link512/master
- 2e2c85b check nillable property for type aliases as well
- ce9adb6 docs: update typo in README.md
v2.46.1
Changelog
- afe04a5 Merge pull request #808 from RangelReale/fix-go123-aliastype
- 720caa9 Undo go:build statements, make code a little DRY
- cf26d69 Update to go1.23
- c05a755 remove Go 1.23 testing
- 6f7960f support types.Alias
- 42d905a support types.Alias
- 66dba08 support types.Alias
- e4b095f upgrade go task
- ea36ecc upgrade golangci-lint and add Go 1.23 to CI test
Commits
4d3bfa7Merge pull request #824 from DimaGolomozy/patch-1f55598eadd ssh2e2b9bcadd git0d1b1a2Merge pull request #821 from Link512/master87fdeccMerge pull request #819 from pieter-irsan/patch-12e2c85bcheck nillable property for type aliases as wellce9adb6docs: update typo in README.mdafe04a5Merge pull request #808 from RangelReale/fix-go123-aliastype720caa9Undo go:build statements, make code a little DRYcf26d69Update to go1.23- Additional commits viewable in compare view
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebasewill rebase this PR@dependabot recreatewill recreate this PR, overwriting any edits that have been made to it@dependabot mergewill merge this PR after your CI passes on it@dependabot squash and mergewill squash and merge this PR after your CI passes on it@dependabot cancel mergewill cancel a previously requested merge and block automerging@dependabot reopenwill reopen this PR if it is closed@dependabot closewill close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot show <dependency name> ignore conditionswill show all of the ignore conditions of the specified dependency@dependabot ignore this major versionwill close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor versionwill close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependencywill close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
panic in controller-tools should be fixed by bumping to latest 0.16.4: https://github.com/kubernetes-sigs/controller-tools/pull/1061
ah actually turns out it wasnt fixed entirely: https://github.com/kubernetes-sigs/controller-tools/issues/1076
We didn’t have the toolchain statement in go.mod before this PR. Was it intentionally left out?
I have to admit, I still don't understand how the Go toolchain versioning interacts with dependencies. If Mockery update involves more than just bumping Mockery version, I wonder will the golangci-lint troubles #6718 need to be resolved too, before going forward with this?
- go 1.22.0
+ go 1.23
+
+ toolchain go1.23.2
Mockery v2.46.1 updated minimum language level to 1.23.
I think this is the sequence of events we're dealing with: Updating a dependency forces us to update the local toolchain/compiler version -> Updating the toolchain version requires a golangci-lint update -> Updating golangci-lint introduces new checks, which then cause the compilation to fail.
~I also wonder, what’s the point of us manually bumping GO_VERSION and BUILD_BASE_IMAGE now that Go will override it by downloading a version via the language level and toolchain statements?~ Edit: the image sets GOTOOLCHAIN=local so Go will not follow its automatic logic for toolchain selection docker-library/golang#472.
The Contour project currently lacks enough contributors to adequately respond to all PRs.
This bot triages PRs according to the following rules:
- After 14d of inactivity, lifecycle/stale is applied
- After 30d of inactivity since lifecycle/stale was applied, the PR is closed
You can:
- Ensure your PR is passing all CI checks. PRs that are fully green are more likely to be reviewed. If you are having trouble with CI checks, reach out to the #contour channel in the Kubernetes Slack workspace.
- Mark this PR as fresh by commenting or pushing a commit
- Close this PR
- Offer to help out with triage
Please send feedback to the #contour channel in the Kubernetes Slack
@dependabot rebase
Looks like this PR has been edited by someone other than Dependabot. That means Dependabot can't rebase it - sorry!
If you're happy for Dependabot to recreate it from scratch, overwriting any edits, you can request @dependabot recreate.
@dependabot recreate
@dependabot rebase
I bumped to the latest controller-tools but still no luck :( It seems we have something unique that no-one other has seen yet. It seems to crash when processing ContourConfiguration.Status.Conditions.Condition which is inlined type alias
https://github.com/projectcontour/contour/blob/cd2c7db1ae189877fcb92cccbadc0a85942bba0b/apis/projectcontour/v1/detailedconditions.go#L122
https://github.com/projectcontour/contour/blob/cd2c7db1ae189877fcb92cccbadc0a85942bba0b/apis/projectcontour/v1/detailedconditions.go#L42
So I thought to add that into controller-tools CRD test suite but I have not been able to get it crash yet. Must be something more intricate...
Must be something more intricate...
The intricacy is following:
- When running
go run sigs.k8s.io/controller-tools/cmd/controller-genit will use the default go1.23 setting (which isgotypesalias=1). - When running
go run sigs.k8s.io/controller-tools/cmd/[email protected]it will usegotypesalias=0that will hide the bug.
The two commands give different result, regardless of their version being pinned in go.mod. I think when explicitly giving the version @v0.16.5 go run will use the target projects go.mod versions. If not, it will use our versions.
When cloning controller-gen and running tests, the go.mod settings causes old gotypesalias=0 to be used. The bug can be reproduced in controller-gen if adding inline type alias to the test data and running generation with GODEBUG=gotypesalias=1.
Same problem concerns github.com/ahmetb/gen-crd-api-reference-docs, it also cannot handle inline type alias. The error comes from github.com/kubernetes/gengo which does have some fixes in main. It looked like the behavior is chosen by compiler version used in build, but so far I did not get it to work even if stepping up go version in gen-crd-api-reference-docs go.mod.
As a workaround for now I will set GODEBUG=gotypesalias=0 for the two tools.
I've submitted an issue https://github.com/kubernetes-sigs/controller-tools/issues/1088.
Codecov Report
All modified and coverable lines are covered by tests :white_check_mark:
Project coverage is 81.03%. Comparing base (
fdf434c) to head (ff36f1b). Report is 6 commits behind head on main.
Additional details and impacted files
@@ Coverage Diff @@
## main #6709 +/- ##
=======================================
Coverage 81.03% 81.03%
=======================================
Files 133 133
Lines 20006 20006
=======================================
Hits 16212 16212
Misses 3500 3500
Partials 294 294
A newer version of github.com/vektra/mockery/v2 exists, but since this PR has been edited by someone other than Dependabot I haven't updated it. You'll get a PR for the updated version as normal once this PR is merged.