Deduplicate KnativeServing template in Kserve

opendatahub-io · Feb 26, 2025 · d35d619 · d35d619
1 parent 17b7a7d
commit d35d619
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 26 deletions.
diff --git a/controllers/components/kserve/kserve_controller_actions.go b/controllers/components/kserve/kserve_controller_actions.go
@@ -237,11 +237,6 @@ func configureServerless(ctx context.Context, rr *odhtypes.ReconciliationRequest
 				FS:   resourcesFS,
 				Path: "resources/serving-install/knative-serving.tmpl.yaml",
 			},
-			{
-				FS:   resourcesFS,
-				Path: "resources/serving-net-istio-secret-filtering.patch.tmpl.yaml",
-			},
-
 			{
 				FS:   resourcesFS,
 				Path: "resources/servicemesh/routing/istio-ingress-gateway.tmpl.yaml",

diff --git a/controllers/components/kserve/resources/serving-install/knative-serving.tmpl.yaml b/controllers/components/kserve/resources/serving-install/knative-serving.tmpl.yaml
@@ -15,6 +15,12 @@ spec:
         sidecar.istio.io/inject: "true"
         sidecar.istio.io/rewriteAppHTTPProbers: "true"
       name: autoscaler
+    - name: net-istio-controller
+      env:
+        - container: controller
+          envVars:
+            - name: ENABLE_SECRET_INFORMER_FILTERING_BY_CERT_UID
+              value: 'true'
   ingress:
     istio:
       enabled: true

diff --git a/controllers/components/kserve/resources/serving-net-istio-secret-filtering.patch.tmpl.yaml b/controllers/components/kserve/resources/serving-net-istio-secret-filtering.patch.tmpl.yaml