Skip to content

Bump Serving, Eventing to 1.4 for 1.25 #1652

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
Jul 22, 2022
Merged

Bump Serving, Eventing to 1.4 for 1.25 #1652

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
35a48d4
deps
Jul 20, 2022
14ff7c3
vendor
Jul 20, 2022
5b56014
make generated-files
Jul 20, 2022
cc6cd37
fetch fix for eventing kafka broker
Jul 21, 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
  •  
  •  
  •  
52 changes: 25 additions & 27 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ 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.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
k8s.io/api v0.23.5
k8s.io/apimachinery v0.23.5
k8s.io/client-go v0.23.5
knative.dev/eventing v0.32.0
knative.dev/eventing-kafka v0.32.0
knative.dev/eventing-kafka-broker v0.0.0-00010101000000-000000000000
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/hack v0.0.0-20220524153203-12d3e2a7addc
knative.dev/networking v0.0.0-20220412163509-1145ec58c8be
knative.dev/operator v0.31.2
knative.dev/pkg v0.0.0-20220524202603-19adf798efb8
knative.dev/serving v0.30.0
sigs.k8s.io/controller-runtime v0.9.7
)
Expand All @@ -39,6 +39,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/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

Expand Down Expand Up @@ -150,25 +151,25 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
k8s.io/apiextensions-apiserver v0.22.5 // indirect
k8s.io/apiserver v0.22.5 // indirect
k8s.io/code-generator v0.22.5 // indirect
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/apiextensions-apiserver v0.23.4 // indirect
k8s.io/apiserver v0.23.4 // indirect
k8s.io/code-generator v0.23.5 // indirect
k8s.io/component-base v0.23.4 // indirect
k8s.io/gengo v0.0.0-20220307231824-4627b89bbf1b // indirect
k8s.io/klog/v2 v2.60.1-0.20220317184644-43cc75f9ae89 // 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
knative.dev/caching v0.0.0-20220412163508-8b5c244b8182 // indirect
knative.dev/reconciler-test v0.0.0-20220524205904-f750f80bfc7e
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.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
knative.dev/eventing => github.com/openshift/knative-eventing v0.99.1-0.20220712171311-f13c06f7b804
knative.dev/eventing-kafka => github.com/openshift-knative/eventing-kafka v0.19.1-0.20220504141528-c59955f23883
knative.dev/eventing-kafka-broker => github.com/openshift-knative/eventing-kafka-broker v0.25.1-0.20220721145144-249d203ec40e
knative.dev/serving => github.com/openshift/knative-serving v0.10.1-0.20220714144541-e80a125a2867
)

replace (
Expand All @@ -177,14 +178,11 @@ replace (
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
Copy link
Copy Markdown
Collaborator Author

@skonto skonto Jul 20, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Keeping the replacements here:

	k8s.io/api v0.23.5 => k8s.io/api v0.22.5
	k8s.io/apimachinery v0.23.5 => k8s.io/apimachinery v0.22.5
	k8s.io/client-go v0.23.5 => k8s.io/client-go v0.22.5

causes k8s.io/* to be updated to v0.24.3. 0.22.5 does not have those apis. 🤷
Here is what happens:

$ ./hack/update-deps.sh 
go: finding module for package k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta2
go: finding module for package k8s.io/api/flowcontrol/v1beta2
go: finding module for package k8s.io/client-go/applyconfigurations/autoscaling/v2
go: finding module for package k8s.io/api/autoscaling/v2
go: finding module for package k8s.io/client-go/kubernetes/typed/autoscaling/v2
go: finding module for package k8s.io/client-go/applyconfigurations/flowcontrol/v1beta2
go: found k8s.io/api/autoscaling/v2 in k8s.io/api v0.24.3
go: found k8s.io/api/flowcontrol/v1beta2 in k8s.io/api v0.24.3
go: found k8s.io/client-go/applyconfigurations/autoscaling/v2 in k8s.io/client-go v0.24.3
go: found k8s.io/client-go/applyconfigurations/flowcontrol/v1beta2 in k8s.io/client-go v0.24.3
go: found k8s.io/client-go/kubernetes/typed/autoscaling/v2 in k8s.io/client-go v0.24.3
go: found k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta2 in k8s.io/client-go v0.24.3

If we try to go back to 0.22.5 from 0.24.3 then:

github.com/openshift-knative/serverless-operator/openshift-knative-operator/pkg/eventing imports
knative.dev/pkg/client/injection/kube/client imports
	k8s.io/api/autoscaling/v2: module k8s.io/api@latest found (v0.24.3, replaced by k8s.io/api@v0.22.5), but does not contain package k8s.io/api/autoscaling/v2

0.23.5 is for bumping. However not sure if 0.23.5 is ok for OCP 4.6. It should be given the APIs we use. /cc @mgencur

This didnt come up before because knative.dev/pkg updated its generated clients on 1.4 (although the apis existed in go-client version 0.23.4) :
Compare for example for autoscalingv2
https://github.com/knative/pkg/blob/release-1.3/client/injection/kube/client/client.go#L37
vs
https://github.com/knative/pkg/blob/release-1.4/client/injection/kube/client/client.go#L38

So we didnt have the new APIs in 1.3.

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
k8s.io/klog/v2 => k8s.io/klog/v2 v2.8.0
)

replace knative.dev/operator v0.30.2 => knative.dev/operator v0.29.2
replace knative.dev/operator v0.31.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-20220412134708-e325df66cb51

replace knative.dev/hack => knative.dev/hack v0.0.0-20220224013837-e1785985d364
replace knative.dev/hack => knative.dev/hack v0.0.0-20220629135029-9e09abcd61f0
100 changes: 52 additions & 48 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion hack/patches/005-k8s-min.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ index 3cbd846ea..81b1ba46a 100644
// NOTE: If you are changing this line, please also update the minimum kubernetes
// version listed here:
// https://github.com/knative/docs/blob/mkdocs/docs/snippets/prerequisites.md
- defaultMinimumVersion = "v1.21.0"
- defaultMinimumVersion = "v1.22.0"
+ defaultMinimumVersion = "v1.19.0"
)

Expand Down
10 changes: 5 additions & 5 deletions hack/update-deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ set -o pipefail
cd "${ROOT_DIR}"

# This controls the knative release version we track.
KN_VERSION="release-1.3"
EVENTING_VERSION="release-v1.3"
EVENTING_KAFKA_VERSION="release-v1.3"
EVENTING_KAFKA_BROKER_VERSION="release-v1.3"
SERVING_VERSION="release-v1.3"
KN_VERSION="release-1.4"
EVENTING_VERSION="release-v1.4"
EVENTING_KAFKA_VERSION="release-v1.4"
EVENTING_KAFKA_BROKER_VERSION="release-v1.4"
SERVING_VERSION="release-v1.4"

# The list of dependencies that we track at HEAD and periodically
# float forward in this repository.
Expand Down
37 changes: 28 additions & 9 deletions pkg/client/clientset/versioned/clientset.go
View file
Open in desktop

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

20 changes: 19 additions & 1 deletion pkg/client/clientset/versioned/typed/config/v1/config_client.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 pkg/client/clientset/versioned/typed/config/v1/fake/fake_apiserver.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 pkg/client/clientset/versioned/typed/config/v1/fake/fake_authentication.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 pkg/client/clientset/versioned/typed/config/v1/fake/fake_build.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 pkg/client/clientset/versioned/typed/config/v1/fake/fake_clusteroperator.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 pkg/client/clientset/versioned/typed/config/v1/fake/fake_clusterversion.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 pkg/client/clientset/versioned/typed/config/v1/fake/fake_console.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 pkg/client/clientset/versioned/typed/config/v1/fake/fake_dns.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 pkg/client/clientset/versioned/typed/config/v1/fake/fake_featuregate.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 pkg/client/clientset/versioned/typed/config/v1/fake/fake_image.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 pkg/client/clientset/versioned/typed/config/v1/fake/fake_infrastructure.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 pkg/client/clientset/versioned/typed/config/v1/fake/fake_ingress.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 pkg/client/clientset/versioned/typed/config/v1/fake/fake_network.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 pkg/client/clientset/versioned/typed/config/v1/fake/fake_oauth.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 pkg/client/clientset/versioned/typed/config/v1/fake/fake_operatorhub.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 pkg/client/clientset/versioned/typed/config/v1/fake/fake_project.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 pkg/client/clientset/versioned/typed/config/v1/fake/fake_proxy.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 pkg/client/clientset/versioned/typed/config/v1/fake/fake_scheduler.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 pkg/client/clientset/versioned/typed/route/v1/fake/fake_route.go
View file
Open in desktop

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

Loading