Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix project scaffolding for all microservices #308

Merged
merged 2 commits into from
Feb 5, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,42 @@ resources:
kind: NIMPipeline
path: github.com/NVIDIA/k8s-nim-operator/api/apps/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
namespaced: true
controller: true
domain: nvidia.com
group: apps
kind: NemoEvaluator
path: github.com/NVIDIA/k8s-nim-operator/api/apps/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
namespaced: true
controller: true
domain: nvidia.com
group: apps
kind: NemoEntitystore
path: github.com/NVIDIA/k8s-nim-operator/api/apps/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
namespaced: true
controller: true
domain: nvidia.com
group: apps
kind: NemoDatastore
path: github.com/NVIDIA/k8s-nim-operator/api/apps/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
namespaced: true
controller: true
domain: nvidia.com
group: apps
kind: NemoGuardrails
path: github.com/NVIDIA/k8s-nim-operator/api/apps/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
namespaced: true
Expand Down
8 changes: 8 additions & 0 deletions config/crd/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ resources:
- bases/apps.nvidia.com_nimcaches.yaml
- bases/apps.nvidia.com_nimpipelines.yaml
- bases/apps.nvidia.com_nemocustomizers.yaml
- bases/apps.nvidia.com_nemoguardrails.yaml
- bases/apps.nvidia.com_nemoevaluators.yaml
- bases/apps.nvidia.com_nemodatastores.yaml
- bases/apps.nvidia.com_nemoentitystores.yaml
# +kubebuilder:scaffold:crdkustomizeresource

patches:
Expand All @@ -20,6 +24,10 @@ patches:
#- path: patches/cainjection_in_nimcaches.yaml
#- path: patches/cainjection_in_nimpipelines.yaml
#- path: patches/cainjection_in_nemocustomizers.yaml
#- path: patches/cainjection_in_nemoguardrails.yaml
#- path: patches/cainjection_in_nemoevaluators.yaml
#- path: patches/cainjection_in_nemodatastores.yaml
#- path: patches/cainjection_in_nemoentitystores.yaml
# +kubebuilder:scaffold:crdkustomizecainjectionpatch

# [WEBHOOK] To enable webhook, uncomment the following section
Expand Down
8 changes: 8 additions & 0 deletions config/rbac/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@ resources:
# if you do not want those helpers be installed with your Project.
- nemocustomizer_editor_role.yaml
- nemocustomizer_viewer_role.yaml
- nemoentitystore_editor_role.yaml
- nemoentitystore_viewer_role.yaml
- nemodatastore_editor_role.yaml
- nemodatastore_viewer_role.yaml
- nemoevaluator_editor_role.yaml
- nemoevaluator_viewer_role.yaml
- nemoguardrails_editor_role.yaml
- nemoguardrails_viewer_role.yaml
- nimpipeline_editor_role.yaml
- nimpipeline_viewer_role.yaml
- nimcache_editor_role.yaml
Expand Down
27 changes: 27 additions & 0 deletions config/rbac/nemodatastore_editor_role.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# permissions for end users to edit nemodatastores.
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
app.kubernetes.io/name: k8s-nim-operator
app.kubernetes.io/managed-by: kustomize
name: nemodatastore-editor-role
rules:
- apiGroups:
- apps.nvidia.com
resources:
- nemodatastores
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- apps.nvidia.com
resources:
- nemodatastores/status
verbs:
- get
23 changes: 23 additions & 0 deletions config/rbac/nemodatastore_viewer_role.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# permissions for end users to view nemodatastores.
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
app.kubernetes.io/name: k8s-nim-operator
app.kubernetes.io/managed-by: kustomize
name: nemodatastore-viewer-role
rules:
- apiGroups:
- apps.nvidia.com
resources:
- nemodatastores
verbs:
- get
- list
- watch
- apiGroups:
- apps.nvidia.com
resources:
- nemodatastores/status
verbs:
- get
27 changes: 27 additions & 0 deletions config/rbac/nemoentitystore_editor_role.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# permissions for end users to edit nemoentitystores.
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
app.kubernetes.io/name: k8s-nim-operator
app.kubernetes.io/managed-by: kustomize
name: nemoentitystore-editor-role
rules:
- apiGroups:
- apps.nvidia.com
resources:
- nemoentitystores
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- apps.nvidia.com
resources:
- nemoentitystores/status
verbs:
- get
23 changes: 23 additions & 0 deletions config/rbac/nemoentitystore_viewer_role.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# permissions for end users to view nemoentitystores.
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
app.kubernetes.io/name: k8s-nim-operator
app.kubernetes.io/managed-by: kustomize
name: nemoentitystore-viewer-role
rules:
- apiGroups:
- apps.nvidia.com
resources:
- nemoentitystores
verbs:
- get
- list
- watch
- apiGroups:
- apps.nvidia.com
resources:
- nemoentitystores/status
verbs:
- get
27 changes: 27 additions & 0 deletions config/rbac/nemoevaluator_editor_role.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# permissions for end users to edit nemoevaluators.
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
app.kubernetes.io/name: k8s-nim-operator
app.kubernetes.io/managed-by: kustomize
name: nemoevaluator-editor-role
rules:
- apiGroups:
- apps.nvidia.com
resources:
- nemoevaluators
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- apps.nvidia.com
resources:
- nemoevaluators/status
verbs:
- get
23 changes: 23 additions & 0 deletions config/rbac/nemoevaluator_viewer_role.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# permissions for end users to view nemoevaluators.
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
app.kubernetes.io/name: k8s-nim-operator
app.kubernetes.io/managed-by: kustomize
name: nemoevaluator-viewer-role
rules:
- apiGroups:
- apps.nvidia.com
resources:
- nemoevaluators
verbs:
- get
- list
- watch
- apiGroups:
- apps.nvidia.com
resources:
- nemoevaluators/status
verbs:
- get
27 changes: 27 additions & 0 deletions config/rbac/nemoguardrails_editor_role.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# permissions for end users to edit nemoguardrails.
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
app.kubernetes.io/name: k8s-nim-operator
app.kubernetes.io/managed-by: kustomize
name: nemoguardrails-editor-role
rules:
- apiGroups:
- apps.nvidia.com
resources:
- nemoguardrails
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- apps.nvidia.com
resources:
- nemoguardrails/status
verbs:
- get
23 changes: 23 additions & 0 deletions config/rbac/nemoguardrails_viewer_role.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# permissions for end users to view nemoguardrails.
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
app.kubernetes.io/name: k8s-nim-operator
app.kubernetes.io/managed-by: kustomize
name: nemoguardrails-viewer-role
rules:
- apiGroups:
- apps.nvidia.com
resources:
- nemoguardrails
verbs:
- get
- list
- watch
- apiGroups:
- apps.nvidia.com
resources:
- nemoguardrails/status
verbs:
- get
80 changes: 80 additions & 0 deletions config/samples/apps_v1alpha1_nemodatastore.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
apiVersion: apps.nvidia.com/v1alpha1
kind: NemoDatastore
metadata:
labels:
app.kubernetes.io/name: k8s-nim-operator
app.kubernetes.io/managed-by: kustomize
name: nemodatastore-sample
spec:
authSecret: ngc-image-pull-secret
secrets:
datastoreConfigSecret: "nemo-ms-nemo-datastore"
datastoreInitSecret: "nemo-ms-nemo-datastore-init"
datastoreInlineConfigSecret: "nemo-ms-nemo-datastore-inline-config"
giteaAdminSecret: "gitea-admin-credentials"
lfsJwtSecret: "nemo-ms-nemo-datastore--lfs-jwt"
objectStoreConfig:
credentials:
user: minioUser
secretName: nds-minio-existing-secret
passwordKey: objectStoreSecret
serveDirect: true
endpoint: minio.k8s-nim-operator-system.svc.cluster.local:9000
bucketName: datastore-dev
region: object-store-region
ssl: false
databaseConfig:
credentials:
user: ndsuser
secretName: nds-pg-existing-secret
passwordKey: postgresPassword
host: nds-pg-postgresql
port: 5432
databaseName: ndsdb
pvc:
name: "pvc-shared-data"
create: true
storageClass: "local-path"
volumeAccessMode: ReadWriteOnce
size: "10Gi"
expose:
service:
port: 3000
type: ClusterIP
image:
repository: "nvcr.io/nvidian/nemo-llm/datastore"
tag: "25.01-rc8"
pullPolicy: IfNotPresent
replicas: 1
resources:
requests:
memory: "256Mi"
cpu: "500m"
limits:
memory: "512Mi"
cpu: "1"
livenessProbe:
enabled: true
probe:
httpGet:
path: /v1/health
port: 3000
scheme: HTTP
initialDelaySeconds: 10
timeoutSeconds: 5
readinessProbe:
enabled: true
probe:
httpGet:
path: /v1/health
port: 3000
scheme: HTTP
initialDelaySeconds: 5
timeoutSeconds: 3
# metrics:
# enabled: true
# serviceMonitor:
# additionalLabels:
# app: sample-nemodatastore
# interval: "30s"
# scrapeTimeout: "10s"
3 changes: 3 additions & 0 deletions config/samples/apps_v1alpha1_nemoentitystore.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
apiVersion: apps.nvidia.com/v1alpha1
kind: NemoEntitystore
metadata:
labels:
app.kubernetes.io/name: k8s-nim-operator
app.kubernetes.io/managed-by: kustomize
name: nemoentitystore-sample
spec:
image:
Expand Down
Loading