Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 7 commits into from
Jun 12, 2024

Conversation

yannuil
Copy link
Contributor

@yannuil yannuil commented Jun 3, 2024

No description provided.

@openshift-ci openshift-ci bot added the size/L label Jun 3, 2024
@yannuil yannuil force-pushed the rebase-patches-2.6 branch 2 times, most recently from bc9f62b to 8f296b6 Compare June 3, 2024 13:11
@yannuil
Copy link
Contributor Author

yannuil commented Jun 4, 2024

/retest

Copy link
Member

@jewertow jewertow left a comment

Choose a reason for hiding this comment

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

OSSM-5556 was reverted: #964

@yannuil
Copy link
Contributor Author

yannuil commented Jun 4, 2024

@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
Copy link
Contributor Author

yannuil commented Jun 4, 2024

/retest

@jewertow
Copy link
Member

jewertow commented Jun 4, 2024

No, we do not want that change at all.

TagWatcher requires cluster-scoped permissions for MutatingWebhooks, so
we can't support it in multi-tenant mode. On the other hand, it can't be used
in cluster-wide mode as well, because TagWatcher watches
MutatingWebhooks and relies on istio.io/rev label, which is not
unique across control planes in OSSM. Additionally, TagWatcher causes
skipping Gateways which do not have istio.io/rev label while the control
plane is a revision different than "default".

Co-authored-by: Jacek Ewertowski <[email protected]>
Signed-off-by: Yann Liu <[email protected]>
@yannuil
Copy link
Contributor Author

yannuil commented Jun 5, 2024

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

jewertow and others added 5 commits June 5, 2024 16:58
* OSSM-6079: Pass --resync flag to federation registry

Signed-off-by: Jacek Ewertowski <[email protected]>

* Remove comments for defaultRetry

Signed-off-by: Jacek Ewertowski <[email protected]>

---------

Signed-off-by: Jacek Ewertowski <[email protected]>
…eeds 60KB (#49363) (maistra#950)

* samples: do not return request body as a header to avoid 431



* Typo fixes



---------

Signed-off-by: Jacek Ewertowski <[email protected]>
Co-authored-by: Jacek Ewertowski <[email protected]>
TestDiscovery is flaky, because weighted load balancing is not 100%
accurate and it often fails for 2 requests.

Signed-off-by: Jacek Ewertowski <[email protected]>
@eoinfennessy
Copy link
Member

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
Copy link
Contributor Author

yannuil commented Jun 6, 2024

/retest-required

Custom values can be set through pilot environment variables.

---------

Co-authored-by: Jonh Wendell <[email protected]>
@yannuil
Copy link
Contributor Author

yannuil commented Jun 6, 2024

/test maistra-istio-unit-2-6

3 similar comments
@eoinfennessy
Copy link
Member

/test maistra-istio-unit-2-6

@yannuil
Copy link
Contributor Author

yannuil commented Jun 7, 2024

/test maistra-istio-unit-2-6

@yannuil
Copy link
Contributor Author

yannuil commented Jun 7, 2024

/test maistra-istio-unit-2-6

Copy link

openshift-ci bot commented Jun 7, 2024

@yannuil: No presubmit jobs available for maistra/[email protected]

In response to this:

/test maistra-istio-unit-2-6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@yannuil
Copy link
Contributor Author

yannuil commented Jun 8, 2024

/test maistra-istio-unit-2-6

1 similar comment
@yannuil
Copy link
Contributor Author

yannuil commented Jun 10, 2024

/test maistra-istio-unit-2-6

@yannuil
Copy link
Contributor Author

yannuil commented Jun 10, 2024

/retest-required

@eoinfennessy
Copy link
Member

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

@yannuil yannuil added the tide/merge-method-rebase Denotes a PR that should be rebased by tide when it merges. label Jun 10, 2024
@jewertow
Copy link
Member

@eoinfennessy yes, we do.

@yannuil yannuil dismissed jewertow’s stale review June 12, 2024 12:16

Done as requested

@openshift-merge-bot openshift-merge-bot bot merged commit 1878937 into maistra:maistra-2.6 Jun 12, 2024
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
okay to merge size/L tide/merge-method-rebase Denotes a PR that should be rebased by tide when it merges.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants