Merge main into v1.10-branch with known resolved conflicts

Author: github-actions[bot]

components/notebook-controller/config/overlays/standalone-service-mesh/cert-secret.yaml

@@ -4,7 +4,6 @@ resources:
 - ../openshift
 - gateway.yaml
 - gateway-route.yaml
-- cert-secret.yaml
 - smm.yaml
 namespace: odh-notebook-controller-system
 
@@ -26,15 +25,6 @@ patches:
     name: opendatahub-odh-gateway
     namespace: odh-notebook-controller-system
     version: v1
-- patch: |-
-    - op: replace
-      path: /metadata/namespace
-      value: istio-system
-  target:
-    kind: Secret
-    name: odh-dashboard-cert
-    namespace: odh-notebook-controller-system
-    version: v1
 - patch: |-
     - op: replace
       path: /spec/controlPlaneRef/namespace