Skip to content

Commit

Permalink
update io to sh
Browse files Browse the repository at this point in the history
Signed-off-by: Heba Elayoty <[email protected]>
  • Loading branch information
helayoty committed Oct 13, 2023
1 parent 369abc7 commit d418a82
Show file tree
Hide file tree
Showing 22 changed files with 288 additions and 36 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ watch kubectl describe workspace workspace-llama-2-7b-chat

```bash
Name: workspace-llama-2-7b-aks
Annotations: kubernetes-kaito.io/service-type: load-balancer
API Version: kaito.io/v1alpha1
Annotations: kubernetes-kaito.sh/service-type: load-balancer
API Version: kaito.sh/v1alpha1
Inference:
Preset:
Name: llama-2-7b
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ limitations under the License.
// Package v1alpha1 contains API Schema definitions for the kaito v1alpha1 API group
// +kubebuilder:object:generate=true
// +k8s:defaulter-gen=TypeMeta
// +groupName=kaito.io
// +groupName=kaito.sh
package v1alpha1 // doc.go is discovered by codegen, but not by go build
2 changes: 1 addition & 1 deletion api/v1alpha1/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

var (
// GroupVersion is group version used to register these objects
GroupVersion = schema.GroupVersion{Group: "kaito.io", Version: "v1alpha1"}
GroupVersion = schema.GroupVersion{Group: "kaito.sh", Version: "v1alpha1"}
// AddToScheme adds the types in this group-version to the given scheme.
AddToScheme = SchemeBuilder.AddToScheme
// SchemeBuilder is used to add go types to the GroupVersionKind scheme
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/workspace_labels.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const (
// Non-prefixed labels/annotations are reserved for end-use.

// KAITOPrefix Kubernetes Data Mining prefix.
KAITOPrefix = "kubernetes-kaito.io/"
KAITOPrefix = "kubernetes-kaito.sh/"

// AnnotationServiceType determines whether kaito creates ClusterIP or LoadBalancer type service.
AnnotationServiceType = KAITOPrefix + "service-type"
Expand Down
4 changes: 2 additions & 2 deletions charts/kaito/crds/kdm.io_workspaces.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
name: workspaces.kaito.io
name: workspaces.kaito.sh
spec:
group: kaito.io
group: kaito.sh
names:
categories:
- workspace
Expand Down
6 changes: 3 additions & 3 deletions charts/kaito/templates/clusterrole.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
labels:
{{- include "kaito.labels" . | nindent 4 }}
rules:
- apiGroups: ["kaito.io"]
- apiGroups: ["kaito.sh"]
resources: ["workspaces"]
verbs: ["create", "delete", "update", "patch","get","list","watch"]
- apiGroups: ["kaito.io"]
- apiGroups: ["kaito.sh"]
resources: ["workspaces/status"]
verbs: ["create", "delete", "update", "patch","get","list","watch"]
- apiGroups: [""]
Expand Down Expand Up @@ -39,4 +39,4 @@ rules:
- apiGroups: ["admissionregistration.k8s.io"]
resources: ["validatingwebhookconfigurations"]
verbs: ["update"]
resourceNames: ["validation.webhook.kaito.io"]
resourceNames: ["validation.webhook.kaito.sh"]
6 changes: 3 additions & 3 deletions charts/kaito/templates/webhooks.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apiVersion: admissionregistration.k8s.io/v1
kind: ValidatingWebhookConfiguration
metadata:
name: validation.webhook.kaito.io
name: validation.webhook.kaito.sh
labels:
{{- include "kaito.labels" . | nindent 4 }}
webhooks:
- name: validation.webhook.kaito.io
- name: validation.webhook.kaito.sh
admissionReviewVersions: ["v1"]
clientConfig:
service:
Expand All @@ -16,7 +16,7 @@ webhooks:
sideEffects: None
rules:
- apiGroups:
- kaito.io
- kaito.sh
apiVersions:
- v1alpha1
resources:
Expand Down
4 changes: 2 additions & 2 deletions config/crd/bases/kaito.io_workspaces.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
name: workspaces.kaito.io
name: workspaces.kaito.sh
spec:
group: kaito.io
group: kaito.sh
names:
categories:
- workspace
Expand Down
252 changes: 252 additions & 0 deletions config/crd/bases/kaito.sh_workspaces.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,252 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
name: workspaces.kaito.sh
spec:
group: kaito.sh
names:
categories:
- workspace
kind: Workspace
listKind: WorkspaceList
plural: workspaces
shortNames:
- wk
- wks
singular: workspace
scope: Namespaced
versions:
- additionalPrinterColumns:
- jsonPath: .resource.instanceType
name: Instance
type: string
- jsonPath: .status.condition[?(@.type=="ResourceReady")].status
name: ResourceReady
type: string
- jsonPath: .status.condition[?(@.type=="InferenceReady")].status
name: InferenceReady
type: string
- jsonPath: .status.condition[?(@.type=="WorkspaceReady")].status
name: WorkspaceReady
type: string
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
name: v1alpha1
schema:
openAPIV3Schema:
description: Workspace is the Schema for the workspaces API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
inference:
properties:
preset:
description: Preset describles the model that will be deployed with
preset configurations.
properties:
accessMode:
description: AccessMode specifies whether the containerized model
image is accessible via public registry or private registry.
This field defaults to "public" if not specified. If this field
is "private", user needs to provide the private image information
in PresetOptions.
enum:
- public
- private
type: string
name:
description: Name of the supported models with preset configurations.
type: string
presetOptions:
properties:
image:
description: Image is the name of the containerized model
image.
type: string
imagePullSecrets:
description: ImagePullSecrets is a list of secret names in
the same namespace used for pulling the image.
items:
type: string
type: array
type: object
required:
- name
type: object
template:
description: Template specifies the Pod template used to run the inference
service. Users can specify custom Pod settings if the preset configurations
cannot meet the requirements. Note that if Preset is specified,
Template should not be specified and vice versa.
x-kubernetes-preserve-unknown-fields: true
type: object
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
resource:
description: ResourceSpec desicribes the resource requirement of running
the workload. If the number of nodes in the cluster that meet the InstanceType
and LabelSelector requirements is small than the Count, controller will
provision new nodes before deploying the workload. The final list of
nodes used to run the workload is presented in workspace Status.
properties:
count:
default: 1
description: Count is the required number of GPU nodes.
type: integer
instanceType:
default: Standard_NC12s_v3
description: InstanceType specifies the GPU node SKU. This field defaults
to "Standard_NC12s_v3" if not specified.
type: string
labelSelector:
description: LabelSelector specifies the required labels for the GPU
nodes.
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
The requirements are ANDed.
items:
description: A label selector requirement is a selector that
contains values, a key, and an operator that relates the key
and values.
properties:
key:
description: key is the label key that the selector applies
to.
type: string
operator:
description: operator represents a key's relationship to
a set of values. Valid operators are In, NotIn, Exists
and DoesNotExist.
type: string
values:
description: values is an array of string values. If the
operator is In or NotIn, the values array must be non-empty.
If the operator is Exists or DoesNotExist, the values
array must be empty. This array is replaced during a strategic
merge patch.
items:
type: string
type: array
required:
- key
- operator
type: object
type: array
matchLabels:
additionalProperties:
type: string
description: matchLabels is a map of {key,value} pairs. A single
{key,value} in the matchLabels map is equivalent to an element
of matchExpressions, whose key field is "key", the operator
is "In", and the values array contains only "value". The requirements
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
preferredNodes:
description: PreferredNodes is an optional node list specified by
the user. If a node in the list does not have the required labels
or the required instanceType, it will be ignored.
items:
type: string
type: array
required:
- labelSelector
type: object
status:
description: WorkspaceStatus defines the observed state of Workspace
properties:
conditions:
description: Conditions report the current conditions of the workspace.
items:
description: "Condition contains details for one aspect of the current
state of this API Resource. --- This struct is intended for direct
use as an array at the field path .status.conditions. For example,
\n type FooStatus struct{ // Represents the observations of a
foo's current state. // Known .status.conditions.type are: \"Available\",
\"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
// +listType=map // +listMapKey=type Conditions []metav1.Condition
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
properties:
lastTransitionTime:
description: lastTransitionTime is the last time the condition
transitioned from one status to another. This should be when
the underlying condition changed. If that is not known, then
using the time when the API field changed is acceptable.
format: date-time
type: string
message:
description: message is a human readable message indicating
details about the transition. This may be an empty string.
maxLength: 32768
type: string
observedGeneration:
description: observedGeneration represents the .metadata.generation
that the condition was set based upon. For instance, if .metadata.generation
is currently 12, but the .status.conditions[x].observedGeneration
is 9, the condition is out of date with respect to the current
state of the instance.
format: int64
minimum: 0
type: integer
reason:
description: reason contains a programmatic identifier indicating
the reason for the condition's last transition. Producers
of specific condition types may define expected values and
meanings for this field, and whether the values are considered
a guaranteed API. The value should be a CamelCase string.
This field may not be empty.
maxLength: 1024
minLength: 1
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
type: string
status:
description: status of the condition, one of True, False, Unknown.
enum:
- "True"
- "False"
- Unknown
type: string
type:
description: type of condition in CamelCase or in foo.example.com/CamelCase.
--- Many .condition.type values are consistent across resources
like Available, but because arbitrary conditions can be useful
(see .node.status.conditions), the ability to deconflict is
important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
required:
- lastTransitionTime
- message
- reason
- status
- type
type: object
type: array
workerNodes:
description: WorkerNodes is the list of nodes chosen to run the workload
based on the workspace resource requirement.
items:
type: string
type: array
type: object
type: object
served: true
storage: true
subresources:
status: {}
4 changes: 2 additions & 2 deletions config/crd/bases/kdm.io_workspaces.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
name: workspaces.kaito.io
name: workspaces.kaito.sh
spec:
group: kaito.io
group: kaito.sh
names:
categories:
- workspace
Expand Down
2 changes: 1 addition & 1 deletion config/crd/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# since it depends on service name and namespace that are out of this kustomize package.
# It should be run by config/default
resources:
- bases/kaito.io_workspaces.yaml
- bases/kaito.sh_workspaces.yaml
#+kubebuilder:scaffold:crdkustomizeresource

patches:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/patches/cainjection_in_workspaces.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME
name: workspaces.kaito.io
name: workspaces.kaito.sh
2 changes: 1 addition & 1 deletion config/crd/patches/webhook_in_workspaces.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: workspaces.kaito.io
name: workspaces.kaito.sh
spec:
conversion:
strategy: Webhook
Expand Down
2 changes: 1 addition & 1 deletion config/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: manager-role
rules:
- apiGroups:
- kaito.io
- kaito.sh
resources:
- workspaces
verbs:
Expand Down
Loading

0 comments on commit d418a82

Please sign in to comment.