[release-1.9] Revert "Change subscription patch logic to ensure resource version (#6670) #6725
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…native#6670)" This reverts commit 4d6e1fc.
knative-prow
bot
added
approved
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: matzew, pierDipi The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/test upgrade-tests |
pierDipi
added a commit
to pierDipi/eventing
that referenced
this pull request
May 17, 2023
…rce version (knative#6670) (knative#6725) This reverts commit knative@4d6e1fc. It has the side effect of dropping channel spec fields, so even immutable fields are dropped, hence channels will fail to get updated. We need to re-evalute the approach to fix the orginal issue: knative#6636, patch will always have edge cases that will lead the original bug because subscriptions are reconciled independently from each other (and potentially by multiple controller replicas), so update is the only way of having concurrency control at the resource level but we should make sure that we're preserving unknown fields when updating channelables.
openshift-merge-robot
pushed a commit
to openshift-knative/eventing
that referenced
this pull request
May 17, 2023
* [release-1.9] Format Go code (knative#6706) This is an automated cherry-pick of knative#6702 Signed-off-by: Knative Automation <automation@knative.team> Co-authored-by: Knative Automation <automation@knative.team> * [release-1.9] Revert "Change subscription patch logic to ensure resource version (knative#6670) (knative#6725) This reverts commit knative@4d6e1fc. It has the side effect of dropping channel spec fields, so even immutable fields are dropped, hence channels will fail to get updated. We need to re-evalute the approach to fix the orginal issue: knative#6636, patch will always have edge cases that will lead the original bug because subscriptions are reconciled independently from each other (and potentially by multiple controller replicas), so update is the only way of having concurrency control at the resource level but we should make sure that we're preserving unknown fields when updating channelables. * [release-1.9] Scheduler doesn't reschedule vpods that are scheduled on unscehdulable pods (knative#6730) This is an automated cherry-pick of knative#6726 Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com> Co-authored-by: Pierangelo Di Pilato <pierdipi@redhat.com> * [release-1.9] Improve scheduler logging for state and pending vpods (knative#6734) This is an automated cherry-pick of knative#6729 Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com> Co-authored-by: Pierangelo Di Pilato <pierdipi@redhat.com> * [release-1.9] Add function to check if a broker resource is `NotReady` (knative#6738) This is an automated cherry-pick of knative#6737 Signed-off-by: Christoph Stäbler <cstabler@redhat.com> Co-authored-by: Christoph Stäbler <cstabler@redhat.com> * [release-1.9] Extract scheduler config in a dedicate struct instead of many parameters (knative#6740) This is an automated cherry-pick of knative#6736 Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com> Co-authored-by: Pierangelo Di Pilato <pierdipi@redhat.com> * [release-1.9] Exclusive access to tracing flag for upgrade prober (knative#6768) This is an automated cherry-pick of knative#6767 ```release-note ``` Co-authored-by: Martin Gencur <mgencur@redhat.com> * [release-1.9] Upgrade to latest dependencies (knative#6775) bumping pkg -dprotaso /cc knative/eventing-writers /assign knative/eventing-writers Produced by: knative-sandbox/knobots/actions/update-deps Signed-off-by: Knative Automation <automation@knative.team> --------- Signed-off-by: Knative Automation <automation@knative.team> Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com> Signed-off-by: Christoph Stäbler <cstabler@redhat.com> Co-authored-by: Knative Prow Robot <knative-prow-robot@google.com> Co-authored-by: Knative Automation <automation@knative.team> Co-authored-by: Christoph Stäbler <cstabler@redhat.com> Co-authored-by: Martin Gencur <mgencur@redhat.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This reverts commit 4d6e1fc.
It has the side effect of dropping channel spec fields, so even immutable
fields are dropped, hence channels will fail to get updated.
We need to re-evalute the approach to fix the orginal issue:
#6636, patch will always
have edge cases that will lead the original bug because subscriptions
are reconciled independently from each other (and potentially by
multiple controller replicas), so update is the only way of having
concurrency control at the resource level but we should make sure
that we're preserving unknown fields when updating channelables.