Skip to content

Bump Serving, Eventing to 1.4 for 1.25#1652

Merged
openshift-merge-robot merged 4 commits into
openshift-knative:mainfrom
skonto:bump_components_to_1.4
Jul 22, 2022
Merged

Bump Serving, Eventing to 1.4 for 1.25#1652
openshift-merge-robot merged 4 commits into
openshift-knative:mainfrom
skonto:bump_components_to_1.4

Conversation

@skonto
Copy link
Copy Markdown
Collaborator

@skonto skonto commented Jul 20, 2022

Proposed Changes

@openshift-ci openshift-ci Bot requested review from lberk and pierDipi July 20, 2022 15:39
@skonto skonto requested review from mgencur and nak3 and removed request for lberk July 20, 2022 15:39
Comment thread go.mod
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

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.

@skonto skonto changed the title [wip] Bump components to 1.4 for 1.25 [wip] Bump Serving, Eventing to 1.4 for 1.25 Jul 20, 2022
@skonto
Copy link
Copy Markdown
Collaborator Author

skonto commented Jul 21, 2022

/retest

@skonto
Copy link
Copy Markdown
Collaborator Author

skonto commented Jul 21, 2022

It keeps coming up.

kafka-storage-version-migrator
    postupgrade.go:102: jobs.batch "knative-kafka-storage-version-migrator" not found 
        job:
         {"metadata":{"creationTimestamp":null},"spec":{"template":{"metadata":{"creationTimestamp":null},"spec":{"containers":null}}},"status":{}}

The job exists but the name has now a suffix knative-kafka-storage-version-migrator-1.24.0 and the post upgrade test only checks for knative-kafka-storage-version-migrator. /cc @pierDipi Any idea what is wrong here and why it did pass before?
I see in other runs this being skipped.

@pierDipi pierDipi mentioned this pull request Jul 21, 2022
@pierDipi
Copy link
Copy Markdown
Member

pierDipi commented Jul 21, 2022

testing this potential fix #1654

@skonto
Copy link
Copy Markdown
Collaborator Author

skonto commented Jul 21, 2022

@pierDipi In PR #1648 for example the test was skipped.
Another run from the job history here.
So probably we missed the issue for quite some time?

PASS test/upgrade

=== Skipped
=== SKIP: test/upgrade TestServerlessUpgrade/PostUpgradeTests/BrokerPostUpgradeTest/Verify_post-install (0.00s)
postupgrade.go:64: SO uses different names
--- SKIP: TestServerlessUpgrade/PostUpgradeTests/BrokerPostUpgradeTest/Verify_post-install (0.00s)

=== SKIP: test/upgrade TestServerlessUpgrade/PostUpgradeTests/SinkPostUpgradeTest/Verify_post-install (0.00s)
postupgrade.go:64: SO uses different names
--- SKIP: TestServerlessUpgrade/PostUpgradeTests/SinkPostUpgradeTest/Verify_post-install (0.00s)

Do we test against the full name of the kafka broker job name?

@pierDipi
Copy link
Copy Markdown
Member

Ah, you're right, we miss a patch in eventing-kafka-broker v1.4

@skonto
Copy link
Copy Markdown
Collaborator Author

skonto commented Jul 21, 2022

@pierDipi pls let me know when the patch lands there so I can re-fetch the dep and try again ok?

@skonto
Copy link
Copy Markdown
Collaborator Author

skonto commented Jul 22, 2022

/retest

1 similar comment
@skonto
Copy link
Copy Markdown
Collaborator Author

skonto commented Jul 22, 2022

/retest

Copy link
Copy Markdown
Member

@pierDipi pierDipi left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jul 22, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pierDipi, skonto

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@skonto
Copy link
Copy Markdown
Collaborator Author

skonto commented Jul 22, 2022

/hold for testing 4.6 locally first.

@skonto skonto changed the title [wip] Bump Serving, Eventing to 1.4 for 1.25 Bump Serving, Eventing to 1.4 for 1.25 Jul 22, 2022
@skonto
Copy link
Copy Markdown
Collaborator Author

skonto commented Jul 22, 2022

Tested a bit on 4.6.x, some results here.
Didn't notice anything related to the k8s api update, will also verify via the 4.6 periodic jobs.
/unhold

@openshift-merge-robot openshift-merge-robot merged commit cddfbd4 into openshift-knative:main Jul 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants