Skip to content

Commit f24d215

Browse files
mateo-dimateo-di
authored
chore: remove legacy openAiApiKey / WORKSPACE_OPENAI_API_KEY (#827)
The legacy OpenAI API key was used by the builder-ai feature in workspace-api. AI features now use LiteLLM with its own keys, making this secret unnecessary. Customers using the OpenAI builder-ai agent must configure their own key via gen_ai_custom_config. Removes references from: - values.yaml (cartoSecrets.openAiApiKey definition) - _helpers.tpl (WORKSPACE_OPENAI_API_KEY and LITELLM_OPENAI_API_KEY mappings) - workspace-api deployment/secret (env var references) - aiproxy deployment/secret (LITELLM_OPENAI_API_KEY references) - kots-helm.yaml (openAiApiKey entitlement) - kots-config.yaml (Custom OpenAI API Key config options) - README.md (documentation rows)
1 parent 7ec4ae0 commit f24d215

File tree

9 files changed

+0
-39
lines changed

9 files changed

+0
-39
lines changed

‎chart/README.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,10 +200,6 @@ To install, upgrade or uninstall this chart, please refer to [the root README.md
200200
| `cartoSecrets.instanceId.value` | Value of the secret used to define the instance ID for the active installation. One of `cartoSecrets.instanceId.value` or `cartoSecrets.instanceId.existingSecret` could be defined. | `""` |
201201
| `cartoSecrets.instanceId.existingSecret.name` | Name of the pre-existent secret containing the `cartoSecrets.instanceId.existingSecret.key`. If `cartoSecrets.instanceId.value` is defined, this value is going to be ignored and not used. | `""` |
202202
| `cartoSecrets.instanceId.existingSecret.key` | Key to find in `cartoSecrets.instanceId.existingSecret.name` where the value of `cartoSecrets.instanceId` is found. If `cartoSecrets.instanceId.value` is defined, this value is going to be ignored and not used. | `""` |
203-
| `cartoSecrets.openAiApiKey` | The API Key to be used for the AI provider. | |
204-
| `cartoSecrets.openAiApiKey.value` | Value of the secret `WORKSPACE_OPENAI_API_KEY` | `""` |
205-
| `cartoSecrets.openAiApiKey.existingSecret.name` | Name of the pre-existent secret containing the `cartoSecrets.openAiApiKey.existingSecret.key`. If `cartoSecrets.openAiApiKey.value` is defined, this value is going to be ignored and not used. | `""` |
206-
| `cartoSecrets.openAiApiKey.existingSecret.key` | Key to find in `cartoSecrets.openAiApiKey.existingSecret.name` where the value of `cartoSecrets.openAiApiKey` is found. If `cartoSecrets.openAiApiKey.value` is defined, this value is going to be ignored and not used. | `""` |
207203
| `cartoSecrets.redisPassword` | The password for the Redis instance. | |
208204
| `cartoSecrets.redisPassword.value` | Value of the secret used to define the password for the Redis instance. One of `cartoSecrets.redisPassword.value` or `cartoSecrets.redisPassword.existingSecret` could be defined. | `""` |
209205
| `cartoSecrets.redisPassword.existingSecret.name` | Name of the pre-existent secret containing the `cartoSecrets.redisPassword.existingSecret.key`. If `cartoSecrets.redisPassword.value` is defined, this value is going to be ignored and not used. | `""` |

‎chart/templates/_helpers.tpl‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ MAPS_API_V3_JWT_SECRET: cartoSecrets.jwtApiSecret
6969
REACT_APP_VITALLY_TOKEN: cartoSecrets.vitallyToken
7070
VARNISH_DEBUG_SECRET: cartoSecrets.varnishDebugSecret
7171
VARNISH_PURGE_SECRET: cartoSecrets.varnishPurgeSecret
72-
WORKSPACE_OPENAI_API_KEY: cartoSecrets.openAiApiKey
7372
WORKSPACE_IMPORTS_ACCESSKEYID: appSecrets.awsAccessKeyId
7473
WORKSPACE_IMPORTS_SECRETACCESSKEY: appSecrets.awsAccessKeySecret
7574
WORKSPACE_IMPORTS_STORAGE_ACCESSKEY: appSecrets.azureStorageAccessKey
@@ -82,7 +81,6 @@ LITELLM_JWT_SECRET: cartoSecrets.jwtApiSecret
8281
LITELLM_MASTER_KEY: cartoSecrets.litellmMasterKey
8382
LITELLM_SALT_KEY: cartoSecrets.litellmSaltKey
8483
AI_OPENAI_API_KEY: cartoSecrets.litellmMasterKey
85-
LITELLM_OPENAI_API_KEY: cartoSecrets.openAiApiKey
8684
GEMINI_API_KEY: cartoSecrets.geminiApiKey
8785
{{- end -}}
8886

‎chart/templates/aiproxy/deployment.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ spec:
105105
{{- include "carto._utils.generateSecretDefs" (dict "vars" (list
106106
"LITELLM_MASTER_KEY"
107107
"LITELLM_SALT_KEY"
108-
"LITELLM_OPENAI_API_KEY"
109108
"GEMINI_API_KEY"
110109
"LITELLM_JWT_SECRET"
111110
) "context" $ ) | nindent 12 }}
@@ -118,7 +117,6 @@ spec:
118117
{{- $secretContent := include "carto._utils.generateSecretObjects" (dict "vars" (list
119118
"LITELLM_MASTER_KEY"
120119
"LITELLM_SALT_KEY"
121-
"LITELLM_OPENAI_API_KEY"
122120
"GEMINI_API_KEY"
123121
"LITELLM_JWT_SECRET"
124122
) "context" $ ) -}}

‎chart/templates/aiproxy/secret.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
{{- $secretVars := list
33
"LITELLM_MASTER_KEY"
44
"LITELLM_SALT_KEY"
5-
"LITELLM_OPENAI_API_KEY"
65
"GEMINI_API_KEY"
76
"LITELLM_JWT_SECRET"
87
-}}

‎chart/templates/workspace-api/deployment.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ spec:
124124
"IMPORT_AWS_ACCESS_KEY_ID"
125125
"IMPORT_AWS_SECRET_ACCESS_KEY"
126126
"LAUNCHDARKLY_SDK_KEY"
127-
"WORKSPACE_OPENAI_API_KEY"
128127
"WORKSPACE_THUMBNAILS_ACCESSKEYID"
129128
"WORKSPACE_THUMBNAILS_SECRETACCESSKEY"
130129
"WORKSPACE_IMPORTS_ACCESSKEYID"
@@ -143,7 +142,6 @@ spec:
143142
"IMPORT_AWS_ACCESS_KEY_ID"
144143
"IMPORT_AWS_SECRET_ACCESS_KEY"
145144
"LAUNCHDARKLY_SDK_KEY"
146-
"WORKSPACE_OPENAI_API_KEY"
147145
"WORKSPACE_THUMBNAILS_ACCESSKEYID"
148146
"WORKSPACE_THUMBNAILS_SECRETACCESSKEY"
149147
"WORKSPACE_IMPORTS_ACCESSKEYID"
@@ -200,7 +198,6 @@ spec:
200198
"ENCRYPTION_SECRET_KEY"
201199
"LAUNCHDARKLY_SDK_KEY"
202200
"WORKSPACE_JWT_SECRET"
203-
"WORKSPACE_OPENAI_API_KEY"
204201
"WORKSPACE_THUMBNAILS_ACCESSKEYID"
205202
"WORKSPACE_THUMBNAILS_SECRETACCESSKEY"
206203
"WORKSPACE_THUMBNAILS_STORAGE_ACCESSKEY"
@@ -219,7 +216,6 @@ spec:
219216
"ENCRYPTION_SECRET_KEY"
220217
"LAUNCHDARKLY_SDK_KEY"
221218
"WORKSPACE_JWT_SECRET"
222-
"WORKSPACE_OPENAI_API_KEY"
223219
"WORKSPACE_THUMBNAILS_ACCESSKEYID"
224220
"WORKSPACE_THUMBNAILS_SECRETACCESSKEY"
225221
"WORKSPACE_THUMBNAILS_STORAGE_ACCESSKEY"

‎chart/templates/workspace-api/secret.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"IMPORT_AWS_SECRET_ACCESS_KEY"
77
"GITBOOK_API_TOKEN"
88
"LAUNCHDARKLY_SDK_KEY"
9-
"WORKSPACE_OPENAI_API_KEY"
109
"WORKSPACE_JWT_SECRET"
1110
"WORKSPACE_THUMBNAILS_ACCESSKEYID"
1211
"WORKSPACE_THUMBNAILS_SECRETACCESSKEY"

‎chart/values.yaml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -398,16 +398,6 @@ cartoSecrets:
398398
existingSecret:
399399
name: ""
400400
key: ""
401-
## @extra cartoSecrets.openAiApiKey The API Key to be used for the AI provider.
402-
openAiApiKey:
403-
## @param cartoSecrets.openAiApiKey.value Value of the secret `WORKSPACE_OPENAI_API_KEY`
404-
value: ""
405-
## @param cartoSecrets.openAiApiKey.existingSecret.name Name of the pre-existent secret containing the `cartoSecrets.openAiApiKey.existingSecret.key`. If `cartoSecrets.openAiApiKey.value` is defined, this value is going to be ignored and not used.
406-
## @param cartoSecrets.openAiApiKey.existingSecret.key Key to find in `cartoSecrets.openAiApiKey.existingSecret.name` where the value of `cartoSecrets.openAiApiKey` is found. If `cartoSecrets.openAiApiKey.value` is defined, this value is going to be ignored and not used.
407-
##
408-
existingSecret:
409-
name: ""
410-
key: ""
411401
## @extra cartoSecrets.redisPassword The password for the Redis instance.
412402
redisPassword:
413403
## @param cartoSecrets.redisPassword.value Value of the secret used to define the password for the Redis instance. One of `cartoSecrets.redisPassword.value` or `cartoSecrets.redisPassword.existingSecret` could be defined.

‎manifests/kots-config.yaml‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -762,19 +762,6 @@ spec:
762762
when: '{{repl (ConfigOptionEquals "googleBasemapsEnabled" "1") }}'
763763
required: true
764764

765-
## Custom OpenAI API Key
766-
- name: customOpenAIAPIKeyEnabled
767-
title: Custom OpenAI API Key
768-
help_text: |
769-
Enable if you want to use your custom OpenAI API Key.
770-
type: bool
771-
default: "0"
772-
- name: customOpenAIAPIKey
773-
title: OpenAI API Key
774-
type: text
775-
when: '{{repl (ConfigOptionEquals "customOpenAIAPIKeyEnabled" "1") }}'
776-
required: true
777-
778765
## BigQuery Oauth
779766
- name: bigqueryOauthEnabled
780767
title: BigQuery OAuth connections

‎manifests/kots-helm.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ spec:
4343
value: '{{repl ConfigOption "autogeneratedInstanceId" }}'
4444
vitallyToken:
4545
value: '{{repl LicenseFieldValue "vitallyToken" }}'
46-
openAiApiKey:
47-
value: '{{repl ConfigOptionEquals "customOpenAIAPIKeyEnabled" "1" | ternary (ConfigOption "customOpenAIAPIKey") (LicenseFieldValue "openAiApiKey") }}'
4846
litellmMasterKey:
4947
value: '{{repl ConfigOption "litellmMasterKey" }}'
5048
litellmSaltKey:

0 commit comments

Comments
 (0)