Skip to content

Commit

Permalink
update: set kserve as Managed by default DSC (red-hat-data-services#130)
Browse files Browse the repository at this point in the history 
- keep modelmesh in clean install removed(flip from previous managed)
- keep modelmesh from old version as-was
set OSSM and serving both as default Managaed
- update docs with default status and missing new components
- fix nilpointer in DSCI

Signed-off-by: Wen Zhou <[email protected]>
  • Loading branch information
@zdtsw
zdtsw authored Nov 23, 2023
1 parent 13c28ec commit f7c2713
Show file tree
Hide file tree
Showing 15 changed files with 37 additions and 26 deletions.
2 changes: 2 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,8 @@ spec:
managementState: Managed
workbenches:
managementState: Managed
trustyai:
managementState: Managed
```

2. Enable only Dashboard and Workbenches
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/datasciencecluster.opendatahub.io_datascienceclusters.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ spec:
type: string
type: object
managementState:
default: Removed
default: Managed
enum:
- Managed
- Removed
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/dscinitialization.opendatahub.io_dscinitializations.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ spec:
type: string
type: object
managementState:
default: Removed
default: Managed
enum:
- Managed
- Removed
Expand Down
10 changes: 5 additions & 5 deletions bundle/manifests/rhods-operator.clusterserviceversion.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ metadata:
"managementState": "Managed"
},
"kserve": {
"managementState": "Removed"
"managementState": "Managed"
},
"modelmeshserving": {
"managementState": "Managed"
"managementState": "Removed"
},
"ray": {
"managementState": "Removed"
Expand Down Expand Up @@ -114,10 +114,10 @@ metadata:
"managementState": "Managed"
},
"kserve": {
"managementState": "Removed"
"managementState": "Managed"
},
"modelmeshserving": {
"managementState": "Managed"
"managementState": "Removed"
},
"ray": {
"managementState": "Removed"
Expand All @@ -126,7 +126,7 @@ metadata:
"managementState": "Managed"
},
"trustyai": {
"managementState": "Managed"
"managementState": "Removed"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/datasciencecluster.opendatahub.io_datascienceclusters.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ spec:
type: string
type: object
managementState:
default: Removed
default: Managed
enum:
- Managed
- Removed
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/dscinitialization.opendatahub.io_dscinitializations.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ spec:
type: string
type: object
managementState:
default: Removed
default: Managed
enum:
- Managed
- Removed
Expand Down
6 changes: 3 additions & 3 deletions config/manifests/bases/rhods-operator.clusterserviceversion.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ metadata:
"managementState": "Managed"
},
"kserve": {
"managementState": "Removed"
"managementState": "Managed"
},
"modelmeshserving": {
"managementState": "Managed"
"managementState": "Removed"
},
"ray": {
"managementState": "Removed"
Expand All @@ -47,7 +47,7 @@ metadata:
"managementState": "Managed"
},
"trustyai": {
"managementState": "Managed"
"managementState": "Removed"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions config/samples/datasciencecluster_v1_datasciencecluster.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ spec:
datasciencepipelines:
managementState: "Managed"
kserve:
managementState: "Removed"
modelmeshserving:
managementState: "Managed"
modelmeshserving:
managementState: "Removed"
ray:
managementState: "Removed"
workbenches:
Expand Down
2 changes: 1 addition & 1 deletion controllers/dscinitialization/dscinitialization_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ func (r *DSCInitializationReconciler) Reconcile(ctx context.Context, req ctrl.Re
instance = &instances.Items[0]
case len(instances.Items) > 1:
message := fmt.Sprintf("only one instance of DSCInitialization object is allowed. Update existing instance name %s", req.Name)
_, _ = r.updateStatus(ctx, instance, func(saved *dsciv1.DSCInitialization) {
_, _ = r.updateStatus(ctx, &instances.Items[0], func(saved *dsciv1.DSCInitialization) {
status.SetErrorCondition(&saved.Status.Conditions, status.DuplicateDSCInitialization, message)
saved.Status.Phase = status.PhaseError
})
Expand Down
6 changes: 4 additions & 2 deletions docs/DESIGN.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,15 @@ To deploy ODH components seamlessly, ODH operator will watch two CRDs:
datasciencepipelines:
managementState: Managed
kserve:
managementState: Removed
modelmeshserving:
managementState: Managed
modelmeshserving:
managementState: Removed
ray:
managementState: Removed
workbenches:
managementState: Managed
trustyai:
managementState: Removed
```

2. Enable only Dashboard and Workbenches(Jupyter Notebooks)
Expand Down
8 changes: 5 additions & 3 deletions docs/Dev-Preview.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,19 +86,21 @@ metadata:
spec:
components:
codeflare:
managementState: Managed
managementState: Removed
dashboard:
managementState: Managed
datasciencepipelines:
managementState: Managed
kserve:
managementState: Managed
modelmeshserving:
managementState: Managed
managementState: Removed
ray:
managementState: Managed
managementState: Removed
workbenches:
managementState: Managed
trustyai:
managementState: Removed
EOF
```

Expand Down
2 changes: 1 addition & 1 deletion infrastructure/v1/serverless_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
// bindings with the Service Mesh.
type ServingSpec struct {
// +kubebuilder:validation:Enum=Managed;Removed
// +kubebuilder:default=Removed
// +kubebuilder:default=Managed
ManagementState operatorv1.ManagementState `json:"managementState,omitempty"`
// Name specifies the name of the KNativeServing resource that is going to be
// created to instruct the KNative Operator to deploy KNative serving components.
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/v1/servicemesh_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import operatorv1 "github.com/openshift/api/operator/v1"
// ServiceMeshSpec configures Service Mesh.
type ServiceMeshSpec struct {
// +kubebuilder:validation:Enum=Managed;Removed
// +kubebuilder:default=Removed
// +kubebuilder:default=Managed
ManagementState operatorv1.ManagementState `json:"managementState,omitempty"`
// ControlPlane holds configuration of Service Mesh used by Opendatahub.
ControlPlane ControlPlaneSpec `json:"controlPlane,omitempty"`
Expand Down
11 changes: 7 additions & 4 deletions pkg/cluster/operations.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@ const (
// being used by different components.
func UpdatePodSecurityRolebinding(cli client.Client, namespace string, serviceAccountsList ...string) error {
foundRoleBinding := &authv1.RoleBinding{}
err := cli.Get(context.TODO(), client.ObjectKey{Name: namespace, Namespace: namespace}, foundRoleBinding)
if err != nil {
return err
if err := cli.Get(context.TODO(), client.ObjectKey{Name: namespace, Namespace: namespace}, foundRoleBinding); err != nil {
return fmt.Errorf("error to get rolebinding %s from namespace %s: %w", namespace, namespace, err)
}

for _, sa := range serviceAccountsList {
Expand All @@ -37,7 +36,11 @@ func UpdatePodSecurityRolebinding(cli client.Client, namespace string, serviceAc
}
}

return cli.Update(context.TODO(), foundRoleBinding)
if err := cli.Update(context.TODO(), foundRoleBinding); err != nil {
return fmt.Errorf("error update rolebinding %s with serviceaccount: %w", namespace, err)
}

return nil
}

// Internal function used by UpdatePodSecurityRolebinding()
Expand Down
2 changes: 2 additions & 0 deletions pkg/upgrade/upgrade.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ func UpdateFromLegacyVersion(cli client.Client, platform deploy.Platform, appNS
if err := deleteResource(cli, montNamespace, "statefulset"); err != nil {
return err
}
fmt.Println("creating default DSC CR")
if err := CreateDefaultDSC(cli, platform); err != nil {
return err
}
Expand Down Expand Up @@ -323,6 +324,7 @@ func UpdateFromLegacyVersion(cli client.Client, platform deploy.Platform, appNS
if err := deleteResource(cli, montNamespace, "statefulset"); err != nil {
return err
}
// create default DSC
if err = CreateDefaultDSC(cli, platform); err != nil {
return err
}
Expand Down

0 comments on commit f7c2713

Please sign in to comment.