Skip to content

Bump serving, Eventing deps to 1.3.0 #1602

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

Merged
openshift-merge-robot merged 4 commits into from
Jun 7, 2022
Merged

Bump serving, Eventing deps to 1.3.0 #1602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5e5791f
deps
Jun 6, 2022
e489dc3
vendor
Jun 6, 2022
7f2a924
bump Eventing to release-1.3
Jun 6, 2022
e60cc53
vendor
Jun 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
66 changes: 35 additions & 31 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,27 +21,29 @@ require (
go.uber.org/zap v1.21.0
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
google.golang.org/grpc v1.45.0
k8s.io/api v0.22.5
k8s.io/apimachinery v0.22.5
k8s.io/client-go v0.22.5
knative.dev/eventing v0.29.1
knative.dev/eventing-kafka v0.29.1
k8s.io/api v0.23.4
k8s.io/apimachinery v0.23.4
k8s.io/client-go v0.23.4
knative.dev/eventing v0.30.3-0.20220420143529-0764365a1b4d
knative.dev/eventing-kafka v0.30.1-0.20220509122433-a5f80fcb248a
knative.dev/eventing-kafka-broker v0.0.0-00010101000000-000000000000
knative.dev/hack v0.0.0-20220224013837-e1785985d364
knative.dev/networking v0.0.0-20220120043934-ec785540a732
knative.dev/operator v0.29.2
knative.dev/pkg v0.0.0-20220223180940-4fcbc1bc12e8
knative.dev/serving v0.29.2
knative.dev/hack v0.0.0-20220314052818-c9c3ea17a2e9
knative.dev/networking v0.0.0-20220302134042-e8b2eb995165
knative.dev/operator v0.30.2
knative.dev/pkg v0.0.0-20220314170718-721abec0a377
knative.dev/serving v0.30.0
sigs.k8s.io/controller-runtime v0.9.7
)

require (
cloud.google.com/go/compute v1.5.0 // indirect
cloud.google.com/go/iam v0.3.0 // indirect
k8s.io/klog v1.0.0 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

require (
cloud.google.com/go v0.99.0 // indirect
cloud.google.com/go v0.100.2 // indirect
cloud.google.com/go/storage v1.18.2 // indirect
contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d // indirect
contrib.go.opencensus.io/exporter/prometheus v0.4.0 // indirect
Expand All @@ -58,15 +60,11 @@ require (
github.com/cloudevents/sdk-go/protocol/kafka_sarama/v2 v2.4.1 // indirect
github.com/cloudevents/sdk-go/sql/v2 v2.8.0 // indirect
github.com/cloudevents/sdk-go/v2 v2.8.0 // indirect
github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4 // indirect
github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/eapache/go-resiliency v1.2.0 // indirect
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
github.com/eapache/queue v1.1.0 // indirect
github.com/emicklei/go-restful v2.15.0+incompatible // indirect
github.com/envoyproxy/go-control-plane v0.10.1 // indirect
github.com/envoyproxy/protoc-gen-validate v0.6.2 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
Expand All @@ -83,7 +81,7 @@ require (
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/go-containerregistry v0.8.1-0.20220120151853-ac864e57b117 // indirect
github.com/google/go-containerregistry v0.8.1-0.20220414143355-892d7a808387 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/googleapis/gax-go/v2 v2.1.1 // indirect
Expand Down Expand Up @@ -141,13 +139,13 @@ require (
golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
golang.org/x/tools v0.1.8 // indirect
golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
golang.org/x/tools v0.1.9 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/api v0.63.0 // indirect
google.golang.org/api v0.70.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
google.golang.org/genproto v0.0.0-20220301145929-1ac2ace0dbf7 // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand All @@ -158,29 +156,35 @@ require (
k8s.io/component-base v0.22.5 // indirect
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
k8s.io/klog/v2 v2.40.1 // indirect
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 // indirect
knative.dev/caching v0.0.0-20220223181140-b3aed5c4e283 // indirect
knative.dev/reconciler-test v0.0.0-20220118183433-c8bfbe66bada
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf // indirect
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
knative.dev/caching v0.0.0-20220311005831-b2a3f59d7175 // indirect
knative.dev/reconciler-test v0.0.0-20220303141206-84821d26ed1f
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
)

replace (
// Knative forks.
knative.dev/eventing => github.com/openshift/knative-eventing v0.99.1-0.20220427101530-5a779a5c3f55
knative.dev/eventing-kafka => github.com/openshift-knative/eventing-kafka v0.19.1-0.20220427170443-321d4a2b113a
knative.dev/eventing-kafka-broker => github.com/openshift-knative/eventing-kafka-broker v0.25.1-0.20220422063503-04b2eff6d979
knative.dev/serving => github.com/openshift/knative-serving v0.10.1-0.20220421145848-cbcc812ef96f
knative.dev/eventing => github.com/openshift/knative-eventing v0.99.1-0.20220603105300-22ade8652ac1
knative.dev/eventing-kafka => github.com/openshift-knative/eventing-kafka v0.19.1-0.20220504141527-4852175c67a7
knative.dev/eventing-kafka-broker => github.com/openshift-knative/eventing-kafka-broker v0.25.1-0.20220531092543-6533810512a9
knative.dev/serving => github.com/openshift/knative-serving v0.10.1-0.20220603141301-7e612b35a9b3
)

replace (
// Adjustments to align transitive deps
github.com/go-logr/logr => github.com/go-logr/logr v0.4.0
github.com/go-logr/zapr => github.com/go-logr/zapr v0.4.0
github.com/manifestival/manifestival => github.com/manifestival/manifestival v0.7.0

k8s.io/api v0.23.4 => k8s.io/api v0.22.5
k8s.io/apimachinery v0.23.4 => k8s.io/apimachinery v0.22.5
k8s.io/client-go v0.23.4 => k8s.io/client-go v0.22.5
Copy link
Copy Markdown
Collaborator Author

@skonto skonto Jun 6, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The k8s.io replacements probably can be eliminated when we bump Eventing too.

Copy link
Copy Markdown
Member

@pierDipi pierDipi Jun 6, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd rather bump every component dependencies in one go.

k8s.io/klog/v2 => k8s.io/klog/v2 v2.8.0
)

replace knative.dev/hack => knative.dev/hack v0.0.0-20220118141833-9b2ed8471e30
replace knative.dev/operator v0.30.2 => knative.dev/operator v0.29.2

replace knative.dev/pkg => knative.dev/pkg v0.0.0-20220314165618-a637a96a1bd9

replace knative.dev/pkg => knative.dev/pkg v0.0.0-20220222214439-083dd97300e1
replace knative.dev/hack => knative.dev/hack v0.0.0-20220224013837-e1785985d364
Loading