From caea0d64ac39906d58d27b9eb4438d25e8a42f7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edgar=20Hern=C3=A1ndez?=
 <23639005+israel-hdez@users.noreply.github.com>
Date: Mon, 24 Jul 2023 13:38:58 -0600
Subject: [PATCH] Fix Kustomize manifests for OpenShift
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Kustomize patches for OpenShift were cherry-picked from the release-v0.10 branch. The cherry-pick succeeded, but the resulting manifests were not working, because of the differences. This fixes the manifests and bring them back to a working state.

Signed-off-by: Edgar Hernández <23639005+israel-hdez@users.noreply.github.com>
---
 config/default/kustomization.yaml | 148 +++++++++++++++---------------
 1 file changed, 73 insertions(+), 75 deletions(-)

diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
index a86faccb55..672d67076f 100644
--- a/config/default/kustomization.yaml
+++ b/config/default/kustomization.yaml
@@ -68,9 +68,9 @@ replacements:
           index: 0
 
   - source:
-      group: cert-manager.io
-      kind: Certificate
-      name: serving-cert
+      group: apps
+      kind: Deployment
+      name: kserve-controller-manager
       version: v1
       fieldPath: metadata.namespace
     targets:
@@ -99,56 +99,56 @@ replacements:
           name: inferencegraph.serving.kserve.io
         fieldPaths:
           - webhooks.*.clientConfig.service.namespace
-      - select:
-          kind: Certificate
-          name: serving-cert
-          namespace: kserve
-        fieldPaths:
-          - spec.commonName
-          - spec.dnsNames.0
-        options:
-          delimiter: '.'
-          index: 1
-      - select:
-          kind: CustomResourceDefinition
-          name: inferenceservices.serving.kserve.io
-        fieldPaths:
-          - metadata.annotations.[cert-manager.io/inject-ca-from]
-        options:
-          delimiter: '/'
-          index: 0
-      - select:
-          kind: MutatingWebhookConfiguration
-          name: inferenceservice.serving.kserve.io
-        fieldPaths:
-          - metadata.annotations.[cert-manager.io/inject-ca-from]
-        options:
-          delimiter: '/'
-          index: 0
-      - select:
-          kind: ValidatingWebhookConfiguration
-          name: inferenceservice.serving.kserve.io
-        fieldPaths:
-          - metadata.annotations.[cert-manager.io/inject-ca-from]
-        options:
-          delimiter: '/'
-          index: 0
-      - select:
-          kind: ValidatingWebhookConfiguration
-          name: trainedmodel.serving.kserve.io
-        fieldPaths:
-          - metadata.annotations.[cert-manager.io/inject-ca-from]
-        options:
-          delimiter: '/'
-          index: 0
-      - select:
-          kind: ValidatingWebhookConfiguration
-          name: inferencegraph.serving.kserve.io
-        fieldPaths:
-          - metadata.annotations.[cert-manager.io/inject-ca-from]
-        options:
-          delimiter: '/'
-          index: 0
+#      - select:
+#          kind: Certificate
+#          name: serving-cert
+#          namespace: kserve
+#        fieldPaths:
+#          - spec.commonName
+#          - spec.dnsNames.0
+#        options:
+#          delimiter: '.'
+#          index: 1
+#      - select:
+#          kind: CustomResourceDefinition
+#          name: inferenceservices.serving.kserve.io
+#        fieldPaths:
+#          - metadata.annotations.[cert-manager.io/inject-ca-from]
+#        options:
+#          delimiter: '/'
+#          index: 0
+#      - select:
+#          kind: MutatingWebhookConfiguration
+#          name: inferenceservice.serving.kserve.io
+#        fieldPaths:
+#          - metadata.annotations.[cert-manager.io/inject-ca-from]
+#        options:
+#          delimiter: '/'
+#          index: 0
+#      - select:
+#          kind: ValidatingWebhookConfiguration
+#          name: inferenceservice.serving.kserve.io
+#        fieldPaths:
+#          - metadata.annotations.[cert-manager.io/inject-ca-from]
+#        options:
+#          delimiter: '/'
+#          index: 0
+#      - select:
+#          kind: ValidatingWebhookConfiguration
+#          name: trainedmodel.serving.kserve.io
+#        fieldPaths:
+#          - metadata.annotations.[cert-manager.io/inject-ca-from]
+#        options:
+#          delimiter: '/'
+#          index: 0
+#      - select:
+#          kind: ValidatingWebhookConfiguration
+#          name: inferencegraph.serving.kserve.io
+#        fieldPaths:
+#          - metadata.annotations.[cert-manager.io/inject-ca-from]
+#        options:
+#          delimiter: '/'
+#          index: 0
 
   # Protect the /metrics endpoint by putting it behind auth.
   # Only one of manager_auth_proxy_patch.yaml and
@@ -170,26 +170,24 @@ patches:
 - path: manager_resources_patch.yaml
 - path: inferenceservice_conversion_webhook.yaml
 - path: cainjection_conversion_webhook.yaml
-
-patches:
-  # Since OpenShift serving-certificates are being used,
-  # remove CA bundle placeholders
-  - patch: |-
-      - op: remove
-        path: "/spec/conversion/webhook/clientConfig/caBundle"
-    target:
-      kind: CustomResourceDefinition
-      name: inferenceservices.serving.kserve.io
-  - patch: |-
-      - op: remove
-        path: "/webhooks/0/clientConfig/caBundle"
-      - op: remove
-        path: "/webhooks/1/clientConfig/caBundle"
-    target:
-      kind: MutatingWebhookConfiguration
-  - patch: |-
-      - op: remove
-        path: "/webhooks/0/clientConfig/caBundle"
-    target:
-      kind: ValidatingWebhookConfiguration
+# Since OpenShift serving-certificates are being used,
+# remove CA bundle placeholders
+- patch: |-
+    - op: remove
+      path: "/spec/conversion/webhook/clientConfig/caBundle"
+  target:
+    kind: CustomResourceDefinition
+    name: inferenceservices.serving.kserve.io
+- patch: |-
+    - op: remove
+      path: "/webhooks/0/clientConfig/caBundle"
+    - op: remove
+      path: "/webhooks/1/clientConfig/caBundle"
+  target:
+    kind: MutatingWebhookConfiguration
+- patch: |-
+    - op: remove
+      path: "/webhooks/0/clientConfig/caBundle"
+  target:
+    kind: ValidatingWebhookConfiguration