From 904f933448b0c103be8496e5fcad5a893baa0dfd Mon Sep 17 00:00:00 2001 From: Stefan Bogdan Date: Fri, 19 Aug 2022 14:07:49 +0200 Subject: [PATCH] make default vectorizer none, disable c11y by default, no resource limit or request set by default --- .cicd/test.sh | 16 ++++++++++++---- rbac-config.yaml | 18 ------------------ weaviate/values.yaml | 18 +++++++++--------- 3 files changed, 21 insertions(+), 31 deletions(-) delete mode 100644 rbac-config.yaml diff --git a/.cicd/test.sh b/.cicd/test.sh index 8404af92..4db547f2 100755 --- a/.cicd/test.sh +++ b/.cicd/test.sh @@ -2,6 +2,8 @@ set -eou pipefail +COUNTER=0 + function check_modules() { local helm_settings=$1 local expected_value=$2 @@ -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* ]] @@ -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" @@ -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" @@ -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" diff --git a/rbac-config.yaml b/rbac-config.yaml deleted file mode 100644 index 1fcf47dc..00000000 --- a/rbac-config.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - name: tiller - namespace: kube-system ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: tiller -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: cluster-admin -subjects: - - kind: ServiceAccount - name: tiller - namespace: kube-system diff --git a/weaviate/values.yaml b/weaviate/values.yaml index 6ce88fc8..1fb1d013 100644 --- a/weaviate/values.yaml +++ b/weaviate/values.yaml @@ -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 @@ -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 @@ -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