chore: hide genai helm values config and fix var name (#8821)

determined-ai · Feb 10, 2024 · f300d97 · f300d97
1 parent 6206bde
commit f300d97
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 60 deletions.
diff --git a/helm/charts/determined/templates/genai/genai-deployment.yaml b/helm/charts/determined/templates/genai/genai-deployment.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.genai.version }}
+{{- if (and .Values.genai .Values.genai.version) }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

diff --git a/helm/charts/determined/templates/genai/genai-persistent-volume-claim.yaml b/helm/charts/determined/templates/genai/genai-persistent-volume-claim.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.genai.version (not .Values.genai.sharedPVCName) }}
+{{- if (and .Values.genai .Values.genai.version (not .Values.genai.sharedPVCName)) }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:

diff --git a/helm/charts/determined/templates/genai/genai-resource-pool-metadata.yaml b/helm/charts/determined/templates/genai/genai-resource-pool-metadata.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.genai.version }}
+{{- if (and .Values.genai .Values.genai.version) }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -10,11 +10,11 @@ metadata:
 data:
   resource_pool_metadata.yaml: |
     {{- $resource_pools := include "genai.allResourcePoolNames" . | fromJsonArray }}
-    {{- $metadata := (required "A valid .Values.genai.extra_resource_pool_metadata entry required!" .Values.genai.extra_resource_pool_metadata) }}
+    {{- $metadata := (required "A valid .Values.genai.extraResourcePoolMetadata entry required!" .Values.genai.extraResourcePoolMetadata) }}
     {{- range $k, $v := $metadata }}
       {{- if not (has $k $resource_pools) }}
-        {{- $k | printf ".Values.genai.extra_resource_pool_metadata defines a resource_pool '%s' which is not present in the .Values.resourcePools" | fail }}
+        {{- $k | printf ".Values.genai.extraResourcePoolMetadata defines a resource_pool '%s' which is not present in the .Values.resourcePools" | fail }}
       {{- end }}
     {{- end }}
-    {{- toYaml .Values.genai.extra_resource_pool_metadata | nindent 4 }}
+    {{- toYaml .Values.genai.extraResourcePoolMetadata | nindent 4 }}
 {{- end }}
diff --git a/helm/charts/determined/templates/genai/genai-service-account.yaml b/helm/charts/determined/templates/genai/genai-service-account.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.genai.version }}
+{{- if (and .Values.genai .Values.genai.version) }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:

diff --git a/helm/charts/determined/templates/genai/genai-service.yaml b/helm/charts/determined/templates/genai/genai-service.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.genai.version }}
+{{- if (and .Values.genai .Values.genai.version) }}
 apiVersion: v1
 kind: Service
 metadata:

diff --git a/helm/charts/determined/templates/master-config.yaml b/helm/charts/determined/templates/master-config.yaml
@@ -132,7 +132,7 @@ stringData:
     {{- end }}
     {{- end }}
 
-    {{- if .Values.genai.version }}
+    {{- if (and .Values.genai .Values.genai.version) }}
     feature_switches:
       - genai
 

diff --git a/helm/charts/determined/values.yaml b/helm/charts/determined/values.yaml
@@ -338,54 +338,3 @@ resourcePools:
   - pool_name: default
 # defaultAuxResourcePool: default
 # defaultComputeResourcePool: default
-
-## Configure GenAI Deployment
-genai:
-  ## Version of GenAI to use. If unset, GenAI will not be deployed
-  # version: "release"
-
-  ## Port for GenAI to use
-  port: 9011
-
-  ## Secret to pull the GenAI image
-  # imagePullSecretName:
-
-  ## GenAI pod memory request
-  memRequest: 1Gi
-
-  ## GenAI pod cpu request
-  cpuRequest: 100m
-
-  ## GenAI pod memory limit
-  # memLimit: 1Gi
-
-  ## GenAI pod cpu limit
-  # cpuLimit: 2
-
-  ## PVC Name for the shared file system for GenAI.
-  ## Note: Either `sharedPVCName` or `generatedPVC.storageSize` (to
-  ## generate a new PVC) is required for GenAI deployment
-  # sharedPVCName:
-
-  ## Spec for the generated PVC for GenAI
-  ## Note: In order to generate a shared PVC, you will need access to a
-  ## StorageClass that can provide a ReadWriteMany volume
-  generatedPVC:
-    ## Storage class name for the generated PVC
-    storageClassName: standard-rwx
-
-    ## Size of the generated PVC
-    storageSize: 100Gi
-
-  ## Extra Resource Pool Metadata is hardcoded information about the
-  ## GPUs available to the resource pools. This information
-  ## is not provided in k8s so we provide it directly.
-  ## Note: All resource pools defined here need to also be reflected in
-  ## the .Values.resourcePools.
-  # extra_resource_pool_metadata:
-  #   a100:
-  #     gpu_type: A100
-  #     max_agents: 3
-  #   v100:
-  #     gpu_type: V100
-  #     max_agents: 2