Skip to content

Commit

Permalink
Add e2e test and add component name into message
Browse files Browse the repository at this point in the history 
- revert to use old DW manifests till it is ready
- update e2e test log
- update manifests bundle

Signed-off-by: Wen Zhou <[email protected]>
  • Loading branch information
@zdtsw
zdtsw committed Oct 9, 2023
1 parent 5354240 commit 78debd3
Show file tree
Hide file tree
Showing 11 changed files with 174 additions and 61 deletions.
77 changes: 68 additions & 9 deletions bundle/manifests/datasciencecluster.opendatahub.io_datascienceclusters.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
schema:
openAPIV3Schema:
description: DataScienceCluster is the Schema for the datascienceclusters
API
API.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
Expand Down Expand Up @@ -75,10 +75,12 @@ spec:
to keep it active. It will only upgrade the component if
it is safe to do so \n - \"Removed\" : the operator is actively
managing the component and will not install it, or if it
is installed, the operator will try to remove it"
is installed, the operator will try to remove it \n - \"Unmanaged\"
: the operator will not take any action related to the component"
enum:
- Managed
- Removed
- Unmanaged
pattern: ^(Managed|Unmanaged|Force|Removed)$
type: string
type: object
Expand Down Expand Up @@ -118,10 +120,12 @@ spec:
to keep it active. It will only upgrade the component if
it is safe to do so \n - \"Removed\" : the operator is actively
managing the component and will not install it, or if it
is installed, the operator will try to remove it"
is installed, the operator will try to remove it \n - \"Unmanaged\"
: the operator will not take any action related to the component"
enum:
- Managed
- Removed
- Unmanaged
pattern: ^(Managed|Unmanaged|Force|Removed)$
type: string
type: object
Expand Down Expand Up @@ -162,10 +166,12 @@ spec:
to keep it active. It will only upgrade the component if
it is safe to do so \n - \"Removed\" : the operator is actively
managing the component and will not install it, or if it
is installed, the operator will try to remove it"
is installed, the operator will try to remove it \n - \"Unmanaged\"
: the operator will not take any action related to the component"
enum:
- Managed
- Removed
- Unmanaged
pattern: ^(Managed|Unmanaged|Force|Removed)$
type: string
type: object
Expand Down Expand Up @@ -208,10 +214,12 @@ spec:
to keep it active. It will only upgrade the component if
it is safe to do so \n - \"Removed\" : the operator is actively
managing the component and will not install it, or if it
is installed, the operator will try to remove it"
is installed, the operator will try to remove it \n - \"Unmanaged\"
: the operator will not take any action related to the component"
enum:
- Managed
- Removed
- Unmanaged
pattern: ^(Managed|Unmanaged|Force|Removed)$
type: string
type: object
Expand Down Expand Up @@ -253,10 +261,12 @@ spec:
to keep it active. It will only upgrade the component if
it is safe to do so \n - \"Removed\" : the operator is actively
managing the component and will not install it, or if it
is installed, the operator will try to remove it"
is installed, the operator will try to remove it \n - \"Unmanaged\"
: the operator will not take any action related to the component"
enum:
- Managed
- Removed
- Unmanaged
pattern: ^(Managed|Unmanaged|Force|Removed)$
type: string
type: object
Expand Down Expand Up @@ -297,10 +307,57 @@ spec:
to keep it active. It will only upgrade the component if
it is safe to do so \n - \"Removed\" : the operator is actively
managing the component and will not install it, or if it
is installed, the operator will try to remove it"
is installed, the operator will try to remove it \n - \"Unmanaged\"
: the operator will not take any action related to the component"
enum:
- Managed
- Removed
- Unmanaged
pattern: ^(Managed|Unmanaged|Force|Removed)$
type: string
type: object
trustyai:
description: TrustyAI component configuration.
properties:
devFlags:
description: Add developer fields
properties:
manifests:
description: List of custom manifests for the given component
items:
properties:
contextDir:
default: ""
description: contextDir is the relative path to
the folder containing manifests in a repository
type: string
sourcePath:
default: ""
description: 'sourcePath is the subpath within contextDir
where kustomize builds start. Examples include
any sub-folder or path: `base`, `overlays/dev`,
`default`, `odh` etc'
type: string
uri:
default: ""
description: uri is the URI point to a git repo
with tag/branch. e.g https://github.com/org/repo/tarball/<tag/branch>
type: string
type: object
type: array
type: object
managementState:
description: "Set to one of the following values: \n - \"Managed\"
: the operator is actively managing the component and trying
to keep it active. It will only upgrade the component if
it is safe to do so \n - \"Removed\" : the operator is actively
managing the component and will not install it, or if it
is installed, the operator will try to remove it \n - \"Unmanaged\"
: the operator will not take any action related to the component"
enum:
- Managed
- Removed
- Unmanaged
pattern: ^(Managed|Unmanaged|Force|Removed)$
type: string
type: object
Expand Down Expand Up @@ -340,17 +397,19 @@ spec:
to keep it active. It will only upgrade the component if
it is safe to do so \n - \"Removed\" : the operator is actively
managing the component and will not install it, or if it
is installed, the operator will try to remove it"
is installed, the operator will try to remove it \n - \"Unmanaged\"
: the operator will not take any action related to the component"
enum:
- Managed
- Removed
- Unmanaged
pattern: ^(Managed|Unmanaged|Force|Removed)$
type: string
type: object
type: object
type: object
status:
description: DataScienceClusterStatus defines the observed state of DataScienceCluster
description: DataScienceClusterStatus defines the observed state of DataScienceCluster.
properties:
conditions:
description: Conditions describes the state of the DataScienceCluster
Expand Down
6 changes: 3 additions & 3 deletions bundle/manifests/dscinitialization.opendatahub.io_dscinitializations.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
name: v1
schema:
openAPIV3Schema:
description: DSCInitialization is the Schema for the dscinitializations API
description: DSCInitialization is the Schema for the dscinitializations API.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
Expand All @@ -43,7 +43,7 @@ spec:
metadata:
type: object
spec:
description: DSCInitializationSpec defines the desired state of DSCInitialization
description: DSCInitializationSpec defines the desired state of DSCInitialization.
properties:
applicationsNamespace:
default: opendatahub
Expand Down Expand Up @@ -82,7 +82,7 @@ spec:
- applicationsNamespace
type: object
status:
description: DSCInitializationStatus defines the observed state of DSCInitialization
description: DSCInitializationStatus defines the observed state of DSCInitialization.
properties:
conditions:
description: Conditions describes the state of the DSCInitializationStatus
Expand Down
38 changes: 32 additions & 6 deletions bundle/manifests/opendatahub-operator.clusterserviceversion.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ metadata:
"ray": {
"managementState": "Removed"
},
"workbenches": {
"managementState": "Managed"
},
"trustyai": {
"managementState": "Removed"
},
"workbenches": {
"managementState": "Managed"
}
}
}
},
Expand Down Expand Up @@ -113,7 +113,7 @@ metadata:
},
"trustyai": {
"managementState": "Removed"
},
}
}
}
}
Expand All @@ -127,7 +127,7 @@ spec:
apiservicedefinitions: {}
customresourcedefinitions:
owned:
- description: DataScienceCluster is the Schema for the datascienceclusters API
- description: DataScienceCluster is the Schema for the datascienceclusters API.
displayName: Data Science Cluster
kind: DataScienceCluster
name: datascienceclusters.datasciencecluster.opendatahub.io
Expand All @@ -136,7 +136,7 @@ spec:
displayName: Components
path: components
version: v1
- description: DSCInitialization is the Schema for the dscinitializations API
- description: DSCInitialization is the Schema for the dscinitializations API.
displayName: DSC Initialization
kind: DSCInitialization
name: dscinitializations.dscinitialization.opendatahub.io
Expand Down Expand Up @@ -1406,6 +1406,32 @@ spec:
- templates
verbs:
- '*'
- apiGroups:
- trustyai.opendatahub.io.trustyai.opendatahub.io
resources:
- trustyaiservices
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- trustyai.opendatahub.io.trustyai.opendatahub.io
resources:
- trustyaiservices/finalizers
verbs:
- update
- apiGroups:
- trustyai.opendatahub.io.trustyai.opendatahub.io
resources:
- trustyaiservices/status
verbs:
- get
- patch
- update
- apiGroups:
- user.openshift.io
resources:
Expand Down
32 changes: 24 additions & 8 deletions config/crd/bases/datasciencecluster.opendatahub.io_datascienceclusters.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,12 @@ spec:
to keep it active. It will only upgrade the component if
it is safe to do so \n - \"Removed\" : the operator is actively
managing the component and will not install it, or if it
is installed, the operator will try to remove it"
is installed, the operator will try to remove it \n - \"Unmanaged\"
: the operator will not take any action related to the component"
enum:
- Managed
- Removed
- Unmanaged
pattern: ^(Managed|Unmanaged|Force|Removed)$
type: string
type: object
Expand Down Expand Up @@ -119,10 +121,12 @@ spec:
to keep it active. It will only upgrade the component if
it is safe to do so \n - \"Removed\" : the operator is actively
managing the component and will not install it, or if it
is installed, the operator will try to remove it"
is installed, the operator will try to remove it \n - \"Unmanaged\"
: the operator will not take any action related to the component"
enum:
- Managed
- Removed
- Unmanaged
pattern: ^(Managed|Unmanaged|Force|Removed)$
type: string
type: object
Expand Down Expand Up @@ -163,10 +167,12 @@ spec:
to keep it active. It will only upgrade the component if
it is safe to do so \n - \"Removed\" : the operator is actively
managing the component and will not install it, or if it
is installed, the operator will try to remove it"
is installed, the operator will try to remove it \n - \"Unmanaged\"
: the operator will not take any action related to the component"
enum:
- Managed
- Removed
- Unmanaged
pattern: ^(Managed|Unmanaged|Force|Removed)$
type: string
type: object
Expand Down Expand Up @@ -209,10 +215,12 @@ spec:
to keep it active. It will only upgrade the component if
it is safe to do so \n - \"Removed\" : the operator is actively
managing the component and will not install it, or if it
is installed, the operator will try to remove it"
is installed, the operator will try to remove it \n - \"Unmanaged\"
: the operator will not take any action related to the component"
enum:
- Managed
- Removed
- Unmanaged
pattern: ^(Managed|Unmanaged|Force|Removed)$
type: string
type: object
Expand Down Expand Up @@ -254,10 +262,12 @@ spec:
to keep it active. It will only upgrade the component if
it is safe to do so \n - \"Removed\" : the operator is actively
managing the component and will not install it, or if it
is installed, the operator will try to remove it"
is installed, the operator will try to remove it \n - \"Unmanaged\"
: the operator will not take any action related to the component"
enum:
- Managed
- Removed
- Unmanaged
pattern: ^(Managed|Unmanaged|Force|Removed)$
type: string
type: object
Expand Down Expand Up @@ -298,10 +308,12 @@ spec:
to keep it active. It will only upgrade the component if
it is safe to do so \n - \"Removed\" : the operator is actively
managing the component and will not install it, or if it
is installed, the operator will try to remove it"
is installed, the operator will try to remove it \n - \"Unmanaged\"
: the operator will not take any action related to the component"
enum:
- Managed
- Removed
- Unmanaged
pattern: ^(Managed|Unmanaged|Force|Removed)$
type: string
type: object
Expand Down Expand Up @@ -341,10 +353,12 @@ spec:
to keep it active. It will only upgrade the component if
it is safe to do so \n - \"Removed\" : the operator is actively
managing the component and will not install it, or if it
is installed, the operator will try to remove it"
is installed, the operator will try to remove it \n - \"Unmanaged\"
: the operator will not take any action related to the component"
enum:
- Managed
- Removed
- Unmanaged
pattern: ^(Managed|Unmanaged|Force|Removed)$
type: string
type: object
Expand Down Expand Up @@ -384,10 +398,12 @@ spec:
to keep it active. It will only upgrade the component if
it is safe to do so \n - \"Removed\" : the operator is actively
managing the component and will not install it, or if it
is installed, the operator will try to remove it"
is installed, the operator will try to remove it \n - \"Unmanaged\"
: the operator will not take any action related to the component"
enum:
- Managed
- Removed
- Unmanaged
pattern: ^(Managed|Unmanaged|Force|Removed)$
type: string
type: object
Expand Down
4 changes: 2 additions & 2 deletions config/manifests/bases/opendatahub-operator.clusterserviceversion.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ spec:
apiservicedefinitions: {}
customresourcedefinitions:
owned:
- description: DataScienceCluster is the Schema for the datascienceclusters API
- description: DataScienceCluster is the Schema for the datascienceclusters API.
displayName: Data Science Cluster
kind: DataScienceCluster
name: datascienceclusters.datasciencecluster.opendatahub.io
Expand All @@ -69,7 +69,7 @@ spec:
displayName: Components
path: components
version: v1
- description: DSCInitialization is the Schema for the dscinitializations API
- description: DSCInitialization is the Schema for the dscinitializations API.
displayName: DSC Initialization
kind: DSCInitialization
name: dscinitializations.dscinitialization.opendatahub.io
Expand Down
Loading

0 comments on commit 78debd3

Please sign in to comment.