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.

Sign up for GitHub

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

Jump to bottom

[2.6] Rebase IOR #983

Merged
merged 3 commits into from
May 31, 2024
Merged

[2.6] Rebase IOR #983

merged 3 commits into from
May 31, 2024

Conversation

yannuil
Copy link
Contributor

@yannuil yannuil commented Apr 15, 2024

No description provided.

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Apr 15, 2024

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Apr 15, 2024

@yannuil: The /test command needs one or more targets.
The following commands are available to trigger required jobs:

  • /test integ-helm-2-6
  • /test integ-pilot-2-6
  • /test integ-security-2-6
  • /test integ-servicemesh-2-6
  • /test integ-servicemesh-multicluster-2-6
  • /test integ-telemetry-2-6
  • /test maistra-istio-gencheck-2-6
  • /test maistra-istio-lint-2-6
  • /test maistra-istio-unit-2-6
  • /test push-images

Use /test all to run the following jobs that were automatically triggered:

  • pull-ci-maistra-istio-maistra-2.6-integ-helm-2-6
  • pull-ci-maistra-istio-maistra-2.6-integ-pilot-2-6
  • pull-ci-maistra-istio-maistra-2.6-integ-security-2-6
  • pull-ci-maistra-istio-maistra-2.6-integ-servicemesh-2-6
  • pull-ci-maistra-istio-maistra-2.6-integ-servicemesh-multicluster-2-6
  • pull-ci-maistra-istio-maistra-2.6-integ-telemetry-2-6
  • pull-ci-maistra-istio-maistra-2.6-maistra-istio-gencheck-2-6
  • pull-ci-maistra-istio-maistra-2.6-maistra-istio-lint-2-6
  • pull-ci-maistra-istio-maistra-2.6-maistra-istio-unit-2-6

In response to this:

/test

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/test-infra repository.

@yannuil
Copy link
Contributor Author

yannuil commented Apr 15, 2024

/test all

@jewertow
Copy link
Member

@yannuil please remember about including #980.

@yannuil
Copy link
Contributor Author

yannuil commented Apr 23, 2024

/test all

@yannuil yannuil marked this pull request as ready for review May 28, 2024 09:48
@yannuil @jewertow
@luksa @jwendell @brian-avery
Add IOR
2b8f93b 
commit 466ae69
Author: Yang Liu <[email protected]>
Date:   Thu Mar 23 04:22:40 2023 +0800

    OSSM-1689 Simplify IOR (maistra#747)

    * Rework IOR initialization

    Signed-off-by: Yann Liu <[email protected]>

    * Remove `initialSync`

    `initialSync` is not needed.

    - During boostrap, `SetNamesapces`is always called with no namespaces.
    - When removing or adding a namespace, the underlaying informer will
      trigger an `ADD` event for all resources the informer watches

    Signed-off-by: Yann Liu <[email protected]>

    * DIsable TestPref

    Signed-off-by: Yann Liu <[email protected]>

    * Rename

    Signed-off-by: Yann Liu <[email protected]>

    * Call `findService` once for each gateway

    Signed-off-by: Yann Liu <[email protected]>

    * Use original host to generate Route name

    Signed-off-by: Yann Liu <[email protected]>

    * Skip duplicate update test

    Signed-off-by: Yann Liu <[email protected]>

    * Improve concurrency test

    Signed-off-by: Yann Liu <[email protected]>

    * Introduce update Route on Gateway update

    Signed-off-by: Yann Liu <[email protected]>

    * Fix data race

    Signed-off-by: Yann Liu <[email protected]>

    * Format and lint

    Signed-off-by: Yann Liu <[email protected]>

    * Respect log level

    Signed-off-by: Yann Liu <[email protected]>

    * Refactor IOR

    - `gatawayMap` is removed. `Routes` are retrived via API.
    -  `reconcileGateway` is used to achieve the desired state.
    - `processEvent` will only process the latest and try to abort early.

    Signed-off-by: Yann Liu <[email protected]>

    * Remove unused functions

    Signed-off-by: Yann Liu <[email protected]>

    * Use `Lister` for finding target service

    Signed-off-by: Yann Liu <[email protected]>

    * Start IOR before kube client

    Signed-off-by: Yann Liu <[email protected]>

    * Remove unused properties

    Signed-off-by: Yann Liu <[email protected]>

    * Rework test initialization

    Signed-off-by: Yann Liu <[email protected]>

    * Log correct debug information

    Signed-off-by: Yann Liu <[email protected]>

    * Remove unnecessary parameters

    Signed-off-by: Yann Liu <[email protected]>

    * Remove ResourceVersion usage

    Signed-off-by: Yann Liu <[email protected]>

    * Avoid deletion of a route when failing to update

    Signed-off-by: Yann Liu <[email protected]>

    * Update FakeRouter to record API call counts

    Signed-off-by: Yann Liu <[email protected]>

    * Rework initialization

    Signed-off-by: Yann Liu <[email protected]>

    * Keep startup process order consistent

    Signed-off-by: Yann Liu <[email protected]>

    * Fix creating matching service

    Signed-off-by: Yann Liu <[email protected]>

    * Test IOR to be idempotent

    Signed-off-by: Yann Liu <[email protected]>

    * Remove unused parameters

    Signed-off-by: Yann Liu <[email protected]>

    * Rename symbol

    Signed-off-by: Yann Liu <[email protected]>

    * Remove used struct

    Signed-off-by: Yann Liu <[email protected]>

    * Improve styling and wording

    Signed-off-by: Yann Liu <[email protected]>

    * Add support list across namespaces in faker

    Signed-off-by: Yann Liu <[email protected]>

    * Lint and format

    Signed-off-by: Yann Liu <[email protected]>

    * Introduce Openshift Route informer

    Signed-off-by: Yann Liu <[email protected]>

    * Lint

    Signed-off-by: Yann Liu <[email protected]>

    * Run make gen

    Signed-off-by: Yann Liu <[email protected]>

    * Fix data race

    Signed-off-by: Yann Liu <[email protected]>

    * Fix test data race

    Signed-off-by: Yann Liu <[email protected]>

    * Lint

    Signed-off-by: Yann Liu <[email protected]>

    * Rename variables

    Signed-off-by: Yann Liu <[email protected]>

    * Fix update route

    Signed-off-by: Yann Liu <[email protected]>

    * Linit

    Signed-off-by: Yann Liu <[email protected]>

    * Increase wait for the delete

    Signed-off-by: Yann Liu <[email protected]>

    * Maximize time to wait for the route deletion

    * Fix route update

    Signed-off-by: Yann Liu <[email protected]>

    * Fix route update

    Signed-off-by: Yann Liu <[email protected]>

    * Test with a 30 second wait

    Signed-off-by: Yann Liu <[email protected]>

    * Fix  flaky test

    Signed-off-by: Yann Liu <[email protected]>

    * Add disabling IOR and clean up

    Signed-off-by: Yann Liu <[email protected]>

    * Defer clean up

    Signed-off-by: Yann Liu <[email protected]>

    * Clear only ior routes

    Signed-off-by: Yann Liu <[email protected]>

    * rename newRoute to newRouteController

    * rename route.go to controller.go

    ---------

Co-authored-by: Yann Liu <[email protected]>
Co-authored-by: Jacek Ewertowski <[email protected]>
Co-authored-by: Marko Lukša <[email protected]>
Co-authored-by: Jonh Wendell <[email protected]>
Co-authored-by: Brian Avery <[email protected]>
Signed-off-by: Yann Liu <[email protected]>
@yannuil
Copy link
Contributor Author

yannuil commented May 28, 2024

/test maistra-istio-unit-2-6

1 similar comment
@yannuil
Copy link
Contributor Author

yannuil commented May 28, 2024

/test maistra-istio-unit-2-6

@yannuil
Copy link
Contributor Author

yannuil commented May 28, 2024

/test integ-servicemesh-2-6

1 similar comment
@yannuil
Copy link
Contributor Author

yannuil commented May 29, 2024

/test integ-servicemesh-2-6

jewertow
jewertow reviewed May 30, 2024
View reviewed changes
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.

@yannuil could you please:

  1. remove commit "Fix flaky IOR integration test" as it still fails;
  2. squash argocd-related commits into "OSSM-6295: Copy all annotations and labels added by ArgoCD except argocd.argoproj.io/instance"?

Then I would approve this PR and we could merge it.

@jewertow jewertow added the tide/merge-method-rebase Denotes a PR that should be rebased by tide when it merges. label May 30, 2024
@eoinfennessy eoinfennessy mentioned this pull request May 30, 2024
Merged
jewertow and others added 2 commits May 31, 2024 09:28
@jewertow @yannuil
OSSM-6295: Copy all annotations and labels added by ArgoCD except `ar…
ab3c656 
…gocd.argoproj.io/instance` (maistra#980)

* Fix IOR wrongly copying argocd internal annotation from Gateway to route (maistra#936)
* Fix IOR wrongly copying argocd label from Gateway to route (maistra#957)
* OSSM-6295: Copy ArgoCD annotations from Gateway to Route

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

* OSSM-6295: Copy all annotations and labels added by ArgoCD except argocd.argoproj.io/instance

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

* Fix lint errors

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

---------

Co-authored-by: Julien DELACROIX <[email protected]>
Co-authored-by: Jacek Ewertowski <[email protected]>
Signed-off-by: Yann Liu <[email protected]>
@yannuil
Fix flaky federation test
fd9cdce 
Signed-off-by: Yann Liu <[email protected]>
@yannuil
Copy link
Contributor Author

yannuil commented May 31, 2024 

/test integ-servicemesh-2-6

@jewertow
Copy link
Member

/retest

jewertow
jewertow reviewed May 31, 2024
View reviewed changes
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.

You forgot about this: #828.

@openshift-merge-bot openshift-merge-bot bot merged commit e9f19f0 into maistra:maistra-2.6 May 31, 2024
10 checks passed
@yannuil
Copy link
Contributor Author

yannuil commented May 31, 2024

@jewertow , actually don't need it anymore. The route resource is now managed by the upstream informer factory, which has a single method to start all informers.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jewertow jewertow jewertow approved these changes

Assignees
No one assigned
Labels
okay to merge size/XXL tide/merge-method-rebase Denotes a PR that should be rebased by tide when it merges.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@yannuil @jewertow