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

[RELEASE-1.11] Sync with upstream release-1.11 #580

Merged
merged 10 commits into from
Jan 8, 2024
Merged

[RELEASE-1.11] Sync with upstream release-1.11 #580

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
f60eb32
[release-1.11] fix securityContext for Knative Service Pod (user-cont…
knative-prow-robot Sep 14, 2023
fb9129c
Leave a comment which will trigger a new dot release (#14500)
ReToCode Oct 11, 2023
4ff7168
[release-1.11] bump x/net to v0.17 (#14516)
nak3 Oct 12, 2023
012ee25
Bound buffer for reading stats (#14542)
knative-prow-robot Oct 19, 2023
7eb8b64
upgrade to latest dependencies (#14552)
knative-automation Oct 23, 2023
fccb991
Upgrade grpc for addressing GHSA-m425-mq94-257g (#14579)
jsanin-vmw Nov 1, 2023
dca40e4
remove duplicate 'additionalPrinterColumns' (#14654)
knative-prow-robot Nov 22, 2023
232d726
[release-1.11] Bump to fix #14732 (#14734)
dprotaso Dec 18, 2023
1e63968
Merge remote-tracking branch 'upstream/release-1.11' into sync-upstre…
ReToCode Jan 8, 2024
7adfffb
Sync with upstream release-1.11
ReToCode Jan 8, 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
10 changes: 0 additions & 10 deletions config/core/300-resources/domain-mapping.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,16 +263,6 @@ spec:
url:
description: URL is the URL of this DomainMapping.
type: string
additionalPrinterColumns:
- name: URL
type: string
jsonPath: .status.url
- name: Ready
type: string
jsonPath: ".status.conditions[?(@.type=='Ready')].status"
- name: Reason
type: string
jsonPath: ".status.conditions[?(@.type=='Ready')].reason"
names:
kind: DomainMapping
plural: domainmappings
Expand Down
7 changes: 4 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ module knative.dev/serving

// This comment was added so CI would trigger a point release with a
// newer version of Go
// Fixes: https://groups.google.com/g/golang-announce/c/iNNxDTCjZvo

// Fixes:
// - https://groups.google.com/g/golang-announce/c/iNNxDTCjZvo
// - https://github.com/knative/serving/issues/14732
go 1.18

require (
Expand All @@ -28,7 +29,7 @@ require (
golang.org/x/sync v0.2.0
golang.org/x/time v0.3.0
google.golang.org/api v0.124.0
google.golang.org/grpc v1.56.1
google.golang.org/grpc v1.56.3
k8s.io/api v0.26.5
k8s.io/apiextensions-apiserver v0.26.5
k8s.io/apimachinery v0.26.5
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -934,8 +934,8 @@ google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG
google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k=
google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
google.golang.org/grpc v1.56.1 h1:z0dNfjIl0VpaZ9iSVjA6daGatAYwPGstTjt5vkRMFkQ=
google.golang.org/grpc v1.56.1/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s=
google.golang.org/grpc v1.56.3 h1:8I4C0Yq1EjstUzUJzpcRVbuYA2mODtEmpWiQoN/b2nc=
google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
Expand Down
10 changes: 0 additions & 10 deletions openshift/release/artifacts/serving-core.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1892,16 +1892,6 @@ spec:
url:
description: URL is the URL of this DomainMapping.
type: string
additionalPrinterColumns:
- name: URL
type: string
jsonPath: .status.url
- name: Ready
type: string
jsonPath: ".status.conditions[?(@.type=='Ready')].status"
- name: Reason
type: string
jsonPath: ".status.conditions[?(@.type=='Ready')].reason"
names:
kind: DomainMapping
plural: domainmappings
Expand Down
10 changes: 0 additions & 10 deletions openshift/release/artifacts/serving-crds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1501,16 +1501,6 @@ spec:
url:
description: URL is the URL of this DomainMapping.
type: string
additionalPrinterColumns:
- name: URL
type: string
jsonPath: .status.url
- name: Ready
type: string
jsonPath: ".status.conditions[?(@.type=='Ready')].status"
- name: Reason
type: string
jsonPath: ".status.conditions[?(@.type=='Ready')].reason"
names:
kind: DomainMapping
plural: domainmappings
Expand Down
11 changes: 3 additions & 8 deletions vendor/google.golang.org/grpc/internal/transport/http2_server.go
View file
Open in desktop

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

69 changes: 48 additions & 21 deletions vendor/google.golang.org/grpc/server.go
View file
Open in desktop

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

29 changes: 25 additions & 4 deletions vendor/google.golang.org/grpc/status/status.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion vendor/google.golang.org/grpc/version.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,7 @@ google.golang.org/genproto/googleapis/api/httpbody
google.golang.org/genproto/googleapis/rpc/code
google.golang.org/genproto/googleapis/rpc/errdetails
google.golang.org/genproto/googleapis/rpc/status
# google.golang.org/grpc v1.56.1
# google.golang.org/grpc v1.56.3
## explicit; go 1.17
google.golang.org/grpc
google.golang.org/grpc/attributes
Expand Down
Loading