Bump serving, Eventing deps to 1.3.0#1602
Conversation
| 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/operator v0.30.2 => knative.dev/operator v0.29.2 |
There was a problem hiding this comment.
This can be removed if we update the operator in another PR.
|
|
||
| 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 |
There was a problem hiding this comment.
The k8s.io replacements probably can be eliminated when we bump Eventing too.
There was a problem hiding this comment.
I'd rather bump every component dependencies in one go.
|
LGTM if CI passed. But... Actually I still don't know how this PR was created 😅 The README.md says:
But I cannot create the same change with this PR by Maybe SIG Release team knows how to create this PR? 😅 It would be great if we can find the docs for "How to Bump deps in S-O". |
| KN_VERSION="release-1.2" | ||
| KN_VERSION="release-1.3" | ||
| EVENTING_VERSION="release-v1.2" | ||
| EVENTING_KAFKA_VERSION="release-v1.2" | ||
| EVENTING_KAFKA_BROKER_VERSION="release-v1.2" | ||
| SERVING_VERSION="release-v1.2.0" | ||
| SERVING_VERSION="release-v1.3" |
There was a problem hiding this comment.
IMHO, dependencies should be bumped for every component together and we can remove replace directives.
There was a problem hiding this comment.
I am in favor of this but I think the last time we didnt want to do a big PR for all deps. In the past I did this in one PR. Let me try it anyway.
There was a problem hiding this comment.
That's how upstream works as well, every component is always aligned
There was a problem hiding this comment.
Yes as I mentioned I prefer that, I will bump Eventing too. I added the replacements so Eventing can do the rest of the bumping anyway, that's all.
|
@nak3 @pierDipi Reason is: this Serving PR knative/serving@4126928 updated K8s version on release-1.3 branch to v0.23.4 while on release-1.3 on knative.dev/pkg we are still on v0.22.5 https://github.com/knative/pkg/blob/a637a96a1bd980f099d76d07e7a965847114700e/go.mod#L46. This causes this failure. |
I'd fix/bump serving first |
Basically there is nothing to fix as Serving on release-1.3 uses the replacements anyway check bellow here: https://github.com/knative/serving/blob/ac292339e627fbc3f2acd3feefbdbd09350cc7e8/go.mod#L47-L50. So I dont think we can avoid them. I misread initially and tried to remove the replacements (thus the error) but I shouldn't. |
|
what's the reason for using a previous minor k8s version? |
I use whatever exists per brunch, each release branch is cut against a specific K8s version afaik. Eventing on release-1.3 should use the same no? It seems it does: https://github.com/knative/eventing/blob/release-1.3/go.mod#L42
Could you explain more? Here the plan for release-1.3 is to use |
|
I see, then with that commit in serving we won't get #1602 (comment) anymore, right? |
The replacements exist both upstream and downstream on release-1.3 branch for Serving eg. https://github.com/openshift/knative-serving/blob/release-v1.3/go.mod. But in S-O we have to use them again otherwise 0.23.4 is being picked up. makes that client-go error above to go away. |
|
So, in my opinion, this repository (ideally) shouldn't have any replace directive for transitive dependencies and just inherit whatever serving/eventing use that would simplify the deps bump on every release because we don't need to update the replace directive each time (and we did miss this step in a past release, so to avoid it at all we should keep this step simple). |
|
It seems wrong to me that to fix serving (or whatever other component) we're hacking this repository, that's why I'm saying let's align serving/eventing to whatever works here, that's cleaner because the fix is localized to a specific component. |
Serving upstream had to update stuff as a backport and then added these replacements directives due to that google auth package for good or bad. This makes S-O to pick up the wrong version sicne it has no knowledge of the replacement directives at the Serving side. However, I dont see why Serving/Eventing are not aligned here? Both use v0.22.5 on release-1.3. These are temporary replacements as I explained that will go away with release-1.4. |
Is serverless operator involved in that feature? afaik, that fix is only needed in the serving controller which isn't built from this repository, so I don't get why replace directives here should fix that issue. |
It does not fix that issue but S-O depends on Serving pkgs. Without the replacement directives and when we update deps to release-1.3 (go mod etc) will pick the version We get that error because although Eventing, Serving use 0.22.5 S-O gets an upgrade to 0.23.4. For some reason go does not see the replacement directives in Serving (expected probably) and enforces 0.23.4. In order to fix that one obvious way is to add the directives in S-O too. We are not fixing the registry issue in S-O. We are just fixing the incompatibility of K8s.io versions for S-O itself. |
pierDipi
left a comment
There was a problem hiding this comment.
Ok, thanks for sharing the details and for the bump!
/lgtm
/hold
/unhold if it's ready to go in.
|
[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 DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
@matzew any comment? Otherwise will unhold. |
|
It would be great to setup image mirroring in https://github.com/openshift/release/blob/master/core-services/image-mirroring/knative/mapping_knative_v1_3_quay |
Proposed Changes
For example several types moved to a base pkg etc.