Merge pull request red-hat-data-services#152 from zdtsw-forking/jira/292

fix: update default name for DSC in initialization-resource and missing serving in sample for DSC
zdtsw-forking · Dec 8, 2023 · 508449a · 508449a
2 parents baf9c13 + 633d9f6
commit 508449a
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 11 deletions.
diff --git a/bundle/manifests/rhods-operator.clusterserviceversion.yaml b/bundle/manifests/rhods-operator.clusterserviceversion.yaml
@@ -29,7 +29,16 @@ metadata:
                 "managementState": "Managed"
               },
               "kserve": {
-                "managementState": "Managed"
+                "managementState": "Managed",
+                "serving": {
+                  "ingressGateway": {
+                    "certificate": {
+                      "type": "SelfSigned"
+                    }
+                  },
+                  "managementState": "Managed",
+                  "name": "knative-serving"
+                }
               },
               "modelmeshserving": {
                 "managementState": "Managed"
@@ -101,10 +110,10 @@ metadata:
         "apiVersion": "datasciencecluster.opendatahub.io/v1",
         "kind": "DataScienceCluster",
         "metadata": {
-          "name": "rhods",
+          "name": "default-dsc",
           "labels": {
             "app.kubernetes.io/name": "datasciencecluster",
-            "app.kubernetes.io/instance": "rhods",
+            "app.kubernetes.io/instance": "default-dsc",
             "app.kubernetes.io/part-of": "opendatahub-operator",
             "app.kubernetes.io/managed-by": "kustomize",
             "app.kubernetes.io/created-by": "opendatahub-operator"
@@ -122,10 +131,19 @@ metadata:
               "managementState": "Managed"
             },
             "kserve": {
-              "managementState": "Managed"
+              "managementState": "Managed",
+               "serving": {
+                  "ingressGateway": {
+                    "certificate": {
+                      "type": "SelfSigned"
+                    }
+                  },
+                  "managementState": "Managed",
+                  "name": "knative-serving"
+              }
             },
             "modelmeshserving": {
-              "managementState": "Removed"
+              "managementState": "Managed"
             },
             "ray": {
               "managementState": "Removed"

diff --git a/config/manifests/bases/rhods-operator.clusterserviceversion.yaml b/config/manifests/bases/rhods-operator.clusterserviceversion.yaml
@@ -14,10 +14,10 @@ metadata:
         "apiVersion": "datasciencecluster.opendatahub.io/v1",
         "kind": "DataScienceCluster",
         "metadata": {
-          "name": "rhods",
+          "name": "default-dsc",
           "labels": {
             "app.kubernetes.io/name": "datasciencecluster",
-            "app.kubernetes.io/instance": "rhods",
+            "app.kubernetes.io/instance": "default-dsc",
             "app.kubernetes.io/part-of": "opendatahub-operator",
             "app.kubernetes.io/managed-by": "kustomize",
             "app.kubernetes.io/created-by": "opendatahub-operator"
@@ -35,10 +35,19 @@ metadata:
               "managementState": "Managed"
             },
             "kserve": {
-              "managementState": "Managed"
+              "managementState": "Managed",
+               "serving": {
+                  "ingressGateway": {
+                    "certificate": {
+                      "type": "SelfSigned"
+                    }
+                  },
+                  "managementState": "Managed",
+                  "name": "knative-serving"
+              }
             },
             "modelmeshserving": {
-              "managementState": "Removed"
+              "managementState": "Managed"
             },
             "ray": {
               "managementState": "Removed"

diff --git a/config/samples/datasciencecluster_v1_datasciencecluster.yaml b/config/samples/datasciencecluster_v1_datasciencecluster.yaml
@@ -16,8 +16,18 @@ spec:
       managementState: "Managed"
     datasciencepipelines:
       managementState: "Managed"
-    kserve:
-      managementState: "Managed"
+    kserve: {
+      managementState: "Managed",
+      serving: {
+        ingressGateway: {
+          certificate: {
+            type: SelfSigned
+          }
+        },
+        name: "knative-serving",
+        managementState: "Managed"
+      }
+    }
     modelmeshserving:
       managementState: "Managed"
     ray: