diff --git a/config/samples/apps_v1alpha1_nemocustomizer.yaml b/config/samples/apps_v1alpha1_nemocustomizer.yaml index ff50e19f..54f7fb4e 100644 --- a/config/samples/apps_v1alpha1_nemocustomizer.yaml +++ b/config/samples/apps_v1alpha1_nemocustomizer.yaml @@ -9,15 +9,16 @@ metadata: spec: wandbSecret: name: wandb-secret - apiKeyKey: encryption_key + apiKeyKey: encryptionKey otel: - exporterOtlpEndpoint: http://:4317 + enabled: true + exporterOtlpEndpoint: http://customizer-otel-opentelemetry-collector.nemo.svc.cluster.local:4317 databaseConfig: credentials: user: ncsuser - secretName: ncs-pg-existing-secret + secretName: customizer-pg-existing-secret passwordKey: password - host: customizer-pg + host: customizer-pg-postgresql.nemo.svc.cluster.local port: 5432 databaseName: ncsdb expose: @@ -31,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 @@ -44,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: @@ -486,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 0dfb73fe..33037592 100644 --- a/config/samples/apps_v1alpha1_nemodatastore.yaml +++ b/config/samples/apps_v1alpha1_nemodatastore.yaml @@ -16,19 +16,19 @@ spec: objectStoreConfig: credentials: user: minioUser - secretName: nds-minio-existing-secret + secretName: datastore-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 databaseConfig: credentials: user: ndsuser - secretName: nds-pg-existing-secret + secretName: datastore-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: @@ -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 dfe117f9..d2522407 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 @@ -22,9 +22,9 @@ spec: port: 8000 databaseConfig: databaseName: nesdb - host: entity-store-pg + host: entity-store-pg-postgresql.nemo.svc.cluster.local 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 00ead2e9..297975f4 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 @@ -28,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_nemoguardrails.yaml b/config/samples/apps_v1alpha1_nemoguardrails.yaml index d9aa9bf2..0560d84e 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: @@ -25,36 +26,12 @@ spec: pullPolicy: IfNotPresent pullSecrets: - 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 + repository: nvcr.io/nvidia/nemo-microservices/guardrails + tag: "25.03" 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 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..66b74f05 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 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: