search

maistra / istio

Apache License 2.0
94 stars 92 forks source link

[maistra-2.6] Rebase commits between 2.5.0 and 2.5.2 #1016

Closed yannuil closed 2 months ago

yannuil commented 3 months ago

/retest

yannuil commented 3 months ago

@jewertow as you suggest in the reverted commit, we don't want to include the fix in the Z-stream. This is a Y-stream. Should we include it?

yannuil commented 3 months ago

/retest

jewertow commented 3 months ago

No, we do not want that change at all.

yannuil commented 3 months ago

I have dropped a commit to resolve the conflict with #1002. The commit was picked from istio/istio#48056, which includes some changes on pilot/pkg/config/kube/gateway/conditions.go. Do we need to incorporate them as well? @jewertow @eoinfennessy

eoinfennessy commented 3 months ago

I have dropped a commit to resolve the conflict with #1002. The commit was picked from istio/istio#48056, which includes some changes on pilot/pkg/config/kube/gateway/conditions.go. Do we need to incorporate them as well?

Yes, I think we should incorporate the changes in conditions.go. You may be able to use the controllerName variable defined in model.go.

yannuil commented 3 months ago

/retest-required

yannuil commented 3 months ago

/test maistra-istio-unit-2-6

eoinfennessy commented 3 months ago

/test maistra-istio-unit-2-6

yannuil commented 3 months ago

/test maistra-istio-unit-2-6

yannuil commented 3 months ago

/test maistra-istio-unit-2-6

openshift-ci[bot] commented 3 months ago

@yannuil: No presubmit jobs available for maistra/istio@maistra-2.6

In response to [this](https://github.com/maistra/istio/pull/1016#issuecomment-2155292138): >/test maistra-istio-unit-2-6 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
yannuil commented 3 months ago

/test maistra-istio-unit-2-6

yannuil commented 2 months ago

/test maistra-istio-unit-2-6

yannuil commented 2 months ago

/retest-required

eoinfennessy commented 2 months ago

Do we want tide/merge-method-rebase on this PR?

jewertow commented 2 months ago

@eoinfennessy yes, we do.