Skip to content

Commit

Permalink
add manifests for 0.11 alpha
Browse files Browse the repository at this point in the history
  • Loading branch information
@VedantMahabaleshwarkar
VedantMahabaleshwarkar committed Mar 23, 2023
1 parent 98985ee commit 73f2f3d
Show file tree
Hide file tree
Showing 55 changed files with 616 additions and 322 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ifeq (run,$(firstword $(MAKECMDGOALS)))
endif

# Container Engine to be used for building images
ENGINE ?= "docker"
ENGINE ?= "podman"

# Image URL to use all building/pushing image targets
IMG ?= kserve/modelmesh-controller:latest
Expand Down
2 changes: 1 addition & 1 deletion config/internal/base/deployment.yaml.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ spec:
app.kubernetes.io/name: modelmesh-controller
name: {{.ServiceName}}-{{.Name}}
spec:
serviceAccountName: {{.ServiceAccountName}}
serviceAccountName: modelmesh-serving-sa
volumes:
- name: proxy-tls
secret:
Expand Down
9 changes: 2 additions & 7 deletions controllers/modelmesh/runtime.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
Expand Down Expand Up @@ -82,9 +82,6 @@ func (m *Deployment) addVolumesToDeployment(deployment *appsv1.Deployment) error
volumes = append(volumes, storageVolume)
}

<<<<<<< HEAD
deployment.Spec.Template.Spec.Volumes = append(deployment.Spec.Template.Spec.Volumes, volumes...)
=======
// need to add pvc volumes
for _, pvcName := range m.PVCs {
pvcVolume := corev1.Volume{
Expand All @@ -100,9 +97,7 @@ func (m *Deployment) addVolumesToDeployment(deployment *appsv1.Deployment) error
volumes = append(volumes, pvcVolume)
}

deployment.Spec.Template.Spec.Volumes = volumes
>>>>>>> f794ffc (Feat: Add PVC storage support (#267))

deployment.Spec.Template.Spec.Volumes = append(deployment.Spec.Template.Spec.Volumes, volumes...)
return nil
}

Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,4 +130,4 @@ replace (

// Update prometheus client to avoid CVE-2022-21698
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.12.1
)
)
2 changes: 1 addition & 1 deletion go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1427,4 +1427,4 @@ sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZa
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
4 changes: 2 additions & 2 deletions manifests/opendatahub/base/params.env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ meshnamespace=
monitoring-namespace=
odh-mm-rest-proxy=quay.io/opendatahub/rest-proxy:v0.9.3-auth
odh-modelmesh-runtime-adapter=quay.io/opendatahub/modelmesh-runtime-adapter:v0.9.3-auth
odh-modelmesh=quay.io/opendatahub/modelmesh:v0.9.3-auth
odh-modelmesh=quay.io/vedantm/modelmesh:v0.11.0-alpha
odh-openvino=quay.io/opendatahub/openvino_model_server:2022.3-gpu
odh-modelmesh-controller=quay.io/opendatahub/modelmesh-controller:v0.9.3-auth
odh-modelmesh-controller=quay.io/vedantm/modelmesh-controller:v0.11.0-alpha
odh-model-controller=quay.io/opendatahub/odh-model-controller:v0.9.6-auth
47 changes: 46 additions & 1 deletion manifests/opendatahub/crd/bases/serving.kserve.io_clusterservingruntimes.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copied from https://github.com/kserve/kserve/blob/39ec2d19de1d856a9527b800fda8fb380bc9441f/config/crd/serving.kserve.io_clusterservingruntimes.yaml
# Copied from https://github.com/kserve/kserve/blob/335dfbcc461a3b2127354aeb7df2414fb11ddfe3/config/crd/serving.kserve.io_clusterservingruntimes.yaml
#
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
Expand Down Expand Up @@ -395,6 +395,10 @@ spec:
type: array
type: object
type: object
annotations:
additionalProperties:
type: string
type: object
builtInAdapter:
properties:
env:
Expand Down Expand Up @@ -677,6 +681,16 @@ spec:
failureThreshold:
format: int32
type: integer
grpc:
properties:
port:
format: int32
type: integer
service:
type: string
required:
- port
type: object
httpGet:
properties:
host:
Expand Down Expand Up @@ -771,6 +785,16 @@ spec:
failureThreshold:
format: int32
type: integer
grpc:
properties:
port:
format: int32
type: integer
service:
type: string
required:
- port
type: object
httpGet:
properties:
host:
Expand Down Expand Up @@ -919,6 +943,16 @@ spec:
failureThreshold:
format: int32
type: integer
grpc:
properties:
port:
format: int32
type: integer
service:
type: string
required:
- port
type: object
httpGet:
properties:
host:
Expand Down Expand Up @@ -1031,6 +1065,17 @@ spec:
type: string
httpDataEndpoint:
type: string
imagePullSecrets:
items:
properties:
name:
type: string
type: object
type: array
labels:
additionalProperties:
type: string
type: object
multiModel:
type: boolean
nodeSelector:
Expand Down
47 changes: 46 additions & 1 deletion manifests/opendatahub/crd/bases/serving.kserve.io_servingruntimes.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copied from https://github.com/kserve/kserve/blob/39ec2d19de1d856a9527b800fda8fb380bc9441f/config/crd/serving.kserve.io_servingruntimes.yaml
# Copied from https://github.com/kserve/kserve/blob/335dfbcc461a3b2127354aeb7df2414fb11ddfe3/config/crd/serving.kserve.io_servingruntimes.yaml
#
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
Expand Down Expand Up @@ -395,6 +395,10 @@ spec:
type: array
type: object
type: object
annotations:
additionalProperties:
type: string
type: object
builtInAdapter:
properties:
env:
Expand Down Expand Up @@ -677,6 +681,16 @@ spec:
failureThreshold:
format: int32
type: integer
grpc:
properties:
port:
format: int32
type: integer
service:
type: string
required:
- port
type: object
httpGet:
properties:
host:
Expand Down Expand Up @@ -771,6 +785,16 @@ spec:
failureThreshold:
format: int32
type: integer
grpc:
properties:
port:
format: int32
type: integer
service:
type: string
required:
- port
type: object
httpGet:
properties:
host:
Expand Down Expand Up @@ -919,6 +943,16 @@ spec:
failureThreshold:
format: int32
type: integer
grpc:
properties:
port:
format: int32
type: integer
service:
type: string
required:
- port
type: object
httpGet:
properties:
host:
Expand Down Expand Up @@ -1031,6 +1065,17 @@ spec:
type: string
httpDataEndpoint:
type: string
imagePullSecrets:
items:
properties:
name:
type: string
type: object
type: array
labels:
additionalProperties:
type: string
type: object
multiModel:
type: boolean
nodeSelector:
Expand Down
3 changes: 1 addition & 2 deletions manifests/opendatahub/crd/kustomization.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ resources:
# Including creation of Service here for now, will later be done automatically
- bases/serving.kserve.io_predictors.yaml
- bases/serving.kserve.io_inferenceservices.yaml
# ClusterServingRuntime not yet supported by modelmesh-serving
# - bases/serving.kserve.io_clusterservingruntimes.yaml
- bases/serving.kserve.io_clusterservingruntimes.yaml
- bases/serving.kserve.io_servingruntimes.yaml
# +kubebuilder:scaffold:crdkustomizeresource

Expand Down
2 changes: 1 addition & 1 deletion manifests/opendatahub/default/config-defaults.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@ storageHelperResources:
limits:
cpu: "2"
memory: "512Mi"
serviceAccountName: ""
serviceAccountName: "modelmesh-serving-sa"
metrics:
enabled: true
2 changes: 1 addition & 1 deletion manifests/opendatahub/default/kustomization.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,5 +92,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ../crd
- ../rbac
- ../rbac/cluster-scope
- ../manager
34 changes: 2 additions & 32 deletions manifests/opendatahub/dependencies/fvt.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ spec:
- http://0.0.0.0:2379
- --advertise-client-urls
- http://0.0.0.0:2379
image: http://registry.redhat.io/rhel7/etcd@sha256:d3495b263b103681f1b09a558be43c21989bfc269eb90f84c2609042cebdc626
image: quay.io/coreos/etcd:v3.5.4
name: etcd
ports:
- containerPort: 2379
Expand All @@ -56,13 +56,6 @@ spec:
- containerPort: 2380
name: server
protocol: TCP
resources: # ref: https://github.com/coreos/etcd-operator/blob/master/doc/user/spec_examples.md#three-member-cluster-with-resource-requirement
limits:
cpu: 300m
memory: 200Mi
requests:
cpu: 200m
memory: 100Mi
---
apiVersion: v1
kind: Secret
Expand Down Expand Up @@ -113,31 +106,8 @@ spec:
value: AKIAIOSFODNN7EXAMPLE
- name: MINIO_SECRET_KEY
value: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
resources:
requests:
cpu: 20m
memory: 100Mi
limits:
cpu: 250m
memory: 1Gi
image: kserve/modelmesh-minio-dev-examples:latest
name: minio
livenessProbe:
tcpSocket:
port: 9000
initialDelaySeconds: 30
timeoutSeconds: 1
periodSeconds: 5
successThreshold: 1
failureThreshold: 3
readinessProbe:
tcpSocket:
port: 9000
initialDelaySeconds: 5
timeoutSeconds: 1
periodSeconds: 5
successThreshold: 1
failureThreshold: 3
---
apiVersion: v1
kind: Secret
Expand All @@ -152,4 +122,4 @@ stringData:
"endpoint_url": "http://minio:9000",
"default_bucket": "modelmesh-example-models",
"region": "us-south"
}
}
15 changes: 15 additions & 0 deletions manifests/opendatahub/dependencies/minio-storage-secret.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
apiVersion: v1

kind: Secret
metadata:
name: storage-config
stringData:
localMinIO: |
{
"type": "s3",
"access_key_id": "AKIAIOSFODNN7EXAMPLE",
"secret_access_key": "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY",
"endpoint_url": "http://minio.controller_namespace:9000",
"default_bucket": "modelmesh-example-models",
"region": "us-south"
}
Loading

0 comments on commit 73f2f3d

Please sign in to comment.