Skip to content

Commit

Permalink
Add IOR
Browse files Browse the repository at this point in the history 
commit 466ae69
Author: Yang Liu <yannliu@redhat.com>
Date:   Thu Mar 23 04:22:40 2023 +0800

    OSSM-1689 Simplify IOR (maistra#747)

    * Rework IOR initialization

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * 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 <yannliu@redhat.com>

    * DIsable TestPref

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Rename

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Call `findService` once for each gateway

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Use original host to generate Route name

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Skip duplicate update test

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Improve concurrency test

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Introduce update Route on Gateway update

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Fix data race

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Format and lint

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Respect log level

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * 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 <yannliu@redhat.com>

    * Remove unused functions

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Use `Lister` for finding target service

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Start IOR before kube client

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Remove unused properties

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Rework test initialization

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Log correct debug information

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Remove unnecessary parameters

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Remove ResourceVersion usage

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Avoid deletion of a route when failing to update

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Update FakeRouter to record API call counts

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Rework initialization

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Keep startup process order consistent

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Fix creating matching service

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Test IOR to be idempotent

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Remove unused parameters

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Rename symbol

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Remove used struct

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Improve styling and wording

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Add support list across namespaces in faker

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Lint and format

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Introduce Openshift Route informer

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Lint

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Run make gen

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Fix data race

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Fix test data race

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Lint

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Rename variables

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Fix update route

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Linit

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Increase wait for the delete

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Maximize time to wait for the route deletion

    * Fix route update

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Fix route update

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Test with a 30 second wait

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Fix  flaky test

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Add disabling IOR and clean up

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Defer clean up

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * Clear only ior routes

    Signed-off-by: Yann Liu <yannliu@redhat.com>

    * rename newRoute to newRouteController

    * rename route.go to controller.go

    ---------

Co-authored-by: Yann Liu <yannliu@redhat.com>
Co-authored-by: Jacek Ewertowski <jewertow@redhat.com>
Co-authored-by: Marko Lukša <marko.luksa@gmail.com>
Co-authored-by: Jonh Wendell <jonh.wendell@redhat.com>
Co-authored-by: Brian Avery <bavery@redhat.com>
Signed-off-by: Yann Liu <yannliu@redhat.com>
  • Loading branch information
@yannuil @jewertow
@luksa @jwendell @brian-avery @openshift-merge-bot
5 people authored and openshift-merge-bot[bot] committed May 31, 2024
1 parent 1adcab7 commit 51437c6
Show file tree
Hide file tree
Showing 31 changed files with 2,006 additions and 91 deletions.
1 change: 1 addition & 0 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ require (
github.com/moby/buildkit v0.12.5
github.com/onsi/gomega v1.27.10
github.com/openshift/api v0.0.0-20231212152002-ef62af078a93
github.com/openshift/client-go v0.0.0-20231212205830-0ab0864ec8c2
github.com/pires/go-proxyproto v0.7.0
github.com/pkg/errors v0.9.1
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -673,6 +673,8 @@ github.com/opencontainers/image-spec v1.1.0-rc3 h1:fzg1mXZFj8YdPeNkRXMg+zb88BFV0
github.com/opencontainers/image-spec v1.1.0-rc3/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8=
github.com/openshift/api v0.0.0-20231212152002-ef62af078a93 h1:hNj5+Wz2nZLNW1Sryj4r6R4tLAIZ+PJQd1k24kvga7g=
github.com/openshift/api v0.0.0-20231212152002-ef62af078a93/go.mod h1:qNtV0315F+f8ld52TLtPvrfivZpdimOzTi3kn9IVbtU=
github.com/openshift/client-go v0.0.0-20231212205830-0ab0864ec8c2 h1:ArsCqZ2t7Jepm44YxW/4t2q1bPcqiyn5erNwpfbk8dE=
github.com/openshift/client-go v0.0.0-20231212205830-0ab0864ec8c2/go.mod h1:rk91ouw63QUVu2NfUt09MSJT4W54q5J5EV94f87jNC8=
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
Expand Down
191 changes: 191 additions & 0 deletions licenses/github.com/openshift/client-go/LICENSE
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,191 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

Copyright 2014 Red Hat, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
11 changes: 11 additions & 0 deletions pilot/pkg/bootstrap/configcontroller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"istio.io/istio/pilot/pkg/config/kube/crdclient"
"istio.io/istio/pilot/pkg/config/kube/gateway"
ingress "istio.io/istio/pilot/pkg/config/kube/ingress"
"istio.io/istio/pilot/pkg/config/kube/ior"
"istio.io/istio/pilot/pkg/config/memory"
configmonitor "istio.io/istio/pilot/pkg/config/monitor"
"istio.io/istio/pilot/pkg/features"
Expand Down Expand Up @@ -210,6 +211,16 @@ func (s *Server) initK8SConfigStore(args *PilotArgs) error {
return err
}
}
if features.EnableIOR {
s.addTerminatingStartFunc("ior controller", func(stop <-chan struct{}) error {
leaderelection.
NewLeaderElection(args.Namespace, args.PodName, leaderelection.IORController, args.Revision, s.kubeClient).
AddRunFunction(func(leaderStop <-chan struct{}) {
ior.Run(s.kubeClient, configController, leaderStop)
}).Run(stop)
return nil
})
}
var err error
s.RWConfigStore, err = configaggregate.MakeWriteableCache(s.ConfigStores, configController)
if err != nil {
Expand Down
52 changes: 52 additions & 0 deletions pilot/pkg/config/kube/crdclient/types.gen.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

59 changes: 59 additions & 0 deletions pilot/pkg/config/kube/ior/client.go
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
// Copyright Red Hat, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package ior

import (
"strings"
"time"

"istio.io/istio/pkg/kube"
)

// KubeClient is an extension of `kube.Client` with auxiliary functions for IOR
type KubeClient interface {
IsRouteSupported() bool
GetActualClient() kube.Client
GetHandleEventTimeout() time.Duration
}

type kubeClient struct {
client kube.Client
}

// NewKubeClient creates the IOR version of KubeClient
func NewKubeClient(client kube.Client) KubeClient {
return &kubeClient{client: client}
}

func (c *kubeClient) IsRouteSupported() bool {
_, s, _ := c.client.Kube().Discovery().ServerGroupsAndResources()
// This may fail if any api service is down, but the result will still be populated, so we skip the error
for _, res := range s {
for _, api := range res.APIResources {
if api.Kind == "Route" && strings.HasPrefix(res.GroupVersion, "route.openshift.io/") {
return true
}
}
}
return false
}

func (c *kubeClient) GetActualClient() kube.Client {
return c.client
}

func (c *kubeClient) GetHandleEventTimeout() time.Duration {
return 10 * time.Second
}
Loading

0 comments on commit 51437c6

Please sign in to comment.