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.

Sign up for GitHub

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

Jump to bottom

chore: Update indirect dependency to knative.dev/serving v0.37.5 #468

Merged
merged 10 commits into from
Jan 25, 2024
Merged

chore: Update indirect dependency to knative.dev/serving v0.37.5 #468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
02fb831
chore: Update indirect dependency to knative.dev/serving v0.39.0
ckadner Dec 30, 2023
a53d842
ignore "undeclared name" linting errors for fvt . imports
ckadner Dec 30, 2023
cb414cc
Merge branch 'main' into update_knative_serving
ckadner Jan 24, 2024
d568554
update deps post Go 1.20 upgrade
ckadner Jan 24, 2024
6f78794
ignore typecheck error "undefined" for .dot imports inside fvt/ package
ckadner Jan 24, 2024
bce973f
pin down k8s api and go-client to v0.26.4
ckadner Jan 24, 2024
6006857
show git diff after failed lint only during CI
ckadner Jan 24, 2024
e18c46f
go proxy gone
ckadner Jan 25, 2024
b842d50
use knative.dev/serving v0.39.3 (up from v0.39.0)
ckadner Jan 25, 2024
007009d
update to knative.dev/serving v0.37.5
ckadner Jan 25, 2024
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
6 changes: 6 additions & 0 deletions .golangci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,12 @@ issues:
- lll
source: "^//go:generate "

# Exclude typecheck "undeclared name"/"undefined" errors for . imports in fvt package
- linters:
- typecheck
text: "undefined: "
path: fvt/

# Independent of option `exclude` we use default exclude patterns,
# it can be disabled by this option. To list all
# excluded by default patterns execute `golangci-lint run --help`.
Expand Down
8 changes: 6 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,13 @@ require (
k8s.io/api v0.26.4
k8s.io/apimachinery v0.26.4
k8s.io/client-go v0.26.4
knative.dev/pkg v0.0.0-20230502134655-db8a35330281
knative.dev/pkg v0.0.0-20231023160942-0c39ce4b3a7f
sigs.k8s.io/controller-runtime v0.14.6
sigs.k8s.io/yaml v1.3.0
)

// when adding/remove replace, remove the following block of indirect dependencies
// and run `go mod tidy -compat=1.20` (based on go version above)
require (
cloud.google.com/go v0.110.2 // indirect
cloud.google.com/go/compute v1.19.3 // indirect
Expand Down Expand Up @@ -121,7 +123,7 @@ require (
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230515203736-54b630e78af5 // indirect
k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect
knative.dev/networking v0.0.0-20230511122402-33636d99d870 // indirect
knative.dev/networking v0.0.0-20231012063223-0b0f2107abef // indirect
knative.dev/serving v0.37.1 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
Expand All @@ -140,4 +142,6 @@ replace (
// Fixes github.com/elazarl/goproxy Denial of Service (DoS)
// This dependency was removed from apimachinery 0.27.0
k8s.io/apimachinery => k8s.io/apimachinery v0.27.0
ckadner marked this conversation as resolved.
Show resolved Hide resolved
// Fixes CVE-2023-48713
knative.dev/serving => knative.dev/serving v0.37.5
)
12 changes: 6 additions & 6 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1168,12 +1168,12 @@ k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
k8s.io/utils v0.0.0-20230505201702-9f6742963106 h1:EObNQ3TW2D+WptiYXlApGNLVy0zm/JIBVY9i+M4wpAU=
k8s.io/utils v0.0.0-20230505201702-9f6742963106/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
knative.dev/networking v0.0.0-20230511122402-33636d99d870 h1:OmpaXjgdpF6GNW5S6OV6JN19gbiDCzfkEQQb9TQp9gU=
knative.dev/networking v0.0.0-20230511122402-33636d99d870/go.mod h1:OG9AEepHd3dofzrkzb0IelqN5uzu10RjbSdhl5UruSE=
knative.dev/pkg v0.0.0-20230502134655-db8a35330281 h1:9mN8O5XO68DKlkzEhFAShUx+O/I+TQR71vmTvYt8oF4=
knative.dev/pkg v0.0.0-20230502134655-db8a35330281/go.mod h1:2qWPP9Gjh9Q7ETti+WRHnBnGCSCq+6q7m3p/nmUQviE=
knative.dev/serving v0.37.1 h1:msn1sJ9yVBVWu/5slqkpSXXqCEQRIysHR+fKMO4EXlI=
knative.dev/serving v0.37.1/go.mod h1:v0Xbfp7olb0Gljm5l4qNuLsIf8/2p1rIt/mphxvx1z0=
knative.dev/networking v0.0.0-20231012063223-0b0f2107abef h1:FSEKaGc2ztb65VPn4EiTsjAFsmmHlYHUq+j+CCPlDtU=
knative.dev/networking v0.0.0-20231012063223-0b0f2107abef/go.mod h1:rMVkShVT/14rtscYC4ZfC0hXghOXqj3EheFUDKYEqns=
knative.dev/pkg v0.0.0-20231023160942-0c39ce4b3a7f h1:XCH1qZqW1riR8cjhMGjewxQXlWPrfgxeUorBjpC6lE4=
knative.dev/pkg v0.0.0-20231023160942-0c39ce4b3a7f/go.mod h1:ZRgzFBFmdBsARm6+Pkr9WRG8bXys8rYq64ELfLG6+9w=
knative.dev/serving v0.37.5 h1:Xp1fvIk8oZkSoGvxv5mEhb3sQyXLK36LMQoEmqLQu8Y=
knative.dev/serving v0.37.5/go.mod h1:d6Db021vtcIDy66H8aT0BWlbpto2Wd/rAXNtdHGyIyM=
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
10 changes: 5 additions & 5 deletions scripts/fmt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ elif [ "$RETURN_CODE" -ne 0 ]; then
fi
if [ "${CI}" != "true" ]; then
echoError 'Pre-commit linter failed, but it may have automatically formatted your files.'
echoError 'Check your changed files and/or manually fix the errors above then stage and commit.'
echoError 'Check your changed files and/or manually fix the errors above.'
else
echoError "This test failed because your code isn't formatted and linted correctly."
echoError 'To format and check the linter locally, run `make fmt`. It will appear to'
echoError 'fail, but may automatically format some files. Stage the changed files and'
echoError 'manually correct any other issues before committing and building again.'
echoError 'To format and check the linter locally, run `make fmt` or `make run fmt`.'
echoError 'It will appear to fail, but may automatically format some files.'
echoError 'Manually correct any other issues before committing and building again.'
git diff -R --ws-error-highlight=all --color --exit-code
fi
git diff -R --ws-error-highlight=all --color --exit-code
fi

exit $RETURN_CODE
Loading