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

add server side filter patch #694

Merged
merged 1 commit into from
Aug 27, 2024
Merged

add server side filter patch #694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions patch/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ This list documents each patch:
* 20240508-never-remove-ecds-explicitly.patch: Backport https://github.com/istio/istio/commit/aab0fc6bb0655f5822233458c11605d9ef6b8719 to Istio 1.21. The bug occurred when delta xDS is enabled and using ECDS.
* 20240510-fix-empty-ecds-with-delta-xds.patch: Backport https://github.com/istio/istio/commit/e91027cf0d5242e677a84e5f6f9dd1924d0175c5 to Istio 1.21. The bug occurred when delta xDS is enabled and using ECDS and pilot-agent.
* 20240529-fix-routes-overwrite-when-merging-same-host-from-multi-virtualservices.patch: Backport https://github.com/istio/istio/commit/0cb5c33595cdfaea732178a4d70265ac0a762255 to Istio 1.21. The filename in the patch is renamed to match the file in Istio 1.21. The bug occurred sometimes when multiple virtualservices has the same domain.
* 20240823-server-side-filter.patch: Add server-side filters to filter istio CRD.
150 changes: 150 additions & 0 deletions patch/istio/1.21/20240823-server-side-filter.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
diff --git a/pilot/pkg/config/kube/crdclient/client.go b/pilot/pkg/config/kube/crdclient/client.go
index 26e5d66..2e07143 100644
--- a/pilot/pkg/config/kube/crdclient/client.go
+++ b/pilot/pkg/config/kube/crdclient/client.go
@@ -103,6 +103,9 @@ func New(client kube.Client, opts Option) *Client {
if features.EnableGatewayAPI {
schemas = collections.PilotGatewayAPI()
}
+ if features.IstioCRsServerSideFilterLabels != "" {
+ istioCRsServerSideFilter(schemas, &opts)
+ }
return NewForSchemas(client, opts, schemas)
}

diff --git a/pilot/pkg/config/kube/crdclient/serversidefilter.go b/pilot/pkg/config/kube/crdclient/serversidefilter.go
new file mode 100644
index 0000000..b6d9cd0
--- /dev/null
+++ b/pilot/pkg/config/kube/crdclient/serversidefilter.go
@@ -0,0 +1,39 @@
+// Copyright The HTNN Authors.
+//
+// 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 crdclient
+
+import (
+ "istio.io/istio/pilot/pkg/features"
+ "istio.io/istio/pkg/config"
+ "istio.io/istio/pkg/config/schema/collection"
+ "istio.io/istio/pkg/kube/kubetypes"
+ "istio.io/istio/pkg/log"
+)
+
+func istioCRsServerSideFilter(schemas collection.Schemas, opts *Option) {
+ for _, v := range schemas.GroupVersionKinds() {
+ if opts.FiltersByGVK == nil {
+ opts.FiltersByGVK = make(map[config.GroupVersionKind]kubetypes.Filter)
+ }
+ if f, ok := opts.FiltersByGVK[v]; ok {
+ log.Debugf("GVK:%+v filter found", v)
+ f.LabelSelector = features.IstioCRsServerSideFilterLabels
+ opts.FiltersByGVK[v] = f
+ } else {
+ log.Debugf("GVK:%+v filter not found", v)
+ opts.FiltersByGVK[v] = kubetypes.Filter{LabelSelector: features.IstioCRsServerSideFilterLabels}
+ }
+ }
+}
diff --git a/pilot/pkg/credentials/kube/secrets.go b/pilot/pkg/credentials/kube/secrets.go
index fbde05a..6d4ab37 100644
--- a/pilot/pkg/credentials/kube/secrets.go
+++ b/pilot/pkg/credentials/kube/secrets.go
@@ -30,6 +30,7 @@ import (
authorizationv1client "k8s.io/client-go/kubernetes/typed/authorization/v1"

"istio.io/istio/pilot/pkg/credentials"
+ "istio.io/istio/pilot/pkg/features"
securitymodel "istio.io/istio/pilot/pkg/security/model"
"istio.io/istio/pkg/kube"
"istio.io/istio/pkg/kube/controllers"
@@ -88,6 +89,7 @@ func NewCredentialsController(kc kube.Client) *CredentialsController {
fields.OneTermNotEqualSelector("type", "helm.sh/release.v1"),
fields.OneTermNotEqualSelector("type", string(v1.SecretTypeServiceAccountToken))).String()
secrets := kclient.NewFiltered[*v1.Secret](kc, kclient.Filter{
+ LabelSelector: features.SecretsServerSideFilterLabels,
FieldSelector: fieldSelector,
})

diff --git a/pilot/pkg/features/serversidefilter.go b/pilot/pkg/features/serversidefilter.go
new file mode 100644
index 0000000..f401c59
--- /dev/null
+++ b/pilot/pkg/features/serversidefilter.go
@@ -0,0 +1,30 @@
+// Copyright The HTNN Authors.
+//
+// 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 features
+
+import "istio.io/istio/pkg/env"
+
+var (
+ PodsServerSideFilterLabels = env.Register("PODS_SERVER_SIDE_FILTER_LABELS", "",
+ "Reduce content and memory usage obtained from APIServer through LabelSelector in LIST&WATCH request").Get()
+ ServicesServerSideFilterLabels = env.Register("SERVICES_SERVER_SIDE_FILTER_LABELS", "",
+ "Reduce content and memory usage obtained from APIServer through LabelSelector in LIST&WATCH request").Get()
+ EndpointsServerSideFilterLabels = env.Register("ENDPOINTS_SERVER_SIDE_FILTER_LABELS", "",
+ "Reduce content and memory usage obtained from APIServer through LabelSelector in LIST&WATCH request").Get()
+ SecretsServerSideFilterLabels = env.Register("SECRETS_SERVER_SIDE_FILTER_LABELS", "",
+ "Reduce content and memory usage obtained from APIServer through LabelSelector in LIST&WATCH request").Get()
+ IstioCRsServerSideFilterLabels = env.Register("ISTIO_CRS_SERVER_SIDE_FILTER_LABELS", "",
+ "Reduce content and memory usage obtained from APIServer through LabelSelector in LIST&WATCH request").Get()
+)
diff --git a/pilot/pkg/serviceregistry/kube/controller/controller.go b/pilot/pkg/serviceregistry/kube/controller/controller.go
index cc55a71..89be611 100644
--- a/pilot/pkg/serviceregistry/kube/controller/controller.go
+++ b/pilot/pkg/serviceregistry/kube/controller/controller.go
@@ -272,7 +272,8 @@ func NewController(kubeClient kubelib.Client, options Options) *Controller {
}
c.initDiscoveryHandlers(c.opts.MeshWatcher, c.opts.DiscoveryNamespacesFilter)

- c.services = kclient.NewFiltered[*v1.Service](kubeClient, kclient.Filter{ObjectFilter: c.opts.DiscoveryNamespacesFilter.Filter})
+ c.services = kclient.NewFiltered[*v1.Service](kubeClient, kclient.Filter{
+ LabelSelector: features.ServicesServerSideFilterLabels, ObjectFilter: c.opts.DiscoveryNamespacesFilter.Filter})

registerHandlers[*v1.Service](c, c.services, "Services", c.onServiceEvent, nil)

@@ -283,6 +284,7 @@ func NewController(kubeClient kubelib.Client, options Options) *Controller {
registerHandlers[*v1.Node](c, c.nodes, "Nodes", c.onNodeEvent, nil)

c.podsClient = kclient.NewFiltered[*v1.Pod](kubeClient, kclient.Filter{
+ LabelSelector: features.PodsServerSideFilterLabels,
ObjectFilter: c.opts.DiscoveryNamespacesFilter.Filter,
ObjectTransform: kubelib.StripPodUnusedFields,
})
diff --git a/pilot/pkg/serviceregistry/kube/controller/endpointslice.go b/pilot/pkg/serviceregistry/kube/controller/endpointslice.go
index 09a8845..93210ed 100644
--- a/pilot/pkg/serviceregistry/kube/controller/endpointslice.go
+++ b/pilot/pkg/serviceregistry/kube/controller/endpointslice.go
@@ -49,7 +49,7 @@ var (
)

func newEndpointSliceController(c *Controller) *endpointSliceController {
- slices := kclient.NewFiltered[*v1.EndpointSlice](c.client, kclient.Filter{ObjectFilter: c.opts.GetFilter()})
+ slices := kclient.NewFiltered[*v1.EndpointSlice](c.client, kclient.Filter{LabelSelector: features.EndpointsServerSideFilterLabels, ObjectFilter: c.opts.GetFilter()})
out := &endpointSliceController{
c: c,
slices: slices,
Loading