weaviate · delamainer · May 10, 2024 · May 10, 2024 · May 10, 2024 · May 10, 2024
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,6 @@ chart.lock
 .DS_store
 deploy_key
 deploy_key.pub
+
+.idea
+.vs_code
diff --git a/weaviate/Chart.yaml b/weaviate/Chart.yaml
@@ -7,7 +7,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: 17.0.0
+version: 18.0.0
 
 # 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

diff --git a/weaviate/templates/_helpers.tpl b/weaviate/templates/_helpers.tpl
@@ -123,7 +123,7 @@
 {{- end -}}
 
 
-{{/* 
+{{/*
 Return Image pull secret Names
 Usage:
 {{- include "image.pullSecrets" (dict "pullSecrets" path_to_image_pullSecrets) | nindent 6 }}
@@ -150,7 +150,7 @@ imagePullSecrets:
 Cluster API Secrets
 */}}
 {{- define "cluster_api.secret" -}}
-{{- $secret := lookup "v1" "Secret" .Release.Namespace "weaviate-cluster-api-basic-auth" -}}
+{{- $secret := lookup "v1" "Secret" .Release.Namespace (printf "%s-cluster-api-basic-auth" .Release.Name) -}}
 {{- if $secret -}}
 {{/*
    Reusing value of secret if exist
@@ -167,7 +167,7 @@ password: {{ randAlphaNum 32 | b64enc | quote }}
 {{- end -}}
 
 
-{{/* 
+{{/*
 Return PriorityClassName
 Usage:
 {{- include "pod.priorityClassName" ( dict "global" .Values.path.to.global.priorityClassName "priorityClassName" .Values.path.to.priorityClassName) | nindent 6 }}
@@ -191,12 +191,13 @@ Usage:
 Raft cluster configuration settings
 */}}
 {{- define "raft_configuration" -}}
+  {{- $release_name := .Release.Name -}}
   {{- $replicas := .Values.replicas | int -}}
   {{- $voters := .Values.env.RAFT_BOOTSTRAP_EXPECT | int -}}
   {{- $metada_only_voters := false -}}
   {{- if not (empty .Values.env.RAFT_METADATA_ONLY_VOTERS) -}}
     {{- $metada_only_voters = .Values.env.RAFT_METADATA_ONLY_VOTERS -}}
-  {{- end -}} 
+  {{- end -}}
   {{- if empty .Values.env.RAFT_BOOTSTRAP_EXPECT -}}
     {{- if ge $replicas 10 -}}
       {{- $voters = 5 -}}
@@ -213,7 +214,7 @@ Raft cluster configuration settings
     {{- $nodes := list -}}
     {{- range $i := until $voters -}}
       {{- $node_name := list -}}
-      {{- $node_name = append $node_name "weaviate" -}}
+      {{- $node_name = append $node_name $release_name -}}
       {{- $node_name = append $node_name $i -}}
       {{- $nodes = append $nodes (join "-" $node_name) -}}
     {{- end -}}
@@ -236,3 +237,32 @@ Raft cluster configuration settings
     {{- fail "env.RAFT_METADATA_ONLY_VOTERS is true then .replicas size must be greater than env.RAFT_BOOTSTRAP_EXPECT" -}}
   {{- end -}}
 {{- end -}}
+
+
+{{/*
+Default affinity configuration
+*/}}
+{{- define "default_affinity" -}}
+podAntiAffinity:
+  preferredDuringSchedulingIgnoredDuringExecution:
+    - weight: 1
+      podAffinityTerm:
+        topologyKey: "kubernetes.io/hostname"
+        labelSelector:
+          matchExpressions:
+            - key: "app"
+              operator: In
+              values:
+                - {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Affinity configuration, try to use the provided affinity configuration, otherwise use the default one
+*/}}
+{{- define "affinity" -}}
+{{- if .Values.affinity }}
+{{- toYaml .Values.affinity | nindent 0 }}
+{{- else }}
+{{- include "default_affinity" . }}
+{{- end }}
+{{- end }}
diff --git a/weaviate/templates/apiKeyAnyscaleSecret.yaml b/weaviate/templates/apiKeyAnyscaleSecret.yaml
@@ -2,9 +2,9 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: weaviate-anyscale
+  name: {{ .Release.Name }}-anyscale
   labels:
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: helm
 type: Opaque
 data:

diff --git a/weaviate/templates/apiKeyCohereSecret.yaml b/weaviate/templates/apiKeyCohereSecret.yaml
@@ -22,9 +22,9 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: weaviate-cohere
+  name: {{ .Release.Name }}-cohere
   labels:
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 type: Opaque
 data:

diff --git a/weaviate/templates/apiKeyHuggingFaceSecret.yaml b/weaviate/templates/apiKeyHuggingFaceSecret.yaml
@@ -2,9 +2,9 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: weaviate-huggingface
+  name: {{ .Release.Name }}-huggingface
   labels:
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 type: Opaque
 data:

diff --git a/weaviate/templates/apiKeyJinaAISecret.yaml b/weaviate/templates/apiKeyJinaAISecret.yaml
@@ -2,9 +2,9 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: weaviate-jinaai
+  name: {{ .Release.Name }}-jinaai
   labels:
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 type: Opaque
 data:

diff --git a/weaviate/templates/apiKeyMistralSecret.yaml b/weaviate/templates/apiKeyMistralSecret.yaml
@@ -2,9 +2,9 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: weaviate-mistral
+  name: {{ .Release.Name }}-mistral
   labels:
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: helm
 type: Opaque
 data:

diff --git a/weaviate/templates/apiKeyOctoAISecret.yaml b/weaviate/templates/apiKeyOctoAISecret.yaml
@@ -18,9 +18,9 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: weaviate-octoai
+  name: {{ .Release.Name }}-octoai
   labels:
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 type: Opaque
 data:

diff --git a/weaviate/templates/apiKeyOpenAISecret.yaml b/weaviate/templates/apiKeyOpenAISecret.yaml
@@ -40,9 +40,9 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: weaviate-openai
+  name: {{ .Release.Name }}-openai
   labels:
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 type: Opaque
 data:

diff --git a/weaviate/templates/apiKeyPaLMSecret.yaml b/weaviate/templates/apiKeyPaLMSecret.yaml
@@ -22,9 +22,9 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: weaviate-palm
+  name: {{ .Release.Name }}-palm
   labels:
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 type: Opaque
 data:

diff --git a/weaviate/templates/apiKeyVoyageAISecret.yaml b/weaviate/templates/apiKeyVoyageAISecret.yaml
@@ -18,9 +18,9 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: weaviate-voyageai
+  name: {{ .Release.Name }}-voyageai
   labels:
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 type: Opaque
 data:

diff --git a/weaviate/templates/awsSecret.yaml b/weaviate/templates/awsSecret.yaml
@@ -22,9 +22,9 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: weaviate-aws
+  name: {{ .Release.Name }}-aws
   labels:
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 type: Opaque
 data:

diff --git a/weaviate/templates/backupAzureSecret.yaml b/weaviate/templates/backupAzureSecret.yaml
@@ -4,9 +4,9 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: backup-azure
+  name: {{ .Release.Name }}-backup-azure
   labels:
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 type: Opaque
 data:

diff --git a/weaviate/templates/backupGcsSecret.yaml b/weaviate/templates/backupGcsSecret.yaml
@@ -4,9 +4,9 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: backup-gcs
+  name: {{ .Release.Name }}-backup-gcs
   labels:
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 type: Opaque
 data:

diff --git a/weaviate/templates/backupS3Secret.yaml b/weaviate/templates/backupS3Secret.yaml
@@ -4,9 +4,9 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: backup-s3
+  name: {{ .Release.Name }}-backup-s3
   labels:
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 type: Opaque
 data:

diff --git a/weaviate/templates/contextionaryDeployment.yaml b/weaviate/templates/contextionaryDeployment.yaml
@@ -3,24 +3,24 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ index $module "fullnameOverride" }}
+  name: {{ .Release.Name}}-contextionary
   labels:
-    name: {{ index $module "fullnameOverride" }}
-    app: {{ index $module "fullnameOverride" }}
-    app.kubernetes.io/name: weaviate
+    name: {{ .Release.Name}}-contextionary
+    app: {{ .Release.Name}}-contextionary
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   replicas: {{ index $module "replicas" }}
   strategy:
 {{ toYaml (index $module "strategy") | indent 4}}
   selector:
     matchLabels:
-      app: {{ index $module "fullnameOverride" }}
+      app: {{ .Release.Name}}-contextionary
   template:
     metadata:
       labels:
-        app: {{ index $module "fullnameOverride" }}
-        app.kubernetes.io/name: weaviate
+        app: {{ .Release.Name}}-contextionary
+        app.kubernetes.io/name: {{ .Release.Name }}
         app.kubernetes.io/managed-by: {{ .Release.Service }}
     spec:
       securityContext:
@@ -33,7 +33,7 @@ spec:
       {{- include "image.pullSecrets" (dict "pullSecrets" (index $module "imagePullSecrets")) | nindent 6 }}
       {{- include "pod.priorityClassName" ( dict "global" $.Values.globalPriorityClassName "priorityClassName" (index $module "priorityClassName")) | nindent 6 }}
       containers:
-      - name: {{ index $module "fullnameOverride" }}
+      - name: {{ .Release.Name}}-contextionary
         image: {{ index $module "registry" }}/{{ index $module "repo" }}:{{ index $module "tag" }}
         imagePullPolicy: {{ index $module "imagePullPolicy" }}
         env:
@@ -42,7 +42,7 @@ spec:
           - name: EXTENSIONS_STORAGE_MODE
             value: {{ index $module "envconfig" "extensions_storage_mode" | quote }}
           - name: EXTENSIONS_STORAGE_ORIGIN
-            value: http://{{ .Values.service.name }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}
+            value: http://{{ .Release.Name }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}
           - name: NEIGHBOR_OCCURRENCE_IGNORE_PERCENTILE
             value: {{ index $module "envconfig" "neighbor_occurrence_ignore_percentile" | quote }}
           - name: ENABLE_COMPOUND_SPLITTING
@@ -64,7 +64,7 @@ spec:
       nodeSelector:
         {{ toYaml . | nindent 8 }}
       {{- end }}
-      {{- with index $module "affinity" | default .Values.affinity }}
+      {{- with index $module "affinity" | default (include "affinity" . | fromYaml) }}
       affinity:
         {{ toYaml . | nindent 8 }}
       {{- end }}
@@ -76,14 +76,14 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ index $module "fullnameOverride" }}
+  name: {{ .Release.Name}}-contextionary
   labels:
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   type: ClusterIP
   selector:
-    app: {{ index $module "fullnameOverride" }}
+    app: {{ .Release.Name}}-contextionary
   ports:
     - protocol: TCP
       port: 9999

diff --git a/weaviate/templates/gpt4allInferenceDeployment.yaml b/weaviate/templates/gpt4allInferenceDeployment.yaml
@@ -3,23 +3,23 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ index $module "fullnameOverride" }}
+  name: {{ .Release.Name }}-gpt4all-inference
   labels:
-    name: {{ index $module "fullnameOverride" }}
-    app: {{ index $module "fullnameOverride" }}
-    app.kubernetes.io/name: weaviate
+    name: {{ .Release.Name }}-gpt4all-inference
+    app: {{ .Release.Name }}-gpt4all-inference
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   replicas: {{ index $module "replicas" }}
   strategy:
 {{ toYaml (index $module "strategy") | indent 4}}
   selector:
     matchLabels:
-      app: {{ index $module "fullnameOverride" }}
+      app: {{ .Release.Name }}-gpt4all-inference
   template:
     metadata:
       labels:
-        app: {{ index $module "fullnameOverride" }}
+        app: {{ .Release.Name }}-gpt4all-inference
     spec:
       securityContext:
 {{ toYaml (index $module "securityContext") | indent 8}}
@@ -31,7 +31,7 @@ spec:
       {{- include "image.pullSecrets" (dict "pullSecrets" (index $module "imagePullSecrets")) | nindent 6 }}
       {{- include "pod.priorityClassName" ( dict "global" $.Values.globalPriorityClassName "priorityClassName" (index $module "priorityClassName")) | nindent 6 }}
       containers:
-      - name: {{ index $module "fullnameOverride" }}
+      - name: {{ .Release.Name }}-gpt4all-inference
         image: {{ index $module "registry" }}/{{ index $module "repo" }}:{{ index $module "tag" }}
         imagePullPolicy: {{ index $module "imagePullPolicy" }}
         resources:
@@ -53,7 +53,7 @@ spec:
       nodeSelector:
         {{ toYaml . | nindent 8 }}
       {{- end }}
-      {{- with index $module "affinity" | default .Values.affinity }}
+      {{- with index $module "affinity" | default (include "affinity" . | fromYaml) }}
       affinity:
         {{ toYaml . | nindent 8 }}
       {{- end }}
@@ -65,14 +65,14 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ index $module "fullnameOverride" }}
+  name: {{ .Release.Name }}-gpt4all-inference
   labels:
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   type: ClusterIP
   selector:
-    app: {{ index $module "fullnameOverride" }}
+    app: {{ .Release.Name }}-gpt4all-inference
   ports:
     - protocol: TCP
       port: 8080