Skip to content

Commit

Permalink
make default vectorizer none, disable c11y by default, no resource li…
Browse files Browse the repository at this point in the history
…mit or request set by default
  • Loading branch information
StefanBogdan committed Aug 19, 2022
1 parent f8e1274 commit 904f933
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 31 deletions.
16 changes: 12 additions & 4 deletions .cicd/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

set -eou pipefail

COUNTER=0

function check_modules() {
local helm_settings=$1
local expected_value=$2
Expand All @@ -14,7 +16,8 @@ function check_setting_has_value() {
local setting=$2
local expected_value=$3

echo "Test if '$setting' has value '$expected_value' using: '$helm_settings' settings"
echo "$COUNTER: Test if '$setting' has value '$expected_value' using: '$helm_settings' settings"
let COUNTER=COUNTER+1
helm template $helm_settings "weaviate.tgz" > out.yml
res=$(grep -F -C 1 "${setting}" < ../weaviate/out.yml)
if [[ $res != *$expected_value* ]]
Expand All @@ -29,7 +32,8 @@ function check_no_setting() {
local helm_settings=$1
local setting=$2

echo "Test if '$setting' is absent using: '$helm_settings' settings"
echo "$COUNTER: Test if '$setting' is absent using: '$helm_settings' settings"
let COUNTER=COUNTER+1
helm template $helm_settings "weaviate.tgz" > out.yml
if grep -Fq "$setting" ../weaviate/out.yml; then
echo "error: '$setting' was found"
Expand Down Expand Up @@ -61,14 +65,16 @@ function check_creates_template() {

check_creates_template "--set collector_proxy.enabled=true"

check_modules "" "value: text2vec-contextionary"
check_no_setting "" "name: ENABLE_MODULES"
check_setting_has_value "" "name: DEFAULT_VECTORIZER_MODULE" "value: none"
check_setting_has_value "--set modules.default_vectorizer_module=text2vec-openai" "name: DEFAULT_VECTORIZER_MODULE" "value: text2vec-openai"
check_modules "--set modules.text2vec-contextionary.enabled=true" "value: text2vec-contextionary"
check_modules "--set modules.text2vec-contextionary.enabled=false --set modules.qna-transformers.enabled=true" "value: qna-transformers"
check_modules "--set modules.text2vec-contextionary.enabled=false --set modules.img2vec-neural.enabled=true" "value: img2vec-neural"
check_modules "--set modules.text2vec-contextionary.enabled=false --set modules.text2vec-transformers.enabled=true" "value: text2vec-transformers"
check_modules "--set modules.text2vec-contextionary.enabled=false --set modules.text2vec-transformers.passageQueryServices.passage.enabled=true --set modules.text2vec-transformers.passageQueryServices.query.enabled=true" "value: text2vec-transformers"
check_modules "--set modules.text2vec-contextionary.enabled=false --set modules.text2vec-transformers.enabled=true --set modules.img2vec-neural.enabled=true --set modules.qna-transformers.enabled=true" "value: text2vec-transformers,qna-transformers,img2vec-neural"
check_modules "--set modules.img2vec-neural.enabled=true --set modules.qna-transformers.enabled=true" "value: text2vec-contextionary,qna-transformers,img2vec-neural"
check_modules "--set modules.img2vec-neural.enabled=true --set modules.qna-transformers.enabled=true" "value: qna-transformers,img2vec-neural"
check_modules "--set modules.text2vec-contextionary.enabled=false --set modules.qna-transformers.enabled=true --set modules.img2vec-neural.enabled=true" "value: qna-transformers,img2vec-neural"
check_modules "--set modules.text2vec-contextionary.enabled=false --set modules.text2vec-transformers.enabled=true --set modules.img2vec-neural.enabled=true --set modules.qna-transformers.enabled=true --set modules.text-spellcheck.enabled=true --set modules.ner-transformers.enabled=true" "value: text2vec-transformers,qna-transformers,img2vec-neural,ner-transformers,text-spellcheck"
check_modules "--set modules.text2vec-contextionary.enabled=true --set modules.text2vec-transformers.enabled=false --set modules.img2vec-neural.enabled=true --set modules.qna-transformers.enabled=true --set modules.text-spellcheck.enabled=true --set modules.ner-transformers.enabled=true" "value: text2vec-contextionary,qna-transformers,img2vec-neural,ner-transformers,text-spellcheck"
Expand Down Expand Up @@ -97,6 +103,8 @@ function check_creates_template() {
check_modules "--set modules.text2vec-contextionary.enabled=false --set modules.text2vec-transformers.enabled=false --set modules.img2vec-neural.enabled=false --set modules.qna-transformers.enabled=false --set modules.text-spellcheck.enabled=false --set modules.ner-transformers.enabled=false --set modules.multi2vec-clip.enabled=false --set modules.text2vec-openai.enabled=true" "value: text2vec-openai"
check_modules "--set modules.text2vec-contextionary.enabled=false --set modules.text2vec-transformers.enabled=false --set modules.img2vec-neural.enabled=false --set modules.qna-transformers.enabled=false --set modules.text-spellcheck.enabled=false --set modules.ner-transformers.enabled=false --set modules.multi2vec-clip.enabled=false --set modules.text2vec-openai.enabled=true --set modules.text2vec-openai.apiKey=apiKey" "value: text2vec-openai"



_settingPassageQueryOn="--set modules.text2vec-contextionary.enabled=false --set modules.text2vec-transformers.passageQueryServices.passage.enabled=true --set modules.text2vec-transformers.passageQueryServices.query.enabled=true"
check_setting_has_value "$_settingPassageQueryOn" "name: TRANSFORMERS_PASSAGE_INFERENCE_API" "value: http://transformers-inference-passage.default.svc.cluster.local:8080"
check_setting_has_value "$_settingPassageQueryOn" "name: TRANSFORMERS_QUERY_INFERENCE_API" "value: http://transformers-inference-query.default.svc.cluster.local:8080"
Expand Down
18 changes: 0 additions & 18 deletions rbac-config.yaml

This file was deleted.

18 changes: 9 additions & 9 deletions weaviate/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ args:
# to cases where no data is imported yet. Scaling down after importing data may
# break usability. Full dynamic scalability will be added in a future release.
replicas: 1
resources:
requests:
cpu: '500m'
memory: '300Mi'
limits:
cpu: '1000m'
memory: '1Gi'
resources: {}
# requests:
# cpu: '500m'
# memory: '300Mi'
# limits:
# cpu: '1000m'
# memory: '1Gi'

# The Persistent Volume Claim settings for Weaviate. If there's a
# storage.fullnameOverride field set, then the default pvc will not be
Expand Down Expand Up @@ -132,7 +132,7 @@ modules:
# transformers-based models.
text2vec-contextionary:
# disable if you want to use transformers or import or own vectors
enabled: true
enabled: false

# The configuration below is ignored if enabled==false
fullnameOverride: contextionary
Expand Down Expand Up @@ -477,7 +477,7 @@ modules:
# use this module as the vectorizer if nothing else is specified. Can be
# overwritten on a per-class basis.
# set to text2vec-transformers if running with transformers instead
default_vectorizer_module: text2vec-contextionary
default_vectorizer_module: none

# It is also possible to configure authentication and authorization through a
# custom configmap The authorization and authentication values defined in
Expand Down

0 comments on commit 904f933

Please sign in to comment.