Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: weaviate/weaviate-helm
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v17.3.1
Choose a base ref
...
head repository: weaviate/weaviate-helm
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
2 contributors

Commits on Nov 21, 2024

  1. Add support for multi2vec-jinaai module

    @antas-marcin
    antas-marcin committed Nov 21, 2024
    Copy the full SHA
    d1c8071 View commit details

  2. Merge pull request #275 from weaviate/add-support-for-multi2vec-jinaa… 

    …i-module

Add support for multi2vec-jinaai module
    @antas-marcin
    antas-marcin authored Nov 21, 2024
    Copy the full SHA
    e1dbdcb View commit details

  3. Update helm chart version to v17.3.2

    @antas-marcin
    antas-marcin committed Nov 21, 2024
    Copy the full SHA
    b30d78f View commit details

  4. Merge pull request #276 from weaviate/update-helm-version 

    Update helm chart version to v17.3.2
    @antas-marcin
    antas-marcin authored Nov 21, 2024
    Copy the full SHA
    f9ea315 View commit details

Commits on Dec 2, 2024

  1. Document rbac's variables. 

    The configuration of RBAC can be done either via the config.yaml
file or via environment variables. To keep it consistent with the
existing authZ and authN config values, it is disabled by default
and each of the available values gets referenced in the values.yaml.
    @jfrancoa
    jfrancoa committed Dec 2, 2024
    Copy the full SHA
    0e13c91 View commit details

Commits on Dec 3, 2024

  1. Merge pull request #277 from weaviate/jose/document-rbac-in-values 

    Document rbac's variables.
    @jfrancoa
    jfrancoa authored Dec 3, 2024
    Copy the full SHA
    ad5e14f View commit details

Commits on Dec 5, 2024

  1. Add support for multi2vec-voyageai module

    @antas-marcin
    antas-marcin committed Dec 5, 2024
    Copy the full SHA
    d377152 View commit details

Commits on Dec 9, 2024

  1. Merge pull request #279 from weaviate/add-support-for-multi2vec-voyag… 

    …eai-module

Add support for multi2vec-voyageai module
    @antas-marcin
    antas-marcin authored Dec 9, 2024
    Copy the full SHA
    d3604a1 View commit details

Commits on Dec 10, 2024

  1. Bump Weaviate version to v1.27.8

    @antas-marcin
    antas-marcin committed Dec 10, 2024
    Copy the full SHA
    cecbd29 View commit details

  2. Merge pull request #280 from weaviate/bump-weaviate-version-to-v1.27.8 

    Bump Weaviate version to v1.27.8
    @antas-marcin
    antas-marcin authored Dec 10, 2024
    Copy the full SHA
    32d546d View commit details

Commits on Jan 3, 2025

  1. Add support for text2colbert-jinaai module

    @antas-marcin
    antas-marcin committed Jan 3, 2025
    Copy the full SHA
    4cbddc7 View commit details

Commits on Jan 22, 2025

  1. Merge pull request #282 from weaviate/add-support-for-text2colbert-ji… 

    …naai-module

Add support for text2colbert-jinaai module
    @antas-marcin
    antas-marcin authored Jan 22, 2025
    Copy the full SHA
    e415929 View commit details

Commits on Jan 29, 2025

  1. Add support for USE_SENTENCE_TRANSFORMERS_MULTI_PROCESS and ENABLE_CACHE

    @antas-marcin
    antas-marcin committed Jan 29, 2025
    Copy the full SHA
    853456f View commit details

  2. Merge pull request #286 from weaviate/add-support-for-additional-tran… 

    …sformers-module-settings

Add support for USE_SENTENCE_TRANSFORMERS_MULTI_PROCESS and ENABLE_CACHE
    @antas-marcin
    antas-marcin authored Jan 29, 2025
    Copy the full SHA
    c434770 View commit details

  3. Update chart version to 17.4.0

    @antas-marcin
    antas-marcin committed Jan 29, 2025
    Copy the full SHA
    ac03ba3 View commit details

  4. Merge pull request #287 from weaviate/release-17.4.0 

    Update chart version to 17.4.0
    @antas-marcin
    antas-marcin authored Jan 29, 2025
    Copy the full SHA
    cf11bd0 View commit details

Commits on Jan 31, 2025

  1. Fix transformers module running with enabled pool

    @antas-marcin
    antas-marcin committed Jan 31, 2025
    Copy the full SHA
    62d7afc View commit details

  2. Merge pull request #288 from weaviate/fix-transfomers-module-configur… 

    …ation-with-enabled-pool

Fix transformers module running with enabled pool
    @antas-marcin
    antas-marcin authored Jan 31, 2025
    Copy the full SHA
    7c279c4 View commit details

Commits on Feb 11, 2025

  1. Add support for NVIDIA modules

    @antas-marcin
    antas-marcin committed Feb 11, 2025
    Copy the full SHA
    c12c7d8 View commit details

Commits on Feb 12, 2025

  1. Merge pull request #289 from weaviate/add-support-for-nvidia-modules 

    Add support for NVIDIA modules
    @antas-marcin
    antas-marcin authored Feb 12, 2025
    Copy the full SHA
    882ec66 View commit details

Commits on Feb 14, 2025

  1. Update chart version to 17.4.2

    @antas-marcin
    antas-marcin committed Feb 14, 2025
    Copy the full SHA
    ff04a99 View commit details

  2. Merge pull request #291 from weaviate/update-version-to-17.4.2 

    Update chart version to 17.4.2
    @antas-marcin
    antas-marcin authored Feb 14, 2025
    Copy the full SHA
    dea10ac View commit details

Commits on Feb 20, 2025

  1. Add support for podDisruptionBudgets

    @antas-marcin
    antas-marcin committed Feb 20, 2025
    Copy the full SHA
    c3c2775 View commit details

  2. Merge pull request #292 from weaviate/add-support-for-podDisruptionBu… 

    …dget

Add support for podDisruptionBudgets
    @antas-marcin
    antas-marcin authored Feb 20, 2025
    Copy the full SHA
    16faed3 View commit details
25 changes: 24 additions & 1 deletion .cicd/test.sh
View file
Original file line number Diff line number Diff line change
@@ -150,19 +150,25 @@ function check_creates_template() {
check_modules "--set modules.text2vec-jinaai.enabled=true --set modules.text2vec-jinaai.apiKey=apiKey" "value: text2vec-jinaai"
check_modules "--set modules.reranker-jinaai.enabled=true" "value: reranker-jinaai"
check_modules "--set modules.reranker-jinaai.enabled=true --set modules.reranker-jinaai.apiKey=apiKey" "value: reranker-jinaai"
check_modules "--set modules.multi2vec-jinaai.enabled=true" "value: multi2vec-jinaai"
check_modules "--set modules.multi2vec-jinaai.enabled=true --set modules.multi2vec-jinaai.apiKey=apiKey" "value: multi2vec-jinaai"
check_modules "--set modules.text2vec-aws.enabled=true" "value: text2vec-aws"
check_modules "--set modules.generative-aws.enabled=true" "value: generative-aws"
check_modules "--set modules.text2vec-aws.enabled=true --set modules.generative-aws.enabled=true" "value: generative-aws,text2vec-aws"
check_modules "--set modules.generative-anyscale.enabled=true" "value: generative-anyscale"
check_modules "--set modules.generative-anyscale.enabled=true --set modules.generative-anyscale.apiKey=apiKey" "value: generative-anyscale"
check_modules "--set modules.text2vec-voyageai.enabled=true" "value: text2vec-voyageai"
check_modules "--set modules.multi2vec-voyageai.enabled=true" "value: multi2vec-voyageai"
check_modules "--set modules.generative-mistral.enabled=true" "value: generative-mistral"
check_modules "--set modules.generative-mistral.enabled=true --set modules.generative-mistral.apiKey=apiKey" "value: generative-mistral"
check_modules "--set modules.multi2vec-palm.enabled=true" "value: multi2vec-palm"
check_modules "--set modules.multi2vec-palm.enabled=true --set modules.multi2vec-palm.apiKey=apiKey --set modules.generative-palm.enabled=true --set modules.generative-palm.apiKey=apiKey" "value: generative-palm,multi2vec-palm"
check_modules "--set modules.reranker-voyageai.enabled=true" "value: reranker-voyageai"
check_modules "--set modules.reranker-voyageai.enabled=true --set modules.reranker-voyageai.apiKey=apiKey" "value: reranker-voyageai"
check_modules "--set modules.multi2vec-voyageai.enabled=true --set modules.multi2vec-voyageai.apiKey=apiKey" "value: multi2vec-voyageai"
check_modules "--set modules.text2vec-voyageai.enabled=true --set modules.text2vec-voyageai.apiKey=apiKey --set modules.reranker-voyageai.enabled=true --set modules.reranker-voyageai.apiKey=apiKey" "value: text2vec-voyageai,reranker-voyageai"
check_modules "--set modules.multi2vec-voyageai.enabled=true --set modules.multi2vec-voyageai.apiKey=apiKey --set modules.reranker-voyageai.enabled=true --set modules.reranker-voyageai.apiKey=apiKey" "value: multi2vec-voyageai,reranker-voyageai"
check_modules "--set modules.text2vec-voyageai.enabled=true --set modules.text2vec-voyageai.apiKey=apiKey --set modules.reranker-voyageai.enabled=true --set modules.reranker-voyageai.apiKey=apiKey --set modules.multi2vec-voyageai.enabled=true --set modules.multi2vec-voyageai.apiKey=apiKey" "value: multi2vec-voyageai,text2vec-voyageai,reranker-voyageai"
check_modules "--set modules.text2vec-ollama.enabled=true" "value: text2vec-ollama"
check_modules "--set modules.generative-ollama.enabled=true" "value: generative-ollama"
check_modules "--set modules.generative-ollama.enabled=true --set modules.text2vec-ollama.enabled=true" "value: generative-ollama,text2vec-ollama"
@@ -176,7 +182,14 @@ function check_creates_template() {
check_modules "--set modules.text2vec-databricks.enabled=true" "value: text2vec-databricks"
check_modules "--set modules.generative-databricks.enabled=true" "value: generative-databricks"
check_modules "--set modules.text2vec-mistral.enabled=true" "value: text2vec-mistral"

check_modules "--set modules.generative-nvidia.enabled=true" "value: generative-nvidia"
check_modules "--set modules.reranker-nvidia.enabled=true" "value: reranker-nvidia"
check_modules "--set modules.multi2vec-nvidia.enabled=true" "value: multi2vec-nvidia"
check_modules "--set modules.text2vec-nvidia.enabled=true --set modules.text2vec-nvidia.apiKey=apiKey --set modules.generative-nvidia.enabled=true --set modules.generative-nvidia.apiKey=apiKey" "value: generative-nvidia,text2vec-nvidia"
check_modules "--set modules.text2vec-nvidia.enabled=true --set modules.text2vec-nvidia.apiKey=apiKey --set modules.generative-nvidia.enabled=true --set modules.generative-nvidia.apiKey=apiKey --set modules.reranker-nvidia.enabled=true --set modules.reranker-nvidia.apiKey=apiKey" "value: generative-nvidia,text2vec-nvidia,reranker-nvidia"
check_modules "--set modules.text2vec-nvidia.enabled=true --set modules.text2vec-nvidia.apiKey=apiKey --set modules.reranker-nvidia.enabled=true --set modules.reranker-nvidia.apiKey=apiKey" "value: text2vec-nvidia,reranker-nvidia"
check_modules "--set modules.text2vec-nvidia.enabled=true --set modules.text2vec-nvidia.apiKey=apiKey --set modules.multi2vec-nvidia.enabled=true --set modules.multi2vec-nvidia.apiKey=apiKey" "value: multi2vec-nvidia,text2vec-nvidia"
check_modules "--set modules.generative-nvidia.enabled=true --set modules.generative-nvidia.apiKey=apiKey" "value: generative-nvidia"
check_modules "--set modules.text2vec-openai.enabled=true --set modules.text2vec-openai.azureApiKey=azureApiKey" "value: text2vec-openai"
check_modules "--set modules.qna-openai.enabled=true --set modules.qna-openai.azureApiKey=azureApiKey" "value: qna-openai"
check_modules "--set modules.generative-openai.enabled=true --set modules.generative-openai.azureApiKey=azureApiKey" "value: generative-openai"
@@ -185,6 +198,8 @@ function check_creates_template() {
check_string_existence "--set modules.qna-openai.enabled=true --set modules.qna-openai.azureApiKey=azureApiKey" "name: AZURE_APIKEY"
check_string_existence "--set modules.generative-openai.enabled=true --set modules.generative-openai.azureApiKey=azureApiKey" "name: AZURE_APIKEY"
check_string_existence "--set modules.text2vec-jinaai.enabled=true --set modules.text2vec-jinaai.apiKey=jinaaiApiKey" "name: JINAAI_APIKEY"
check_string_existence "--set modules.text2colbert-jinaai.enabled=true --set modules.text2colbert-jinaai.apiKey=jinaaiApiKey" "name: JINAAI_APIKEY"
check_string_existence "--set modules.multi2vec-jinaai.enabled=true --set modules.multi2vec-jinaai.apiKey=jinaaiApiKey" "name: JINAAI_APIKEY"
check_string_existence "--set grpcService.enabled=true" "containerPort: 50051"
check_string_existence "--set grpcService.enabled=true --set grpcService.name=weaviate-grpc-service-custom-name" "name: weaviate-grpc-service-custom-name"
check_string_existence "--set grpcService.name=weaviate-grpc-defult-service-custom-name" "name: weaviate-grpc-defult-service-custom-name"
@@ -217,15 +232,23 @@ function check_creates_template() {
check_string_existence "--set initContainers.ensureFileOwnershipContainer.enabled=true --set containerSecurityContext.runAsUser=1000 --set containerSecurityContext.fsGroup=2000" "name: ensure-file-ownership"
check_string_existence "--set modules.text2vec-openai.enabled=true --set modules.generative-anthropic.enabled=true --set modules.generative-anthropic.apiKey=azureApiKey" "name: ANTHROPIC_APIKEY"
check_string_existence "--set modules.text2vec-openai.enabled=true --set modules.text2vec-jinaai.enabled=true --set modules.text2vec-jinaai.apiKey=JinaAIApiKey" "name: JINAAI_APIKEY"
check_string_existence "--set modules.text2vec-openai.enabled=true --set modules.text2colbert-jinaai.enabled=true --set modules.text2colbert-jinaai.apiKey=JinaAIApiKey" "name: JINAAI_APIKEY"
check_string_existence "--set modules.text2vec-openai.enabled=true --set modules.reranker-jinaai.enabled=true --set modules.reranker-jinaai.apiKey=JinaAIApiKey" "name: JINAAI_APIKEY"
check_string_existence "--set modules.text2vec-openai.enabled=true --set modules.reranker-jinaai.enabled=true --set modules.reranker-jinaai.apiKey=JinaAIApiKey --set modules.text2vec-jinaai.enabled=true --set modules.text2vec-jinaai.apiKey=JinaAIApiKey" "name: JINAAI_APIKEY"
check_string_existence "--set modules.text2vec-openai.enabled=true --set modules.reranker-jinaai.enabled=true --set modules.reranker-jinaai.apiKey=JinaAIApiKey --set modules.text2vec-jinaai.enabled=true --set modules.text2vec-jinaai.apiKey=JinaAIApiKey --set modules.text2colbert-jinaai.enabled=true --set modules.text2colbert-jinaai.apiKey=JinaAIApiKey" "name: JINAAI_APIKEY"
check_string_existence "--set modules.text2vec-openai.enabled=true --set modules.multi2vec-jinaai.enabled=true --set modules.multi2vec-jinaai.apiKey=JinaAIApiKey --set modules.text2vec-jinaai.enabled=true --set modules.text2vec-jinaai.apiKey=JinaAIApiKey" "name: JINAAI_APIKEY"
check_string_existence "--set modules.text2vec-openai.enabled=true --set modules.multi2vec-jinaai.enabled=true --set modules.multi2vec-jinaai.apiKey=JinaAIApiKey --set modules.reranker-jinaai.enabled=true --set modules.reranker-jinaai.apiKey=JinaAIApiKey --set modules.text2vec-jinaai.enabled=true --set modules.text2vec-jinaai.apiKey=JinaAIApiKey" "name: JINAAI_APIKEY"
check_string_existence "--set modules.text2vec-openai.enabled=true --set modules.generative-friendliai.enabled=true --set modules.generative-friendliai.token=FriendliToken" "name: FRIENDLI_TOKEN"
check_string_existence "--set modules.text2vec-databricks.enabled=true --set modules.text2vec-databricks.token=databricksToken" "name: DATABRICKS_TOKEN"
check_string_existence "--set modules.generative-databricks.enabled=true --set modules.generative-databricks.token=databricksToken" "name: DATABRICKS_TOKEN"
check_string_existence "--set modules.generative-databricks.enabled=true --set modules.generative-databricks.token=databricksToken --set modules.text2vec-databricks.enabled=true --set modules.text2vec-databricks.token=databricksToken" "name: DATABRICKS_TOKEN"
check_string_existence "--set modules.text2vec-mistral.enabled=true --set modules.text2vec-mistral.apiKey=mistralApiKey" "name: MISTRAL_APIKEY"
check_string_existence "--set modules.generative-mistral.enabled=true --set modules.generative-mistral.apiKey=mistralApiKey --set modules.text2vec-mistral.enabled=true --set modules.text2vec-mistral.apiKey=mistralApiKey" "name: MISTRAL_APIKEY"
check_string_existence "--set modules.multi2vec-cohere.enabled=true --set modules.multi2vec-cohere.apiKey=apiKey" "name: COHERE_APIKEY"
check_string_existence "--set modules.multi2vec-nvidia.enabled=true --set modules.multi2vec-nvidia.apiKey=apiKey" "name: NVIDIA_APIKEY"
check_string_existence "--set modules.text2vec-nvidia.enabled=true --set modules.text2vec-nvidia.apiKey=apiKey" "name: NVIDIA_APIKEY"
check_string_existence "--set modules.reranker-nvidia.enabled=true --set modules.reranker-nvidia.apiKey=apiKey" "name: NVIDIA_APIKEY"
check_string_existence "--set modules.generative-nvidia.enabled=true --set modules.generative-nvidia.apiKey=apiKey" "name: NVIDIA_APIKEY"

check_setting_has_value "--set replicas=3 --set env.RAFT_BOOTSTRAP_EXPECT=3" "name: RAFT_JOIN" "value: \"weaviate-0,weaviate-1,weaviate-2\""
check_setting_has_value "--set replicas=3 --set env.RAFT_BOOTSTRAP_EXPECT=3" "name: RAFT_BOOTSTRAP_EXPECT" "value: \"3\""
4 changes: 2 additions & 2 deletions weaviate/Chart.yaml
View file
Original file line number Diff line number Diff line change
@@ -7,10 +7,10 @@ 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: 17.3.1
version: 17.4.3

# 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
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: 1.27.2
appVersion: 1.29.0
icon: https://raw.githubusercontent.com/weaviate/weaviate/19de0956c69b66c5552447e84d016f4fe29d12c9/docs/assets/weaviate-logo.png
21 changes: 21 additions & 0 deletions weaviate/templates/_helpers.tpl
View file
Original file line number Diff line number Diff line change
@@ -56,6 +56,9 @@
{{- if (index .Values "modules" "generative-databricks" "enabled") -}}
{{ $modules = append $modules "generative-databricks" }}
{{- end -}}
{{- if (index .Values "modules" "generative-nvidia" "enabled") -}}
{{ $modules = append $modules "generative-nvidia" }}
{{- end -}}
{{- if or (index .Values "modules" "img2vec-neural" "enabled") (index .Values "modules" "img2vec-neural" "inferenceUrl") -}}
{{ $modules = append $modules "img2vec-neural" }}
{{- end -}}
@@ -83,6 +86,15 @@
{{- if (index .Values "modules" "multi2vec-cohere" "enabled") -}}
{{ $modules = append $modules "multi2vec-cohere" }}
{{- end -}}
{{- if (index .Values "modules" "multi2vec-jinaai" "enabled") -}}
{{ $modules = append $modules "multi2vec-jinaai" }}
{{- end -}}
{{- if (index .Values "modules" "multi2vec-voyageai" "enabled") -}}
{{ $modules = append $modules "multi2vec-voyageai" }}
{{- end -}}
{{- if (index .Values "modules" "multi2vec-nvidia" "enabled") -}}
{{ $modules = append $modules "multi2vec-nvidia" }}
{{- end -}}
{{- if (index .Values "modules" "text2vec-openai" "enabled") -}}
{{ $modules = append $modules "text2vec-openai" }}
{{- end -}}
@@ -119,9 +131,15 @@
{{- if (index .Values "modules" "text2vec-mistral" "enabled") -}}
{{ $modules = append $modules "text2vec-mistral" }}
{{- end -}}
{{- if (index .Values "modules" "text2vec-nvidia" "enabled") -}}
{{ $modules = append $modules "text2vec-nvidia" }}
{{- end -}}
{{- if (index .Values "modules" "ref2vec-centroid" "enabled") -}}
{{ $modules = append $modules "ref2vec-centroid" }}
{{- end -}}
{{- if (index .Values "modules" "text2colbert-jinaai" "enabled") -}}
{{ $modules = append $modules "text2colbert-jinaai" }}
{{- end -}}
{{- if (index .Values "modules" "reranker-cohere" "enabled") -}}
{{ $modules = append $modules "reranker-cohere" }}
{{- end -}}
@@ -134,6 +152,9 @@
{{- if (index .Values "modules" "reranker-jinaai" "enabled") -}}
{{ $modules = append $modules "reranker-jinaai" }}
{{- end -}}
{{- if (index .Values "modules" "reranker-nvidia" "enabled") -}}
{{ $modules = append $modules "reranker-nvidia" }}
{{- end -}}
{{- if (index .Values "offload" "s3" "enabled") -}}
{{ $modules = append $modules "offload-s3" }}
{{- end -}}
10 changes: 9 additions & 1 deletion weaviate/templates/apiKeyJinaAISecret.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{{- $t2vJinaAI := and (index .Values "modules" "text2vec-jinaai" "enabled") (index .Values "modules" "text2vec-jinaai" "apiKey") }}
{{- $rerankerJinaAI := and (index .Values "modules" "reranker-jinaai" "enabled") (index .Values "modules" "reranker-jinaai" "apiKey") }}
{{- $jinaai := or ($t2vJinaAI) ($rerankerJinaAI) }}
{{- $multi2vecJinaAI := and (index .Values "modules" "multi2vec-jinaai" "enabled") (index .Values "modules" "multi2vec-jinaai" "apiKey") }}
{{- $t2cJinaAI := and (index .Values "modules" "text2colbert-jinaai" "enabled") (index .Values "modules" "text2colbert-jinaai" "apiKey") }}
{{- $jinaai := or ($t2vJinaAI) ($rerankerJinaAI) ($multi2vecJinaAI) ($t2cJinaAI) }}
{{- if $jinaai }}

{{- $apiKeys := list }}
@@ -10,6 +12,12 @@
{{- if $rerankerJinaAI }}
{{- $apiKeys = append $apiKeys (index .Values "modules" "reranker-jinaai" "apiKey") -}}
{{- end }}
{{- if $multi2vecJinaAI }}
{{- $apiKeys = append $apiKeys (index .Values "modules" "multi2vec-jinaai" "apiKey") -}}
{{- end }}
{{- if $t2cJinaAI }}
{{- $apiKeys = append $apiKeys (index .Values "modules" "text2colbert-jinaai" "apiKey") -}}
{{- end }}

{{- if gt (len ($apiKeys | uniq)) 1 -}}
{{- fail "JinaAI modules activated, but their keys differ. Use the same key on all activated JinaAI modules." }}
44 changes: 44 additions & 0 deletions weaviate/templates/apiKeyNvidiaSecret.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{{- $t2vNvidia := and (index .Values "modules" "text2vec-nvidia" "enabled") (index .Values "modules" "text2vec-nvidia" "apiKey") -}}
{{- $generativeNvidia := and (index .Values "modules" "generative-nvidia" "enabled") (index .Values "modules" "generative-nvidia" "apiKey") }}
{{- $rerankerNvidia := and (index .Values "modules" "reranker-nvidia" "enabled") (index .Values "modules" "reranker-nvidia" "apiKey") }}
{{- $multi2vecNvidia := and (index .Values "modules" "multi2vec-nvidia" "enabled") (index .Values "modules" "multi2vec-nvidia" "apiKey") }}
{{- $nvidia := or ($t2vNvidia) ($generativeNvidia) ($rerankerNvidia) ($multi2vecNvidia) }}
{{- if $nvidia }}

{{- $apiKeys := list }}
{{- if $t2vNvidia }}
{{- $apiKeys = append $apiKeys (index .Values "modules" "text2vec-nvidia" "apiKey") -}}
{{- end }}
{{- if $generativeNvidia }}
{{- $apiKeys = append $apiKeys (index .Values "modules" "generative-nvidia" "apiKey") -}}
{{- end }}
{{- if $rerankerNvidia }}
{{- $apiKeys = append $apiKeys (index .Values "modules" "reranker-nvidia" "apiKey") -}}
{{- end }}
{{- if $multi2vecNvidia }}
{{- $apiKeys = append $apiKeys (index .Values "modules" "multi2vec-nvidia" "apiKey") -}}
{{- end }}

{{- if gt (len ($apiKeys | uniq)) 1 -}}
{{- fail "nvidia modules activated, but their keys differ. Use the same key on all activated nvidia modules." }}
{{- end }}

apiVersion: v1
kind: Secret
metadata:
name: weaviate-nvidia
labels:
app.kubernetes.io/name: weaviate
app.kubernetes.io/managed-by: {{ .Release.Service }}
type: Opaque
data:
{{- if (index .Values "modules" "generative-nvidia" "apiKey") }}
apiKey: {{ index .Values "modules" "generative-nvidia" "apiKey" | b64enc }}
{{- else if (index .Values "modules" "reranker-nvidia" "apiKey") }}
apiKey: {{ index .Values "modules" "reranker-nvidia" "apiKey" | b64enc }}
{{- else if (index .Values "modules" "multi2vec-nvidia" "apiKey") }}
apiKey: {{ index .Values "modules" "multi2vec-nvidia" "apiKey" | b64enc }}
{{- else }}
apiKey: {{ index .Values "modules" "text2vec-nvidia" "apiKey" | b64enc }}
{{- end }}
{{ end }}
8 changes: 7 additions & 1 deletion weaviate/templates/apiKeyVoyageAISecret.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{{- $t2vVoyageAI := and (index .Values "modules" "text2vec-voyageai" "enabled") (index .Values "modules" "text2vec-voyageai" "apiKey") -}}
{{- $rerankerVoyageAI := and (index .Values "modules" "reranker-voyageai" "enabled") (index .Values "modules" "reranker-voyageai" "apiKey") }}
{{- $voyageai := or ($t2vVoyageAI) ($rerankerVoyageAI) }}
{{- $multi2vecVoyageAI := and (index .Values "modules" "multi2vec-voyageai" "enabled") (index .Values "modules" "multi2vec-voyageai" "apiKey") }}
{{- $voyageai := or ($t2vVoyageAI) ($rerankerVoyageAI) ($multi2vecVoyageAI) }}
{{- if $voyageai }}

{{- $apiKeys := list }}
@@ -10,6 +11,9 @@
{{- if $rerankerVoyageAI }}
{{- $apiKeys = append $apiKeys (index .Values "modules" "reranker-voyageai" "apiKey") -}}
{{- end }}
{{- if $multi2vecVoyageAI }}
{{- $apiKeys = append $apiKeys (index .Values "modules" "multi2vec-voyageai" "apiKey") -}}
{{- end }}

{{- if gt (len ($apiKeys | uniq)) 1 -}}
{{- fail "VoyageAI modules activated, but their keys differ. Use the same key on all activated VoyageAI modules." }}
@@ -26,6 +30,8 @@ type: Opaque
data:
{{- if (index .Values "modules" "reranker-voyageai" "apiKey") }}
apiKey: {{ index .Values "modules" "reranker-voyageai" "apiKey" | b64enc }}
{{- else if (index .Values "modules" "multi2vec-voyageai" "apiKey") }}
apiKey: {{ index .Values "modules" "multi2vec-voyageai" "apiKey" | b64enc }}
{{- else }}
apiKey: {{ index .Values "modules" "text2vec-voyageai" "apiKey" | b64enc }}
{{- end }}
18 changes: 18 additions & 0 deletions weaviate/templates/contextionaryPodDisruptionBudget.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{{- $podDisruptionBudget := index .Values "podDisruptionBudgets" "text2vec-contextionary" -}}
{{- $module := index .Values "modules" "text2vec-contextionary" -}}
{{- if and (index $podDisruptionBudget "enabled") (index $module "enabled") }}
apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
name: {{ index $module "fullnameOverride" }}
labels:
name: {{ index $module "fullnameOverride" }}
app: {{ index $module "fullnameOverride" }}
app.kubernetes.io/name: weaviate
app.kubernetes.io/managed-by: {{ .Release.Service }}
spec:
selector:
matchLabels:
app: {{ index $module "fullnameOverride" }}
{{- toYaml $podDisruptionBudget.spec | nindent 2 }}
{{- end -}}
Loading