From 44dcf0c79a9a1447dfab249056be85c67e8ae81e Mon Sep 17 00:00:00 2001 From: Michael Choi Date: Wed, 30 Oct 2024 00:09:38 +0000 Subject: [PATCH 1/2] Updates to helm charts to sync with SGP --- .../templates/balloon_deployments.yaml | 2 +- .../templates/celery_autoscaler_stateful_set.yaml | 2 +- .../recommended_hardware_config_map.yaml | 2 +- .../templates/service_account_image_builder.yaml | 2 +- .../templates/service_account_inference.yaml | 2 +- .../templates/service_template_config_map.yaml | 10 ++++++++-- .../templates/trigger_authentication.yaml | 15 ++++++++++++++- charts/model-engine/values.yaml | 4 ++++ 8 files changed, 31 insertions(+), 8 deletions(-) diff --git a/charts/model-engine/templates/balloon_deployments.yaml b/charts/model-engine/templates/balloon_deployments.yaml index 3a4e1f20..735aff86 100644 --- a/charts/model-engine/templates/balloon_deployments.yaml +++ b/charts/model-engine/templates/balloon_deployments.yaml @@ -52,4 +52,4 @@ spec: --- {{- end }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/model-engine/templates/celery_autoscaler_stateful_set.yaml b/charts/model-engine/templates/celery_autoscaler_stateful_set.yaml index 810e7e1f..93d359b5 100644 --- a/charts/model-engine/templates/celery_autoscaler_stateful_set.yaml +++ b/charts/model-engine/templates/celery_autoscaler_stateful_set.yaml @@ -109,4 +109,4 @@ spec: name: config-volume {{- end}} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/model-engine/templates/recommended_hardware_config_map.yaml b/charts/model-engine/templates/recommended_hardware_config_map.yaml index 6c999145..b185a5ab 100644 --- a/charts/model-engine/templates/recommended_hardware_config_map.yaml +++ b/charts/model-engine/templates/recommended_hardware_config_map.yaml @@ -27,4 +27,4 @@ data: gpu_type: {{ .gpu_type }} nodes_per_worker: {{ .nodes_per_worker }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/model-engine/templates/service_account_image_builder.yaml b/charts/model-engine/templates/service_account_image_builder.yaml index 8cdec485..e68cd7b2 100644 --- a/charts/model-engine/templates/service_account_image_builder.yaml +++ b/charts/model-engine/templates/service_account_image_builder.yaml @@ -16,4 +16,4 @@ metadata: {{- end }} --- {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/model-engine/templates/service_account_inference.yaml b/charts/model-engine/templates/service_account_inference.yaml index c9fa94fb..9a4a698c 100644 --- a/charts/model-engine/templates/service_account_inference.yaml +++ b/charts/model-engine/templates/service_account_inference.yaml @@ -22,4 +22,4 @@ imagePullSecrets: - name: egp-ecr-regcred {{- end }} --- -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/model-engine/templates/service_template_config_map.yaml b/charts/model-engine/templates/service_template_config_map.yaml index a418557a..6836784c 100644 --- a/charts/model-engine/templates/service_template_config_map.yaml +++ b/charts/model-engine/templates/service_template_config_map.yaml @@ -464,13 +464,19 @@ data: - type: redis metadata: address: ${REDIS_HOST_PORT} # Format must be host:port + {{- if not .Values.redis.enableAuth }} passwordFromEnv: "" + {{- end }} listName: "launch-endpoint-autoscaling:${ENDPOINT_ID}" listLength: "100" # something absurdly high so we don't scale past 1 pod activationListLength: "0" - enableTLS: "false" - unsafeSsl: "false" + enableTLS: "{{ .Values.redis.enableTLS }}" + unsafeSsl: "{{ .Values.redis.unsafeSsl }}" databaseIndex: "${REDIS_DB_INDEX}" + {{- if .Values.redis.enableAuth }} + authenticationRef: + name: "keda-trigger-auth-redis-secret" + {{- end }} {{- end }} - type: prometheus metadata: diff --git a/charts/model-engine/templates/trigger_authentication.yaml b/charts/model-engine/templates/trigger_authentication.yaml index 63209f68..088dee94 100644 --- a/charts/model-engine/templates/trigger_authentication.yaml +++ b/charts/model-engine/templates/trigger_authentication.yaml @@ -8,4 +8,17 @@ spec: podIdentity: provider: azure-workload identityId: {{ .Values.azure.client_id }} -{{- end }} \ No newline at end of file +{{- else if .Values.redis.enableAuth }} +apiVersion: keda.sh/v1alpha1 +kind: TriggerAuthentication +metadata: + name: keda-trigger-auth-redis-secret + namespace: {{ .Values.config.values.launch.endpoint_namespace }} +spec: + awsSecretManager: + podIdentity: + provider: aws + secrets: + - parameter: password + name: {{ .Values.redis.kedaSecretName }} +{{- end }} diff --git a/charts/model-engine/values.yaml b/charts/model-engine/values.yaml index 1ea7522e..c7c0ec0d 100644 --- a/charts/model-engine/values.yaml +++ b/charts/model-engine/values.yaml @@ -3,6 +3,10 @@ spellbook: enabled: false redis: auth: + enableTLS: false + enableAuth: false + kedaSecretName: "" + unsafeSsl: false db: runDbInitScript: false runDbMigrationScript: false From d1dd85e8a0776e07143ba943d740a7af88426611 Mon Sep 17 00:00:00 2001 From: Michael Choi Date: Wed, 30 Oct 2024 00:29:12 +0000 Subject: [PATCH 2/2] bump versiong --- charts/model-engine/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/model-engine/Chart.yaml b/charts/model-engine/Chart.yaml index 1ebd5db6..e346794d 100644 --- a/charts/model-engine/Chart.yaml +++ b/charts/model-engine/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.3 +version: 0.1.4 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to