From 2d442b0786178d0d3b96fa5c6c83a93200a25788 Mon Sep 17 00:00:00 2001 From: "Shiva Krishna, Merla" Date: Fri, 7 Mar 2025 12:03:33 -0800 Subject: [PATCH 1/7] Update CR samples with defaults from ansible playbook Signed-off-by: Shiva Krishna, Merla --- .../samples/apps_v1alpha1_nemocustomizer.yaml | 4 +-- .../samples/apps_v1alpha1_nemodatastore.yaml | 4 +-- .../samples/apps_v1alpha1_nemoevaluator.yaml | 2 +- .../samples/apps_v1alpha1_nemoguardrails.yaml | 25 +------------------ 4 files changed, 6 insertions(+), 29 deletions(-) diff --git a/config/samples/apps_v1alpha1_nemocustomizer.yaml b/config/samples/apps_v1alpha1_nemocustomizer.yaml index ff50e19f..2fb5c2e9 100644 --- a/config/samples/apps_v1alpha1_nemocustomizer.yaml +++ b/config/samples/apps_v1alpha1_nemocustomizer.yaml @@ -9,7 +9,7 @@ metadata: spec: wandbSecret: name: wandb-secret - apiKeyKey: encryption_key + apiKeyKey: encryptionKey otel: exporterOtlpEndpoint: http://:4317 databaseConfig: @@ -17,7 +17,7 @@ spec: user: ncsuser secretName: ncs-pg-existing-secret passwordKey: password - host: customizer-pg + host: customizer-pg-postgresql.nemo.svc.cluster.local port: 5432 databaseName: ncsdb expose: diff --git a/config/samples/apps_v1alpha1_nemodatastore.yaml b/config/samples/apps_v1alpha1_nemodatastore.yaml index 0dfb73fe..b0a1b45f 100644 --- a/config/samples/apps_v1alpha1_nemodatastore.yaml +++ b/config/samples/apps_v1alpha1_nemodatastore.yaml @@ -19,7 +19,7 @@ spec: secretName: nds-minio-existing-secret passwordKey: objectStoreSecret serveDirect: true - endpoint: minio.nemo.svc.cluster.local:9000 + endpoint: datastore-minio.nemo.svc.cluster.local:9000 bucketName: datastore-dev region: object-store-region ssl: false @@ -28,7 +28,7 @@ spec: user: ndsuser secretName: nds-pg-existing-secret passwordKey: password - host: nds-pg-postgresql.nemo.svc.cluster.local + host: datastore-pg-postgresql.nemo.svc.cluster.local port: 5432 databaseName: ndsdb pvc: diff --git a/config/samples/apps_v1alpha1_nemoevaluator.yaml b/config/samples/apps_v1alpha1_nemoevaluator.yaml index 00ead2e9..5b8da88f 100644 --- a/config/samples/apps_v1alpha1_nemoevaluator.yaml +++ b/config/samples/apps_v1alpha1_nemoevaluator.yaml @@ -8,7 +8,7 @@ metadata: namespace: nemo spec: image: - repository: nvcr.io/nvidia/nemo-microservices/evaluation-ms + repository: nvcr.io/nvidia/nemo-microservices/evaluator tag: "25.02" pullPolicy: IfNotPresent pullSecrets: [] diff --git a/config/samples/apps_v1alpha1_nemoguardrails.yaml b/config/samples/apps_v1alpha1_nemoguardrails.yaml index d9aa9bf2..22ab5280 100644 --- a/config/samples/apps_v1alpha1_nemoguardrails.yaml +++ b/config/samples/apps_v1alpha1_nemoguardrails.yaml @@ -5,6 +5,7 @@ metadata: app.kubernetes.io/name: k8s-nim-operator app.kubernetes.io/managed-by: k8s-nim-operator name: nemoguardrails-sample + namespace: nemo spec: authSecret: ngc-api-secret configStore: @@ -27,34 +28,10 @@ spec: - ngc-secret repository: nvcr.io/nvidian/nemo-llm/nemo-guardrails-microservice tag: "25.02-rc4" - livenessProbe: - enabled: true - probe: - httpGet: - path: /v1/health - port: 7331 - initialDelaySeconds: 5 - timeoutSeconds: 30 metrics: serviceMonitor: {} - readinessProbe: - enabled: true - probe: - httpGet: - path: /v1/health - port: 7331 - initialDelaySeconds: 5 - timeoutSeconds: 30 replicas: 1 resources: limits: cpu: "1" ephemeral-storage: 10Gi - startupProbe: - enabled: true - probe: - httpGet: - path: /v1/health - port: 7331 - initialDelaySeconds: 5 - timeoutSeconds: 30 From bb818cbada09d792a4736ae4932af0eae3958b2d Mon Sep 17 00:00:00 2001 From: "Shiva Krishna, Merla" Date: Fri, 7 Mar 2025 12:15:45 -0800 Subject: [PATCH 2/7] Update customizer service defaults Signed-off-by: Shiva Krishna, Merla --- config/samples/apps_v1alpha1_nemocustomizer.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/samples/apps_v1alpha1_nemocustomizer.yaml b/config/samples/apps_v1alpha1_nemocustomizer.yaml index 2fb5c2e9..916a5f82 100644 --- a/config/samples/apps_v1alpha1_nemocustomizer.yaml +++ b/config/samples/apps_v1alpha1_nemocustomizer.yaml @@ -11,7 +11,8 @@ spec: name: wandb-secret apiKeyKey: encryptionKey otel: - exporterOtlpEndpoint: http://:4317 + enabled: true + exporterOtlpEndpoint: http://customizer-otel-opentelemetry-collector.nemo.svc.cluster.local:4317 databaseConfig: credentials: user: ncsuser From 9bc93ac3c14be3980ec2aef90c110f4cb231719a Mon Sep 17 00:00:00 2001 From: "Shiva Krishna, Merla" Date: Fri, 7 Mar 2025 12:42:35 -0800 Subject: [PATCH 3/7] Update DB host for entity-store Signed-off-by: Shiva Krishna, Merla --- config/samples/apps_v1alpha1_nemoentitystore.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/samples/apps_v1alpha1_nemoentitystore.yaml b/config/samples/apps_v1alpha1_nemoentitystore.yaml index dfe117f9..cbd01d2c 100644 --- a/config/samples/apps_v1alpha1_nemoentitystore.yaml +++ b/config/samples/apps_v1alpha1_nemoentitystore.yaml @@ -22,7 +22,7 @@ spec: port: 8000 databaseConfig: databaseName: nesdb - host: entity-store-pg + host: entity-store-pg-postgresql.nemo.svc.cluster.local port: 5432 credentials: user: nesuser From 634ff726f0f26f7a7c97b0cfcf80e69b4803bfa2 Mon Sep 17 00:00:00 2001 From: "Shiva Krishna, Merla" Date: Fri, 7 Mar 2025 14:18:19 -0800 Subject: [PATCH 4/7] Update guardrails to 25.03 Signed-off-by: Shiva Krishna, Merla --- config/samples/apps_v1alpha1_nemoguardrails.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/samples/apps_v1alpha1_nemoguardrails.yaml b/config/samples/apps_v1alpha1_nemoguardrails.yaml index 22ab5280..5274726b 100644 --- a/config/samples/apps_v1alpha1_nemoguardrails.yaml +++ b/config/samples/apps_v1alpha1_nemoguardrails.yaml @@ -26,8 +26,8 @@ spec: pullPolicy: IfNotPresent pullSecrets: - ngc-secret - repository: nvcr.io/nvidian/nemo-llm/nemo-guardrails-microservice - tag: "25.02-rc4" + repository: nvcr.io/nvidian/nemo-llm/guardrails + tag: "25.03-rc16" metrics: serviceMonitor: {} replicas: 1 From 31f12e76455fe0f4e3a2da6e0abb4d46c3093f36 Mon Sep 17 00:00:00 2001 From: "Shiva Krishna, Merla" Date: Fri, 7 Mar 2025 14:20:04 -0800 Subject: [PATCH 5/7] revert evaluator Signed-off-by: Shiva Krishna, Merla --- config/samples/apps_v1alpha1_nemoevaluator.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/samples/apps_v1alpha1_nemoevaluator.yaml b/config/samples/apps_v1alpha1_nemoevaluator.yaml index 5b8da88f..00ead2e9 100644 --- a/config/samples/apps_v1alpha1_nemoevaluator.yaml +++ b/config/samples/apps_v1alpha1_nemoevaluator.yaml @@ -8,7 +8,7 @@ metadata: namespace: nemo spec: image: - repository: nvcr.io/nvidia/nemo-microservices/evaluator + repository: nvcr.io/nvidia/nemo-microservices/evaluation-ms tag: "25.02" pullPolicy: IfNotPresent pullSecrets: [] From 20a54e9831317cf635e43608d4691c0962e2dd59 Mon Sep 17 00:00:00 2001 From: "Shiva Krishna, Merla" Date: Thu, 13 Mar 2025 10:36:45 -0700 Subject: [PATCH 6/7] Update all NeMo services to 25.03 release Signed-off-by: Shiva Krishna, Merla --- config/samples/apps_v1alpha1_nemocustomizer.yaml | 8 ++++---- config/samples/apps_v1alpha1_nemodatastore.yaml | 4 ++-- config/samples/apps_v1alpha1_nemoentitystore.yaml | 4 ++-- config/samples/apps_v1alpha1_nemoevaluator.yaml | 7 ++++--- config/samples/apps_v1alpha1_nemoguardrails.yaml | 4 ++-- config/samples/apps_v1alpha1_nimcache.yaml | 2 +- config/samples/apps_v1alpha1_nimpipeline.yaml | 4 ++-- config/samples/apps_v1alpha1_nimservice.yaml | 4 ++-- 8 files changed, 19 insertions(+), 18 deletions(-) diff --git a/config/samples/apps_v1alpha1_nemocustomizer.yaml b/config/samples/apps_v1alpha1_nemocustomizer.yaml index 916a5f82..1c0b8b82 100644 --- a/config/samples/apps_v1alpha1_nemocustomizer.yaml +++ b/config/samples/apps_v1alpha1_nemocustomizer.yaml @@ -32,8 +32,8 @@ spec: port: 9009 protocol: TCP image: - repository: "nvcr.io/nvidian/nemo-llm/customizer" - tag: "25.03-rc11" + repository: nvcr.io/nvidia/nemo-microservices/customizer + tag: "25.03" pullPolicy: IfNotPresent pullSecrets: - ngc-secret @@ -45,7 +45,7 @@ spec: training: queue: "default" - image: "nvcr.io/nvidian/nemo-llm/customizer-api:25.03-rc11" + image: "nvcr.io/nvidia/nemo-microservices/customizer-api:25.03" imagePullSecrets: - name: ngc-secret pvc: @@ -487,5 +487,5 @@ spec: # turn_end: <|eot_id|> nemo_data_store_tools: - image: nvcr.io/nvidian/nemo-llm/nds-v2-huggingface-cli:25.03-rc11 + image: nvcr.io/nvidia/nemo-microservices/nds-v2-huggingface-cli:25.03 imagePullSecret: ngc-secret diff --git a/config/samples/apps_v1alpha1_nemodatastore.yaml b/config/samples/apps_v1alpha1_nemodatastore.yaml index b0a1b45f..61b0a05d 100644 --- a/config/samples/apps_v1alpha1_nemodatastore.yaml +++ b/config/samples/apps_v1alpha1_nemodatastore.yaml @@ -42,8 +42,8 @@ spec: port: 3000 type: ClusterIP image: - repository: "nvcr.io/nvidian/nemo-llm/datastore" - tag: "25.03-rc11" + repository: nvcr.io/nvidia/nemo-microservices/datastore + tag: "25.03" pullPolicy: IfNotPresent pullSecrets: - ngc-secret diff --git a/config/samples/apps_v1alpha1_nemoentitystore.yaml b/config/samples/apps_v1alpha1_nemoentitystore.yaml index cbd01d2c..743750af 100644 --- a/config/samples/apps_v1alpha1_nemoentitystore.yaml +++ b/config/samples/apps_v1alpha1_nemoentitystore.yaml @@ -9,8 +9,8 @@ metadata: namespace: nemo spec: image: - repository: nvcr.io/nvidian/nemo-llm/entity-store - tag: "25.03-rc11" + repository: nvcr.io/nvidia/nemo-microservices/entity-store + tag: "25.03" pullPolicy: IfNotPresent pullSecrets: - ngc-secret diff --git a/config/samples/apps_v1alpha1_nemoevaluator.yaml b/config/samples/apps_v1alpha1_nemoevaluator.yaml index 00ead2e9..72ff0a5e 100644 --- a/config/samples/apps_v1alpha1_nemoevaluator.yaml +++ b/config/samples/apps_v1alpha1_nemoevaluator.yaml @@ -8,10 +8,11 @@ metadata: namespace: nemo spec: image: - repository: nvcr.io/nvidia/nemo-microservices/evaluation-ms - tag: "25.02" + repository: nvcr.io/nvidia/nemo-microservices/evaluator + tag: "25.03" pullPolicy: IfNotPresent - pullSecrets: [] + pullSecrets: + - ngc-secret expose: service: port: 7331 diff --git a/config/samples/apps_v1alpha1_nemoguardrails.yaml b/config/samples/apps_v1alpha1_nemoguardrails.yaml index 5274726b..0560d84e 100644 --- a/config/samples/apps_v1alpha1_nemoguardrails.yaml +++ b/config/samples/apps_v1alpha1_nemoguardrails.yaml @@ -26,8 +26,8 @@ spec: pullPolicy: IfNotPresent pullSecrets: - ngc-secret - repository: nvcr.io/nvidian/nemo-llm/guardrails - tag: "25.03-rc16" + repository: nvcr.io/nvidia/nemo-microservices/guardrails + tag: "25.03" metrics: serviceMonitor: {} replicas: 1 diff --git a/config/samples/apps_v1alpha1_nimcache.yaml b/config/samples/apps_v1alpha1_nimcache.yaml index 75af43f2..c06c3dd1 100644 --- a/config/samples/apps_v1alpha1_nimcache.yaml +++ b/config/samples/apps_v1alpha1_nimcache.yaml @@ -8,7 +8,7 @@ metadata: spec: source: ngc: - modelPuller: nvcr.io/nim/meta/llama3-8b-instruct:1.0.3 + modelPuller: nvcr.io/nim/meta/llama-3.1-8b-instruct:1.3.3 pullSecret: ngc-secret authSecret: ngc-api-secret model: diff --git a/config/samples/apps_v1alpha1_nimpipeline.yaml b/config/samples/apps_v1alpha1_nimpipeline.yaml index 75c8fd28..dba7c123 100644 --- a/config/samples/apps_v1alpha1_nimpipeline.yaml +++ b/config/samples/apps_v1alpha1_nimpipeline.yaml @@ -11,8 +11,8 @@ spec: enabled: true spec: image: - repository: nvcr.io/nim/meta/llama3-8b-instruct - tag: 1.0.3 + repository: nvcr.io/nim/meta/llama-3.1-8b-instruct + tag: 1.3.3 pullPolicy: IfNotPresent pullSecrets: - ngc-secret diff --git a/config/samples/apps_v1alpha1_nimservice.yaml b/config/samples/apps_v1alpha1_nimservice.yaml index 009c5609..03688062 100644 --- a/config/samples/apps_v1alpha1_nimservice.yaml +++ b/config/samples/apps_v1alpha1_nimservice.yaml @@ -7,8 +7,8 @@ metadata: name: meta-llama3-8b-instruct spec: image: - repository: nvcr.io/nim/meta/llama3-8b-instruct - tag: 1.0.3 + repository: nvcr.io/nim/meta/llama-3.1-8b-instruct: + tag: 1.3.3 pullPolicy: IfNotPresent pullSecrets: - ngc-secret From 5fdb0a532c3efb03f48636e8a4d528bc65ef41cf Mon Sep 17 00:00:00 2001 From: "Shiva Krishna, Merla" Date: Thu, 13 Mar 2025 14:27:43 -0700 Subject: [PATCH 7/7] Update secret names to match between ansible and CR samples Signed-off-by: Shiva Krishna, Merla --- config/samples/apps_v1alpha1_nemocustomizer.yaml | 2 +- config/samples/apps_v1alpha1_nemodatastore.yaml | 4 ++-- config/samples/apps_v1alpha1_nemoentitystore.yaml | 2 +- config/samples/apps_v1alpha1_nemoevaluator.yaml | 2 +- config/samples/apps_v1alpha1_nimservice.yaml | 2 +- .../nemo-dependencies/customizer/templates/secrets.yaml.j2 | 2 +- .../e2e/nemo-dependencies/datastore/templates/secrets.yaml.j2 | 4 ++-- .../nemo-dependencies/entity-store/templates/secrets.yaml.j2 | 2 +- .../e2e/nemo-dependencies/evaluator/templates/secrets.yaml.j2 | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config/samples/apps_v1alpha1_nemocustomizer.yaml b/config/samples/apps_v1alpha1_nemocustomizer.yaml index 1c0b8b82..54f7fb4e 100644 --- a/config/samples/apps_v1alpha1_nemocustomizer.yaml +++ b/config/samples/apps_v1alpha1_nemocustomizer.yaml @@ -16,7 +16,7 @@ spec: databaseConfig: credentials: user: ncsuser - secretName: ncs-pg-existing-secret + secretName: customizer-pg-existing-secret passwordKey: password host: customizer-pg-postgresql.nemo.svc.cluster.local port: 5432 diff --git a/config/samples/apps_v1alpha1_nemodatastore.yaml b/config/samples/apps_v1alpha1_nemodatastore.yaml index 61b0a05d..33037592 100644 --- a/config/samples/apps_v1alpha1_nemodatastore.yaml +++ b/config/samples/apps_v1alpha1_nemodatastore.yaml @@ -16,7 +16,7 @@ spec: objectStoreConfig: credentials: user: minioUser - secretName: nds-minio-existing-secret + secretName: datastore-minio-existing-secret passwordKey: objectStoreSecret serveDirect: true endpoint: datastore-minio.nemo.svc.cluster.local:9000 @@ -26,7 +26,7 @@ spec: databaseConfig: credentials: user: ndsuser - secretName: nds-pg-existing-secret + secretName: datastore-pg-existing-secret passwordKey: password host: datastore-pg-postgresql.nemo.svc.cluster.local port: 5432 diff --git a/config/samples/apps_v1alpha1_nemoentitystore.yaml b/config/samples/apps_v1alpha1_nemoentitystore.yaml index 743750af..d2522407 100644 --- a/config/samples/apps_v1alpha1_nemoentitystore.yaml +++ b/config/samples/apps_v1alpha1_nemoentitystore.yaml @@ -26,5 +26,5 @@ spec: port: 5432 credentials: user: nesuser - secretName: nes-pg-existing-secret + secretName: entity-store-pg-existing-secret passwordKey: password diff --git a/config/samples/apps_v1alpha1_nemoevaluator.yaml b/config/samples/apps_v1alpha1_nemoevaluator.yaml index 72ff0a5e..297975f4 100644 --- a/config/samples/apps_v1alpha1_nemoevaluator.yaml +++ b/config/samples/apps_v1alpha1_nemoevaluator.yaml @@ -29,6 +29,6 @@ spec: databaseName: evaldb credentials: user: evaluser - secretName: nev-pg-existing-secret + secretName: evaluator-pg-existing-secret passwordKey: password replicas: 1 diff --git a/config/samples/apps_v1alpha1_nimservice.yaml b/config/samples/apps_v1alpha1_nimservice.yaml index 03688062..66b74f05 100644 --- a/config/samples/apps_v1alpha1_nimservice.yaml +++ b/config/samples/apps_v1alpha1_nimservice.yaml @@ -7,7 +7,7 @@ metadata: name: meta-llama3-8b-instruct spec: image: - repository: nvcr.io/nim/meta/llama-3.1-8b-instruct: + repository: nvcr.io/nim/meta/llama-3.1-8b-instruct tag: 1.3.3 pullPolicy: IfNotPresent pullSecrets: diff --git a/test/e2e/nemo-dependencies/customizer/templates/secrets.yaml.j2 b/test/e2e/nemo-dependencies/customizer/templates/secrets.yaml.j2 index ccb241a3..e10f786f 100644 --- a/test/e2e/nemo-dependencies/customizer/templates/secrets.yaml.j2 +++ b/test/e2e/nemo-dependencies/customizer/templates/secrets.yaml.j2 @@ -1,7 +1,7 @@ apiVersion: v1 kind: Secret metadata: - name: ncs-pg-existing-secret + name: customizer-pg-existing-secret namespace: {{ namespace }} type: Opaque stringData: diff --git a/test/e2e/nemo-dependencies/datastore/templates/secrets.yaml.j2 b/test/e2e/nemo-dependencies/datastore/templates/secrets.yaml.j2 index 267a5ec8..314d6645 100644 --- a/test/e2e/nemo-dependencies/datastore/templates/secrets.yaml.j2 +++ b/test/e2e/nemo-dependencies/datastore/templates/secrets.yaml.j2 @@ -339,7 +339,7 @@ data: apiVersion: v1 kind: Secret metadata: - name: nds-pg-existing-secret + name: datastore-pg-existing-secret namespace: {{ namespace }} type: Opaque stringData: @@ -348,7 +348,7 @@ stringData: apiVersion: v1 kind: Secret metadata: - name: nds-minio-existing-secret + name: datastore-minio-existing-secret namespace: {{ namespace }} type: Opaque stringData: diff --git a/test/e2e/nemo-dependencies/entity-store/templates/secrets.yaml.j2 b/test/e2e/nemo-dependencies/entity-store/templates/secrets.yaml.j2 index a7ecabe7..22e31d5c 100644 --- a/test/e2e/nemo-dependencies/entity-store/templates/secrets.yaml.j2 +++ b/test/e2e/nemo-dependencies/entity-store/templates/secrets.yaml.j2 @@ -1,7 +1,7 @@ apiVersion: v1 kind: Secret metadata: - name: nes-pg-existing-secret + name: entity-store-pg-existing-secret namespace: {{ namespace }} type: Opaque stringData: diff --git a/test/e2e/nemo-dependencies/evaluator/templates/secrets.yaml.j2 b/test/e2e/nemo-dependencies/evaluator/templates/secrets.yaml.j2 index c2018e2e..b65c1c07 100644 --- a/test/e2e/nemo-dependencies/evaluator/templates/secrets.yaml.j2 +++ b/test/e2e/nemo-dependencies/evaluator/templates/secrets.yaml.j2 @@ -1,7 +1,7 @@ apiVersion: v1 kind: Secret metadata: - name: nev-pg-existing-secret + name: evaluator-pg-existing-secret namespace: {{ namespace }} type: Opaque stringData: