[release-4.18] nrt: log: return updated generation value for cache #301
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: shajmakh The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
shajmakh
force-pushed
the
update-release-4.18-20250521
branch
from
d520f0c to
9448d3f
Compare
|
/hold I'm not sure the backport is fine - this is on me for unclear instructions |
openshift-ci
bot
added
the
do-not-merge/hold
| @@ -101,17 +101,16 @@ func NewOverReserve(ctx context.Context, lh logr.Logger, cfg *apiconfig.NodeReso | |||
| func (ov *OverReserve) GetCachedNRTCopy(ctx context.Context, nodeName string, pod *corev1.Pod) (*topologyv1alpha2.NodeResourceTopology, CachedNRTInfo) { | |||
There was a problem hiding this comment.
this is a u/s commit right? if so why it has the [KNI] prefix? https://github.com/openshift-kni/scheduler-plugins/blob/master/RESYNC.md#patching-openshift-kni-specific-commits this is not a d/s specific change (e.g a change which u/s cannot accept or don't care about)
There was a problem hiding this comment.
you are right, I think the verify-commits could use some enhancement to pass on cherry-picks that were authored by the same member. I'll check that.
There was a problem hiding this comment.
totally, but is not so easy to implement so this is why it keeps getting deferred. I think you can pass the check by adding a top-level commit updating our RESYNC.log.md. That commit will have the [KNI] prefix so it can pass the checks (and is not wrong either). See: 780ea84
There was a problem hiding this comment.
unfortunatly that didn't work, we have to either update each cherry-picked commit or skip the check completely like we do for resyncs:
#357
There was a problem hiding this comment.
ok, let's check what we did in the past
shajmakh
force-pushed
the
update-release-4.18-20250521
branch
4 times, most recently
from
aabd89a to
049ebc3
Compare
nrt: log: return updated generation value for cache
track upstream sync by updating the cherrypicked commits in RESYNC.log.md. Signed-off-by: Shereen Haj <[email protected]>
cherry-picked from u/s. please check the commits details.