From 043085f2875ec1d4d5b5689d77642b3ccf1c4b1d Mon Sep 17 00:00:00 2001
From: Yaroslav Dmytryk <excelsioner@gmail.com>
Date: Fri, 10 May 2024 11:01:35 +0300
Subject: [PATCH 01/25] update base k8s objects

---
 .gitignore                                    |  3 ++
 weaviate/templates/weaviateConfigMap.yaml     |  4 +-
 .../templates/weaviateHeadlessService.yaml    |  7 +--
 .../templates/weaviateSecretClusterAPI.yaml   |  2 +-
 weaviate/templates/weaviateService.yaml       |  6 +--
 weaviate/templates/weaviateServiceGRPC.yaml   |  6 +--
 .../templates/weaviateServiceMonitor.yaml     | 12 ++---
 weaviate/templates/weaviateStatefulset.yaml   | 46 +++++++++----------
 8 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/.gitignore b/.gitignore
index 62df402f..c707353e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,6 @@ chart.lock
 .DS_store
 deploy_key
 deploy_key.pub
+
+.idea
+.vs_code
diff --git a/weaviate/templates/weaviateConfigMap.yaml b/weaviate/templates/weaviateConfigMap.yaml
index 5f7db1ee..b899de0f 100644
--- a/weaviate/templates/weaviateConfigMap.yaml
+++ b/weaviate/templates/weaviateConfigMap.yaml
@@ -2,9 +2,9 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: weaviate-config
+  name: {{ .Release.Name }}-config
   labels:
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 data:
   conf.yaml: |-
diff --git a/weaviate/templates/weaviateHeadlessService.yaml b/weaviate/templates/weaviateHeadlessService.yaml
index 76a2563e..aaea368f 100644
--- a/weaviate/templates/weaviateHeadlessService.yaml
+++ b/weaviate/templates/weaviateHeadlessService.yaml
@@ -1,15 +1,16 @@
+{{/*TODO: update (remove all service names from values)*/}}
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.service.name }}-headless
+  name: {{ .Release.Name }}-headless
   labels:
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   type: ClusterIP
   clusterIP: None
   selector:
-    app: weaviate
+    app: {{ .Release.Name }}
   ports:
     - protocol: TCP
       port: 80
diff --git a/weaviate/templates/weaviateSecretClusterAPI.yaml b/weaviate/templates/weaviateSecretClusterAPI.yaml
index 8256dc88..c58e4e6e 100644
--- a/weaviate/templates/weaviateSecretClusterAPI.yaml
+++ b/weaviate/templates/weaviateSecretClusterAPI.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: weaviate-cluster-api-basic-auth
+  name: {{ .Release.Name }}-cluster-api-basic-auth
 type: kubernetes.io/basic-auth
 data:
 {{- ( include "cluster_api.secret" . ) | indent 2 -}}
diff --git a/weaviate/templates/weaviateService.yaml b/weaviate/templates/weaviateService.yaml
index 4fccc15d..13be8443 100644
--- a/weaviate/templates/weaviateService.yaml
+++ b/weaviate/templates/weaviateService.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.service.name }}
+  name: {{ .Release.Name }}
   labels:
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
   {{- with .Values.service.annotations }}
   annotations: {{ toYaml . | nindent 4 }}
@@ -11,7 +11,7 @@ metadata:
 spec:
   type: {{ .Values.service.type }}
   selector:
-    app: weaviate
+    app: {{ .Release.Name }}
   ports:
     {{- range .Values.service.ports }}
     - {{ toYaml . | indent 6 | trim }}
diff --git a/weaviate/templates/weaviateServiceGRPC.yaml b/weaviate/templates/weaviateServiceGRPC.yaml
index 1bb9ea3f..64087586 100644
--- a/weaviate/templates/weaviateServiceGRPC.yaml
+++ b/weaviate/templates/weaviateServiceGRPC.yaml
@@ -2,9 +2,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.grpcService.name }}
+  name: {{ .Release.Name }}-grpc
   labels:
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
   {{- with .Values.grpcService.annotations }}
   annotations: {{ toYaml . | nindent 4 }}
@@ -12,7 +12,7 @@ metadata:
 spec:
   type: {{ .Values.grpcService.type }}
   selector:
-    app: weaviate
+    app: {{ .Release.Name }}
   ports:
     {{- range .Values.grpcService.ports }}
     - {{ toYaml . | indent 6 | trim }}
diff --git a/weaviate/templates/weaviateServiceMonitor.yaml b/weaviate/templates/weaviateServiceMonitor.yaml
index 28bfe1dc..f6ecbd57 100644
--- a/weaviate/templates/weaviateServiceMonitor.yaml
+++ b/weaviate/templates/weaviateServiceMonitor.yaml
@@ -2,17 +2,17 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: weaviate
+  name: {{ .Release.Name }}
   labels:
-    name: weaviate
-    app: weaviate
-    app.kubernetes.io/name: weaviate
+    name: {{ .Release.Name }}
+    app: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
-  jobLabel: weaviate
+  jobLabel: {{ .Release.Name }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: weaviate
+      app.kubernetes.io/name: {{ .Release.Name }}
       app.kubernetes.io/managed-by: {{ .Release.Service }}
   namespaceSelector:
     matchNames:
diff --git a/weaviate/templates/weaviateStatefulset.yaml b/weaviate/templates/weaviateStatefulset.yaml
index 82cfd086..2c8fd51a 100644
--- a/weaviate/templates/weaviateStatefulset.yaml
+++ b/weaviate/templates/weaviateStatefulset.yaml
@@ -1,11 +1,11 @@
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: weaviate
+  name: {{ .Release.Name }}
   labels:
-    name: weaviate
-    app: weaviate
-    app.kubernetes.io/name: weaviate
+    name: {{ .Release.Name }}
+    app: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicas }}
@@ -15,12 +15,12 @@ spec:
   serviceName: {{ .Values.service.name }}-headless
   selector:
     matchLabels:
-      app: weaviate
+      app: {{ .Release.Name }}
   template:
     metadata:
       labels:
-        app: weaviate
-        app.kubernetes.io/name: weaviate
+        app: {{ .Release.Name }}
+        app.kubernetes.io/name: {{ .Release.Name }}
         app.kubernetes.io/managed-by: {{ .Release.Service }}
       annotations:
         # To restart Pods if the ConfigMap is updated.
@@ -85,12 +85,12 @@ spec:
           - name: CLUSTER_BASIC_AUTH_USERNAME
             valueFrom:
               secretKeyRef:
-                name: weaviate-cluster-api-basic-auth
+                name: {{ .Release.Name }}-cluster-api-basic-auth
                 key: username
           - name: CLUSTER_BASIC_AUTH_PASSWORD
             valueFrom:
               secretKeyRef:
-                name: weaviate-cluster-api-basic-auth
+                name: {{ .Release.Name }}-cluster-api-basic-auth
                 key: password
           - name: STANDALONE_MODE
             value: 'true'
@@ -189,63 +189,63 @@ spec:
           - name: OPENAI_APIKEY
             valueFrom:
               secretKeyRef:
-                name: weaviate-openai
+                name: {{ .Release.Name }}-openai
                 key: apiKey
           {{- end  }}
           {{ if or (and (index .Values "modules" "text2vec-openai" "enabled") (index .Values "modules" "text2vec-openai" "azureApiKey")) (and (index .Values "modules" "qna-openai" "enabled") (index .Values "modules" "qna-openai" "azureApiKey")) (and (index .Values "modules" "generative-openai" "enabled") (index .Values "modules" "generative-openai" "azureApiKey")) }}
           - name: AZURE_APIKEY
             valueFrom:
               secretKeyRef:
-                name: weaviate-openai
+                name: {{ .Release.Name }}-openai
                 key: apiKey
           {{- end  }}
           {{- if and (index .Values "modules" "text2vec-huggingface" "enabled") (index .Values "modules" "text2vec-huggingface" "apiKey") }}
           - name: HUGGINGFACE_APIKEY
             valueFrom:
               secretKeyRef:
-                name: weaviate-huggingface
+                name: {{ .Release.Name }}-huggingface
                 key: apiKey
           {{- end  }}
           {{- if or (and (index .Values "modules" "text2vec-cohere" "enabled") (index .Values "modules" "text2vec-cohere" "apiKey")) (and (index .Values "modules" "generative-cohere" "enabled") (index .Values "modules" "generative-cohere" "apiKey")) (and (index .Values "modules" "reranker-cohere" "enabled") (index .Values "modules" "reranker-cohere" "apiKey")) }}
           - name: COHERE_APIKEY
             valueFrom:
               secretKeyRef:
-                name: weaviate-cohere
+                name: {{ .Release.Name }}-cohere
                 key: apiKey
           {{- end  }}
           {{- if or (and (index .Values "modules" "text2vec-palm" "enabled") (index .Values "modules" "text2vec-palm" "apiKey")) (and (index .Values "modules" "generative-palm" "enabled") (index .Values "modules" "generative-palm" "apiKey")) (and (index .Values "modules" "multi2vec-palm" "enabled") (index .Values "modules" "multi2vec-palm" "apiKey")) }}
           - name: PALM_APIKEY
             valueFrom:
               secretKeyRef:
-                name: weaviate-palm
+                name: {{ .Release.Name }}-palm
                 key: apiKey
           {{- end  }}
           {{- if and (index .Values "modules" "text2vec-jinaai" "enabled") (index .Values "modules" "text2vec-jinaai" "apiKey") }}
           - name: JINAAI_APIKEY
             valueFrom:
               secretKeyRef:
-                name: weaviate-jinaai
+                name: {{ .Release.Name }}-jinaai
                 key: apiKey
           {{- end  }}
           {{- if or (and (index .Values "modules" "text2vec-voyageai" "enabled") (index .Values "modules" "text2vec-voyageai" "apiKey")) (and (index .Values "modules" "reranker-voyageai" "enabled") (index .Values "modules" "reranker-voyageai" "apiKey")) }}
           - name: VOYAGEAI_APIKEY
             valueFrom:
               secretKeyRef:
-                name: weaviate-voyageai
+                name: {{ .Release.Name }}-voyageai
                 key: apiKey
           {{- end  }}
           {{- if and (index .Values "modules" "generative-anyscale" "enabled") (index .Values "modules" "generative-anyscale" "apiKey") }}
           - name: ANYSCALE_APIKEY
             valueFrom:
               secretKeyRef:
-                name: weaviate-anyscale
+                name: {{ .Release.Name }}-anyscale
                 key: apiKey
           {{- end  }}
           {{- if and (index .Values "modules" "generative-mistral" "enabled") (index .Values "modules" "generative-mistral" "apiKey") }}
           - name: MISTRAL_APIKEY
             valueFrom:
               secretKeyRef:
-                name: weaviate-mistral
+                name: {{ .Release.Name }}-mistral
                 key: apiKey
           {{- end  }}
           {{- if and (index .Values "backups" "filesystem" "enabled") (index .Values "backups" "filesystem" "envconfig") }}
@@ -298,7 +298,7 @@ spec:
           - name: AWS_ACCESS_KEY_ID
             valueFrom:
               secretKeyRef:
-                name: weaviate-aws
+                name: {{ .Release.Name }}-aws
                 key: AWS_ACCESS_KEY_ID
             {{- end }}
             {{- if and (index .Values "backups" "s3" "secrets") (index .Values "backups" "s3" "secrets" "AWS_SECRET_ACCESS_KEY") }}
@@ -311,7 +311,7 @@ spec:
           - name: AWS_SECRET_ACCESS_KEY
             valueFrom:
               secretKeyRef:
-                name: weaviate-aws
+                name: {{ .Release.Name }}-aws
                 key: AWS_SECRET_ACCESS_KEY
             {{- end }}
           {{- end  }}
@@ -435,7 +435,7 @@ spec:
       volumes:
         - name: weaviate-config
           configMap:
-            {{ if .Values.custom_config_map.enabled }}name: {{ .Values.custom_config_map.name }} {{ else }}name: weaviate-config{{ end }}
+            {{ if .Values.custom_config_map.enabled }}name: {{ .Values.custom_config_map.name }} {{ else }}name: {{ .Release.Name }}-config{{ end }}
         {{- if index .Values "backups" "gcs" "enabled" }}
           {{- if and (index .Values "backups" "gcs" "secrets") (index .Values "backups" "gcs" "secrets" "GOOGLE_APPLICATION_CREDENTIALS") }}
         - name: gcs-service-account-credentials-volume
@@ -476,9 +476,9 @@ spec:
 
   volumeClaimTemplates:
   - metadata:
-      name: weaviate-data
+      name: {{ .Release.Name }}-data
       labels:
-        app.kubernetes.io/name: weaviate
+        app.kubernetes.io/name: {{ .Release.Name }}
         app.kubernetes.io/managed-by: {{ .Release.Service }}
     spec:
       accessModes: [ "ReadWriteOnce" ]

From 6130225176d787db02ef0f1fad73dfeaf03d92c1 Mon Sep 17 00:00:00 2001
From: Yaroslav Dmytryk <excelsioner@gmail.com>
Date: Fri, 10 May 2024 11:04:45 +0300
Subject: [PATCH 02/25] apis and backups

---
 weaviate/templates/apiKeyAnyscaleSecret.yaml    | 4 ++--
 weaviate/templates/apiKeyCohereSecret.yaml      | 4 ++--
 weaviate/templates/apiKeyHuggingFaceSecret.yaml | 4 ++--
 weaviate/templates/apiKeyJinaAISecret.yaml      | 4 ++--
 weaviate/templates/apiKeyMistralSecret.yaml     | 4 ++--
 weaviate/templates/apiKeyOpenAISecret.yaml      | 4 ++--
 weaviate/templates/apiKeyPaLMSecret.yaml        | 4 ++--
 weaviate/templates/apiKeyVoyageAISecret.yaml    | 4 ++--
 weaviate/templates/awsSecret.yaml               | 4 ++--
 weaviate/templates/backupAzureSecret.yaml       | 4 ++--
 weaviate/templates/backupGcsSecret.yaml         | 5 +++--
 weaviate/templates/backupS3Secret.yaml          | 4 ++--
 12 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/weaviate/templates/apiKeyAnyscaleSecret.yaml b/weaviate/templates/apiKeyAnyscaleSecret.yaml
index 8882b4d6..c5fe2f59 100644
--- 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
index 8c52064d..e61fa808 100644
--- 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
index 753f40d2..9fed2a2a 100644
--- 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
index 55fcce60..43d749b6 100644
--- 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
index 9ab7b115..6addac55 100644
--- 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/apiKeyOpenAISecret.yaml b/weaviate/templates/apiKeyOpenAISecret.yaml
index 30725029..c3a0ae93 100644
--- 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
index 6b44e1a6..d67fcaf0 100644
--- 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
index 025c9001..4f1cb1bf 100644
--- 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
index e14d30bb..1d8c893a 100644
--- 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
index 0b05bd07..1b7c0fbc 100644
--- 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
index c800c333..a8eaa939 100644
--- a/weaviate/templates/backupGcsSecret.yaml
+++ b/weaviate/templates/backupGcsSecret.yaml
@@ -4,9 +4,10 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: backup-gcs
+{{/*  TODO: check the usage*/}}
+  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
index fb306298..c358e336 100644
--- 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:

From 3b8a5dee58fffeb3daab30ad880789b011c7f847 Mon Sep 17 00:00:00 2001
From: Yaroslav Dmytryk <excelsioner@gmail.com>
Date: Fri, 10 May 2024 11:08:33 +0300
Subject: [PATCH 03/25] update the rest of the modules

---
 weaviate/templates/contextionaryDeployment.yaml         | 6 +++---
 weaviate/templates/gpt4allInferenceDeployment.yaml      | 4 ++--
 weaviate/templates/img2vecNeuralDeployment.yaml         | 4 ++--
 weaviate/templates/multi2vecBindDeployment.yaml         | 4 ++--
 weaviate/templates/multi2vecClipDeployment.yaml         | 4 ++--
 weaviate/templates/nerTransformersDeployment.yaml       | 4 ++--
 weaviate/templates/qnaTransformersDeployment.yaml       | 4 ++--
 weaviate/templates/rerankerTransformersDeployment.yaml  | 4 ++--
 weaviate/templates/sumTransformersDeployment.yaml       | 4 ++--
 weaviate/templates/textSpellcheckDeployment.yaml        | 4 ++--
 weaviate/templates/transformersInferenceDeployment.yaml | 6 +++---
 11 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/weaviate/templates/contextionaryDeployment.yaml b/weaviate/templates/contextionaryDeployment.yaml
index 7f894575..b1f2d70a 100644
--- a/weaviate/templates/contextionaryDeployment.yaml
+++ b/weaviate/templates/contextionaryDeployment.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     name: {{ index $module "fullnameOverride" }}
     app: {{ index $module "fullnameOverride" }}
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   replicas: {{ index $module "replicas" }}
@@ -20,7 +20,7 @@ spec:
     metadata:
       labels:
         app: {{ index $module "fullnameOverride" }}
-        app.kubernetes.io/name: weaviate
+        app.kubernetes.io/name: {{ .Release.Name }}
         app.kubernetes.io/managed-by: {{ .Release.Service }}
     spec:
       securityContext:
@@ -78,7 +78,7 @@ kind: Service
 metadata:
   name: {{ index $module "fullnameOverride" }}
   labels:
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   type: ClusterIP
diff --git a/weaviate/templates/gpt4allInferenceDeployment.yaml b/weaviate/templates/gpt4allInferenceDeployment.yaml
index 728a025d..eb26e59c 100644
--- a/weaviate/templates/gpt4allInferenceDeployment.yaml
+++ b/weaviate/templates/gpt4allInferenceDeployment.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     name: {{ index $module "fullnameOverride" }}
     app: {{ index $module "fullnameOverride" }}
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   replicas: {{ index $module "replicas" }}
@@ -67,7 +67,7 @@ kind: Service
 metadata:
   name: {{ index $module "fullnameOverride" }}
   labels:
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   type: ClusterIP
diff --git a/weaviate/templates/img2vecNeuralDeployment.yaml b/weaviate/templates/img2vecNeuralDeployment.yaml
index e182abf1..90dc57e6 100644
--- a/weaviate/templates/img2vecNeuralDeployment.yaml
+++ b/weaviate/templates/img2vecNeuralDeployment.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     name: {{ index $module "fullnameOverride" }}
     app: {{ index $module "fullnameOverride" }}
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   replicas: {{ index $module "replicas" }}
@@ -78,7 +78,7 @@ kind: Service
 metadata:
   name: {{ index $module "fullnameOverride" }}
   labels:
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   type: ClusterIP
diff --git a/weaviate/templates/multi2vecBindDeployment.yaml b/weaviate/templates/multi2vecBindDeployment.yaml
index ae4484d9..99bb2f17 100644
--- a/weaviate/templates/multi2vecBindDeployment.yaml
+++ b/weaviate/templates/multi2vecBindDeployment.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     name: {{ index $module "fullnameOverride" }}
     app: {{ index $module "fullnameOverride" }}
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   replicas: {{ index $module "replicas" }}
@@ -78,7 +78,7 @@ kind: Service
 metadata:
   name: {{ index $module "fullnameOverride" }}
   labels:
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   type: ClusterIP
diff --git a/weaviate/templates/multi2vecClipDeployment.yaml b/weaviate/templates/multi2vecClipDeployment.yaml
index ef95af58..0cebc38b 100644
--- a/weaviate/templates/multi2vecClipDeployment.yaml
+++ b/weaviate/templates/multi2vecClipDeployment.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     name: {{ index $module "fullnameOverride" }}
     app: {{ index $module "fullnameOverride" }}
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   replicas: {{ index $module "replicas" }}
@@ -78,7 +78,7 @@ kind: Service
 metadata:
   name: {{ index $module "fullnameOverride" }}
   labels:
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   type: ClusterIP
diff --git a/weaviate/templates/nerTransformersDeployment.yaml b/weaviate/templates/nerTransformersDeployment.yaml
index ad359847..7318a4ea 100644
--- a/weaviate/templates/nerTransformersDeployment.yaml
+++ b/weaviate/templates/nerTransformersDeployment.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     name: {{ index $module "fullnameOverride" }}
     app: {{ index $module "fullnameOverride" }}
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   replicas: {{ index $module "replicas" }}
@@ -78,7 +78,7 @@ kind: Service
 metadata:
   name: {{ index $module "fullnameOverride" }}
   labels:
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   type: ClusterIP
diff --git a/weaviate/templates/qnaTransformersDeployment.yaml b/weaviate/templates/qnaTransformersDeployment.yaml
index f0c5434e..92d5c6f2 100644
--- a/weaviate/templates/qnaTransformersDeployment.yaml
+++ b/weaviate/templates/qnaTransformersDeployment.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     name: {{ index $module "fullnameOverride" }}
     app: {{ index $module "fullnameOverride" }}
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   replicas: {{ index $module "replicas" }}
@@ -78,7 +78,7 @@ kind: Service
 metadata:
   name: {{ index $module "fullnameOverride" }}
   labels:
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   type: ClusterIP
diff --git a/weaviate/templates/rerankerTransformersDeployment.yaml b/weaviate/templates/rerankerTransformersDeployment.yaml
index 1fcb121e..0b78ec65 100644
--- a/weaviate/templates/rerankerTransformersDeployment.yaml
+++ b/weaviate/templates/rerankerTransformersDeployment.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     name: {{ index $module "fullnameOverride" }}
     app: {{ index $module "fullnameOverride" }}
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   replicas: {{ index $module "replicas" }}
@@ -78,7 +78,7 @@ kind: Service
 metadata:
   name: {{ index $module "fullnameOverride" }}
   labels:
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   type: ClusterIP
diff --git a/weaviate/templates/sumTransformersDeployment.yaml b/weaviate/templates/sumTransformersDeployment.yaml
index 59bab8a8..6acf3bec 100644
--- a/weaviate/templates/sumTransformersDeployment.yaml
+++ b/weaviate/templates/sumTransformersDeployment.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     name: {{ index $module "fullnameOverride" }}
     app: {{ index $module "fullnameOverride" }}
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   replicas: {{ index $module "replicas" }}
@@ -78,7 +78,7 @@ kind: Service
 metadata:
   name: {{ index $module "fullnameOverride" }}
   labels:
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   type: ClusterIP
diff --git a/weaviate/templates/textSpellcheckDeployment.yaml b/weaviate/templates/textSpellcheckDeployment.yaml
index 3a6a6439..e5cb0737 100644
--- a/weaviate/templates/textSpellcheckDeployment.yaml
+++ b/weaviate/templates/textSpellcheckDeployment.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     name: {{ index $module "fullnameOverride" }}
     app: {{ index $module "fullnameOverride" }}
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   replicas: {{ index $module "replicas" }}
@@ -67,7 +67,7 @@ kind: Service
 metadata:
   name: {{ index $module "fullnameOverride" }}
   labels:
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 
 spec:
diff --git a/weaviate/templates/transformersInferenceDeployment.yaml b/weaviate/templates/transformersInferenceDeployment.yaml
index d40ef134..1efed406 100644
--- a/weaviate/templates/transformersInferenceDeployment.yaml
+++ b/weaviate/templates/transformersInferenceDeployment.yaml
@@ -9,7 +9,7 @@ metadata:
   labels:
     name: {{ index $module "fullnameOverride" }}
     app: {{ index $module "fullnameOverride" }}
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   replicas: {{ index $module "replicas" }}
@@ -88,7 +88,7 @@ kind: Service
 metadata:
   name: {{ index $module "fullnameOverride" }}
   labels:
-    app.kubernetes.io/name: weaviate
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   type: ClusterIP
@@ -187,7 +187,7 @@ spec:
       port: 8080
       targetPort: 8080
   {{- end }}
----    
+---
   {{- if index $query "enabled" }}
 apiVersion: apps/v1
 kind: Deployment

From 167ec8ad527b5c2811dc1adeae4e31211a5a9f15 Mon Sep 17 00:00:00 2001
From: Yaroslav Dmytryk <excelsioner@gmail.com>
Date: Fri, 10 May 2024 11:23:16 +0300
Subject: [PATCH 04/25] remove service names from values.yaml

---
 .../templates/contextionaryDeployment.yaml    |  2 +-
 .../templates/weaviateHeadlessService.yaml    |  1 -
 weaviate/templates/weaviateStatefulset.yaml   |  4 +-
 weaviate/values.yaml                          | 62 +++++++++----------
 4 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/weaviate/templates/contextionaryDeployment.yaml b/weaviate/templates/contextionaryDeployment.yaml
index b1f2d70a..258fae27 100644
--- a/weaviate/templates/contextionaryDeployment.yaml
+++ b/weaviate/templates/contextionaryDeployment.yaml
@@ -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
diff --git a/weaviate/templates/weaviateHeadlessService.yaml b/weaviate/templates/weaviateHeadlessService.yaml
index aaea368f..8c81a61e 100644
--- a/weaviate/templates/weaviateHeadlessService.yaml
+++ b/weaviate/templates/weaviateHeadlessService.yaml
@@ -1,4 +1,3 @@
-{{/*TODO: update (remove all service names from values)*/}}
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/weaviate/templates/weaviateStatefulset.yaml b/weaviate/templates/weaviateStatefulset.yaml
index 2c8fd51a..19dc2218 100644
--- a/weaviate/templates/weaviateStatefulset.yaml
+++ b/weaviate/templates/weaviateStatefulset.yaml
@@ -12,7 +12,7 @@ spec:
   podManagementPolicy: {{ .Values.podManagementPolicy }}
   updateStrategy:
 {{ toYaml .Values.updateStrategy | indent 4}}
-  serviceName: {{ .Values.service.name }}-headless
+  serviceName: {{ .Release.Name }}-headless
   selector:
     matchLabels:
       app: {{ .Release.Name }}
@@ -368,7 +368,7 @@ spec:
             {{- end }}
           {{- end  }}
           - name: CLUSTER_JOIN
-            value: {{ .Values.service.name }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}
+            value: {{ .Release.Name }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}
         ports:
           - containerPort: 8080
           {{- if .Values.env.PROMETHEUS_MONITORING_ENABLED }}
diff --git a/weaviate/values.yaml b/weaviate/values.yaml
index 52ce2917..f1478bfe 100644
--- a/weaviate/values.yaml
+++ b/weaviate/values.yaml
@@ -25,15 +25,15 @@ args:
   - 'http'
   - '--config-file'
   - '/weaviate-config/conf.yaml'
-  - --read-timeout=60s 
+  - --read-timeout=60s
   - --write-timeout=60s
 
 # below is an example that can be used to set an arbitrary nofile limit at
 # startup:
 #
-# command: 
+# command:
 #   - "/bin/sh"
-# args: 
+# args:
 #   - "-c"
 #   - "ulimit -n 65535 && /bin/weaviate --host 0.0.0.0 --port 8080 --scheme http --config-file /weaviate-config/conf.yaml"
 
@@ -53,7 +53,7 @@ initContainers:
       repo: alpine
       tag: latest
       pullPolicy: IfNotPresent
-  
+
   extraInitContainers: {}
   # - image: some-image
   #   name: some-name
@@ -99,7 +99,7 @@ serviceAccountName:
 # Kubernetes Cluster domain name, used for resolving intra-cluster requests, i.e
 # between instances of weaviate.
 # Note: The final '.' on the end of the hostname makes it a FQDN, and is required for
-# DNS to resolve in all kubernetes environments. 
+# DNS to resolve in all kubernetes environments.
 # See https://github.com/weaviate/weaviate-helm/issues/175 for details.
 clusterDomain: cluster.local.
 
@@ -114,7 +114,6 @@ storage:
 # don't want a public load balancer, you can also choose 'ClusterIP' to make
 # weaviate only accessible within your cluster.
 service:
-  name: weaviate
   ports:
     - name: http
       protocol: TCP
@@ -133,7 +132,6 @@ service:
 # environment then it can be disabled by setting enabled: false option.
 grpcService:
   enabled: true
-  name: weaviate-grpc
   ports:
     - name: grpc
       protocol: TCP
@@ -287,7 +285,7 @@ env:
   PROMETHEUS_MONITORING_ENABLED: false
   PROMETHEUS_MONITORING_GROUP: false
 
-  # Set a MEM limit for the Weaviate Pod so it can help you both increase GC-related 
+  # Set a MEM limit for the Weaviate Pod so it can help you both increase GC-related
   # performance as well as avoid GC-related out-of-memory (“OOM”) situations
   # GOMEMLIMIT: 6GiB
 
@@ -335,13 +333,13 @@ backups:
     envconfig:
       # Configure folder where backups should be saved
       BACKUP_FILESYSTEM_PATH: /tmp/backups
-  
+
   s3:
     enabled: false
     # If one is using AWS EKS and has already configured K8s Service Account
     # that holds the AWS credentials one can pass a name of that service account
     # here using this setting.
-    # NOTE: the root `serviceAccountName` config has priority over this one, and 
+    # NOTE: the root `serviceAccountName` config has priority over this one, and
     # if the root one is set this one will NOT overwrite it. This one is here for
     # backwards compatibility.
     serviceAccountName:
@@ -350,17 +348,17 @@ backups:
       # Configure bucket where backups should be saved, this setting is mandatory
       BACKUP_S3_BUCKET: weaviate-backups
 
-      # Optional setting. Defaults to empty string. 
+      # Optional setting. Defaults to empty string.
       # Set this option if you want to save backups to a given location
       # inside the bucket
       # BACKUP_S3_PATH: path/inside/bucket
 
-      # Optional setting. Defaults to AWS S3 (s3.amazonaws.com). 
+      # Optional setting. Defaults to AWS S3 (s3.amazonaws.com).
       # Set this option if you have a MinIO storage configured in your environment
       # and want to use it instead of the AWS S3.
       # BACKUP_S3_ENDPOINT: custom.minio.endpoint.address
 
-      # Optional setting. Defaults to true. 
+      # Optional setting. Defaults to true.
       # Set this option if you don't want to use SSL.
       # BACKUP_S3_USE_SSL: true
 
@@ -373,7 +371,7 @@ backups:
     # You can pass the User credentials (access-key id and access-secret-key) in 2 ways:
     # 1. by setting the AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY plain values in the `secrets` section below
     #     this chart will create a kubernetes secret for you with these key-values pairs
-    # 2. create Kubernetes secret/s with AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY  keys and their respective values 
+    # 2. create Kubernetes secret/s with AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY  keys and their respective values
     #     Set the Key and the secret where it is set in `envSecrets` section below
     secrets: {}
     #   AWS_ACCESS_KEY_ID: access-key-id (plain text)
@@ -421,7 +419,7 @@ backups:
       # Configure container where backups should be saved, this setting is mandatory
       BACKUP_AZURE_CONTAINER: weaviate-backups
 
-      # Optional setting. Defaults to empty string. 
+      # Optional setting. Defaults to empty string.
       # Set this option if you want to save backups to a given location
       # inside the container
       # BACKUP_AZURE_PATH: path/inside/container
@@ -432,7 +430,7 @@ backups:
     # 1. by setting the AZURE_STORAGE_ACCOUNT and AZURE_STORAGE_KEY
     #     or AZURE_STORAGE_CONNECTION_STRING plain values in the `secrets` section below
     #     this chart will create a kubernetes secret for you with these key-values pairs
-    # 2. create Kubernetes secret/s with AZURE_STORAGE_ACCOUNT and AZURE_STORAGE_KEY 
+    # 2. create Kubernetes secret/s with AZURE_STORAGE_ACCOUNT and AZURE_STORAGE_KEY
     #     or AZURE_STORAGE_CONNECTION_STRING and their respective values
     #     Set the Key and the secret where it is set in `envSecrets` section below
     secrets: {}
@@ -580,7 +578,7 @@ modules:
     # as described here: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
     # applies to passageQueryService below
     securityContext: {}
-    
+
     # It is possible to add a ServiceAccount to this module's Pods, it can be
     # used in cases where the module is in a private registry and you want to
     # give access to the registry only to this pod.
@@ -650,13 +648,13 @@ modules:
         # as described here: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
         # applies to passageQueryService below
         securityContext: {}
-        
+
         # It is possible to add a ServiceAccount to this module's Pods, it can be
         # used in cases where the module is in a private registry and you want to
         # give access to the registry only to this pod.
         # NOTE: if not set the root `serviceAccountName` config will be used.
         serviceAccountName:
-        
+
         # You can guide where the pods are scheduled on a per-module basis,
         # as well as for Weaviate overall. Each module accepts nodeSelector,
         # tolerations, and affinity configuration. If it is set on a per-
@@ -721,7 +719,7 @@ modules:
         # as described here: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
         # applies to passageQueryService below
         securityContext: {}
-        
+
         # It is possible to add a ServiceAccount to this module's Pods, it can be
         # used in cases where the module is in a private registry and you want to
         # give access to the registry only to this pod.
@@ -742,7 +740,7 @@ modules:
   # These models run only on CPU only and on x86_64 arch
   # The ML model is containerized in a Weaviate compatible way.
   # If you want to run a different model that published ones you can follow the
-  # tutorial from here on how to create such a container: https://github.com/weaviate/t2v-gpt4all-models 
+  # tutorial from here on how to create such a container: https://github.com/weaviate/t2v-gpt4all-models
   text2vec-gpt4all:
 
     # Enable deployment of this module
@@ -751,7 +749,7 @@ modules:
     # You can set directly an inference URL of this module without deploying it with this release.
     # You can do so by setting a value for the `inferenceUrl` here AND by setting the `enable` to `false`
     inferenceUrl: {}
-    
+
     # The configuration below is ignored if enabled==false
     tag: all-MiniLM-L6-v2
     repo: semitechnologies/gpt4all-inference
@@ -783,7 +781,7 @@ modules:
     # security Context for the Contextionary Pods. The configurations are the same as setting them
     # as described here: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
     securityContext: {}
-    
+
     # It is possible to add a ServiceAccount to this module's Pods, it can be
     # used in cases where the module is in a private registry and you want to
     # give access to the registry only to this pod.
@@ -1133,7 +1131,7 @@ modules:
     # security Context for the Contextionary Pods. The configurations are the same as setting them
     # as described here: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
     securityContext: {}
-    
+
     # It is possible to add a ServiceAccount to this module's Pods, it can be
     # used in cases where the module is in a private registry and you want to
     # give access to the registry only to this pod.
@@ -1309,7 +1307,7 @@ modules:
     # security Context for the Contextionary Pods. The configurations are the same as setting them
     # as described here: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
     securityContext: {}
-    
+
     # It is possible to add a ServiceAccount to this module's Pods, it can be
     # used in cases where the module is in a private registry and you want to
     # give access to the registry only to this pod.
@@ -1326,7 +1324,7 @@ modules:
     affinity:
 
   # The reranker-cohere module uses Cohere API
-  # to dynamically compute a score for the relevance 
+  # to dynamically compute a score for the relevance
   # of the query with each of the initial search results.
   # More information about Cohere API can be found here: https://docs.cohere.com/docs/rerank-guide
   reranker-cohere:
@@ -1339,7 +1337,7 @@ modules:
     apiKey: ''
 
   # The reranker-voyageai module uses VoaygeAI API
-  # to dynamically compute a score for the relevance 
+  # to dynamically compute a score for the relevance
   # of the query with each of the initial search results.
   # More information about Cohere API can be found here: https://www.voyageai.com/
   reranker-voyageai:
@@ -1351,7 +1349,7 @@ modules:
     # an environment variable
     apiKey: ''
 
-  # The reranker-transformers module uses Cross-Encoders for 
+  # The reranker-transformers module uses Cross-Encoders for
   # sentence pair scoring and sentence pair classification tasks.
   # More information about Cross-Encoders can be found here:
   # https://www.sbert.net/examples/applications/cross-encoder/README.html
@@ -1411,7 +1409,7 @@ modules:
     # security Context for the Contextionary Pods. The configurations are the same as setting them
     # as described here: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
     securityContext: {}
-    
+
     # It is possible to add a ServiceAccount to this module's Pods, it can be
     # used in cases where the module is in a private registry and you want to
     # give access to the registry only to this pod.
@@ -1468,7 +1466,7 @@ modules:
     # security Context for the Contextionary Pods. The configurations are the same as setting them
     # as described here: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
     securityContext: {}
-    
+
     # It is possible to add a ServiceAccount to this module's Pods, it can be
     # used in cases where the module is in a private registry and you want to
     # give access to the registry only to this pod.
@@ -1542,7 +1540,7 @@ modules:
     # security Context for the Contextionary Pods. The configurations are the same as setting them
     # as described here: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
     securityContext: {}
-    
+
     # It is possible to add a ServiceAccount to this module's Pods, it can be
     # used in cases where the module is in a private registry and you want to
     # give access to the registry only to this pod.
@@ -1615,7 +1613,7 @@ modules:
     # security Context for the Contextionary Pods. The configurations are the same as setting them
     # as described here: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
     securityContext: {}
-    
+
     # It is possible to add a ServiceAccount to this module's Pods, it can be
     # used in cases where the module is in a private registry and you want to
     # give access to the registry only to this pod.

From 687eab9cf064ae2065b7f0716fb3a4f78c40e384 Mon Sep 17 00:00:00 2001
From: Yaroslav Dmytryk <excelsioner@gmail.com>
Date: Fri, 10 May 2024 11:31:21 +0300
Subject: [PATCH 05/25] update backup usage

---
 weaviate/templates/backupGcsSecret.yaml     |  1 -
 weaviate/templates/weaviateStatefulset.yaml | 12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/weaviate/templates/backupGcsSecret.yaml b/weaviate/templates/backupGcsSecret.yaml
index a8eaa939..eb5d0c80 100644
--- a/weaviate/templates/backupGcsSecret.yaml
+++ b/weaviate/templates/backupGcsSecret.yaml
@@ -4,7 +4,6 @@
 apiVersion: v1
 kind: Secret
 metadata:
-{{/*  TODO: check the usage*/}}
   name: {{ .Release.Name }}-backup-gcs
   labels:
     app.kubernetes.io/name: {{ .Release.Name }}
diff --git a/weaviate/templates/weaviateStatefulset.yaml b/weaviate/templates/weaviateStatefulset.yaml
index 19dc2218..c56d8bfb 100644
--- a/weaviate/templates/weaviateStatefulset.yaml
+++ b/weaviate/templates/weaviateStatefulset.yaml
@@ -292,7 +292,7 @@ spec:
           - name: AWS_ACCESS_KEY_ID
             valueFrom:
               secretKeyRef:
-                name: backup-s3
+                name: {{ .Release.Name }}-backup-s3
                 key: AWS_ACCESS_KEY_ID
             {{- else if or (and (index .Values "modules" "text2vec-aws" "secrets") (index .Values "modules" "text2vec-aws" "secrets" "AWS_ACCESS_KEY_ID")) (and (index .Values "modules" "generative-aws" "secrets") (index .Values "modules" "generative-aws" "secrets" "AWS_ACCESS_KEY_ID")) }}
           - name: AWS_ACCESS_KEY_ID
@@ -305,7 +305,7 @@ spec:
           - name: AWS_SECRET_ACCESS_KEY
             valueFrom:
               secretKeyRef:
-                name: backup-s3
+                name: {{ .Release.Name }}-backup-s3
                 key: AWS_SECRET_ACCESS_KEY
             {{- else if or (and (index .Values "modules" "text2vec-aws" "secrets") (index .Values "modules" "text2vec-aws" "secrets" "AWS_SECRET_ACCESS_KEY")) (and (index .Values "modules" "generative-aws" "secrets") (index .Values "modules" "generative-aws" "secrets" "AWS_SECRET_ACCESS_KEY")) }}
           - name: AWS_SECRET_ACCESS_KEY
@@ -349,21 +349,21 @@ spec:
           - name: AZURE_STORAGE_ACCOUNT
             valueFrom:
               secretKeyRef:
-                name: backup-azure
+                name: {{ .Release.Name }}-backup-azure
                 key: AZURE_STORAGE_ACCOUNT
             {{- end }}
             {{- if and (index .Values "backups" "azure" "secrets") (index .Values "backups" "azure" "secrets" "AZURE_STORAGE_KEY") }}
           - name: AZURE_STORAGE_KEY
             valueFrom:
               secretKeyRef:
-                name: backup-azure
+                name: {{ .Release.Name }}-backup-azure
                 key: AZURE_STORAGE_KEY
             {{- end }}
             {{- if and (index .Values "backups" "azure" "secrets") (index .Values "backups" "azure" "secrets" "AZURE_STORAGE_CONNECTION_STRING") }}
           - name: AZURE_STORAGE_CONNECTION_STRING
             valueFrom:
               secretKeyRef:
-                name: backup-azure
+                name: {{ .Release.Name }}-backup-azure
                 key: AZURE_STORAGE_CONNECTION_STRING
             {{- end }}
           {{- end  }}
@@ -440,7 +440,7 @@ spec:
           {{- if and (index .Values "backups" "gcs" "secrets") (index .Values "backups" "gcs" "secrets" "GOOGLE_APPLICATION_CREDENTIALS") }}
         - name: gcs-service-account-credentials-volume
           secret:
-            secretName: backup-gcs
+            secretName: {{ .Release.Name }}-backup-gcs
             items:
             - key: GOOGLE_APPLICATION_CREDENTIALS
               path: credentials.json

From bbd86db1526227686d2ceb474629c7ab77b9fd23 Mon Sep 17 00:00:00 2001
From: Yaroslav Dmytryk <excelsioner@gmail.com>
Date: Fri, 10 May 2024 12:34:30 +0300
Subject: [PATCH 06/25] fix volumeMounts

---
 weaviate/templates/weaviateStatefulset.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/weaviate/templates/weaviateStatefulset.yaml b/weaviate/templates/weaviateStatefulset.yaml
index c56d8bfb..2fd24757 100644
--- a/weaviate/templates/weaviateStatefulset.yaml
+++ b/weaviate/templates/weaviateStatefulset.yaml
@@ -384,7 +384,7 @@ spec:
         volumeMounts:
           - name: weaviate-config
             mountPath: /weaviate-config
-          - name: weaviate-data
+          - name: {{ .Release.Name }}-data
             mountPath: /var/lib/weaviate
           {{- if index .Values "backups" "gcs" "enabled" }}
             {{- if or (index .Values "backups" "gcs" "secrets") (index .Values "backups" "gcs" "envSecrets") }}

From ae945884e961c7b759e08b5b1313c7a28f8ee118 Mon Sep 17 00:00:00 2001
From: Yaroslav Dmytryk <excelsioner@gmail.com>
Date: Fri, 10 May 2024 12:59:46 +0300
Subject: [PATCH 07/25] backward compatibility for services

---
 weaviate/templates/weaviateService.yaml     | 2 +-
 weaviate/templates/weaviateServiceGRPC.yaml | 2 +-
 weaviate/values.yaml                        | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/weaviate/templates/weaviateService.yaml b/weaviate/templates/weaviateService.yaml
index 13be8443..0b3e7544 100644
--- a/weaviate/templates/weaviateService.yaml
+++ b/weaviate/templates/weaviateService.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Release.Name }}
+  name: {{ .Values.service.name | default .Release.Name }}
   labels:
     app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
diff --git a/weaviate/templates/weaviateServiceGRPC.yaml b/weaviate/templates/weaviateServiceGRPC.yaml
index 64087586..cd96ff5b 100644
--- a/weaviate/templates/weaviateServiceGRPC.yaml
+++ b/weaviate/templates/weaviateServiceGRPC.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Release.Name }}-grpc
+  name: {{ .Values.grpcService.name | default (printf "%s-grpc" .Release.Name) }}
   labels:
     app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
diff --git a/weaviate/values.yaml b/weaviate/values.yaml
index f1478bfe..b2b9c975 100644
--- a/weaviate/values.yaml
+++ b/weaviate/values.yaml
@@ -114,6 +114,7 @@ storage:
 # don't want a public load balancer, you can also choose 'ClusterIP' to make
 # weaviate only accessible within your cluster.
 service:
+  name: weaviate
   ports:
     - name: http
       protocol: TCP
@@ -132,6 +133,7 @@ service:
 # environment then it can be disabled by setting enabled: false option.
 grpcService:
   enabled: true
+  name: weaviate-grpc
   ports:
     - name: grpc
       protocol: TCP

From d0dfc2f5e03641b5dc4bb281396b8d3869a785b0 Mon Sep 17 00:00:00 2001
From: Yaroslav Dmytryk <excelsioner@gmail.com>
Date: Fri, 10 May 2024 14:15:50 +0300
Subject: [PATCH 08/25] add default affinity

---
 weaviate/templates/_helpers.tpl             | 24 ++++++++++++++++++---
 weaviate/templates/weaviateStatefulset.yaml |  2 +-
 weaviate/values.yaml                        | 11 ----------
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/weaviate/templates/_helpers.tpl b/weaviate/templates/_helpers.tpl
index 8eef5325..9037b744 100644
--- a/weaviate/templates/_helpers.tpl
+++ b/weaviate/templates/_helpers.tpl
@@ -111,7 +111,7 @@
 {{- end -}}
 
 
-{{/* 
+{{/*
 Return Image pull secret Names
 Usage:
 {{- include "image.pullSecrets" (dict "pullSecrets" path_to_image_pullSecrets) | nindent 6 }}
@@ -155,7 +155,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 }}
@@ -184,7 +184,7 @@ Raft cluster configuration settings
   {{- $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 -}}
@@ -224,3 +224,21 @@ 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 for the chart
+*/}}
+{{- define "default_affinity" -}}
+podAntiAffinity:
+  preferredDuringSchedulingIgnoredDuringExecution:
+    - weight: 1
+      podAffinityTerm:
+        topologyKey: "kubernetes.io/hostname"
+        labelSelector:
+          matchExpressions:
+            - key: "app"
+              operator: In
+              values:
+                - {{ .Release.Name }}
+{{- end }}
diff --git a/weaviate/templates/weaviateStatefulset.yaml b/weaviate/templates/weaviateStatefulset.yaml
index 2fd24757..15c61cd0 100644
--- a/weaviate/templates/weaviateStatefulset.yaml
+++ b/weaviate/templates/weaviateStatefulset.yaml
@@ -461,7 +461,7 @@ spec:
       nodeSelector:
         {{ toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.affinity }}
+      {{- with .Values.affinity | default (include "default_affinity" . | fromYaml) }}
       affinity:
         {{ toYaml . | nindent 8 }}
       {{- end }}
diff --git a/weaviate/values.yaml b/weaviate/values.yaml
index b2b9c975..bebf3a75 100644
--- a/weaviate/values.yaml
+++ b/weaviate/values.yaml
@@ -1658,17 +1658,6 @@ tolerations:
 hostAliases:
 
 affinity:
-  podAntiAffinity:
-    preferredDuringSchedulingIgnoredDuringExecution:
-      - weight: 1
-        podAffinityTerm:
-          topologyKey: "kubernetes.io/hostname"
-          labelSelector:
-            matchExpressions:
-              - key: "app"
-                operator: In
-                values:
-                  - weaviate
 
 ## Optionally specify priorityClass name for the pod
 ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/#pod-priority

From d4a152182807e0c731a25255c670d4f0875df310 Mon Sep 17 00:00:00 2001
From: Yaroslav Dmytryk <excelsioner@gmail.com>
Date: Fri, 10 May 2024 15:38:29 +0300
Subject: [PATCH 09/25] wip

---
 weaviate/templates/_helpers.tpl | 13 ++++++++++++-
 weaviate/values.yaml            | 11 +++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/weaviate/templates/_helpers.tpl b/weaviate/templates/_helpers.tpl
index 9037b744..282368f4 100644
--- a/weaviate/templates/_helpers.tpl
+++ b/weaviate/templates/_helpers.tpl
@@ -227,7 +227,7 @@ Raft cluster configuration settings
 
 
 {{/*
-Default affinity for the chart
+Default affinity configuration
 */}}
 {{- define "default_affinity" -}}
 podAntiAffinity:
@@ -242,3 +242,14 @@ podAntiAffinity:
               values:
                 - {{ .Release.Name }}
 {{- end }}
+
+{{/*
+Affinity configuration
+*/}}
+{{- define "affinity" -}}
+{{- if .Values.affinity }}
+{{- toYaml .Values.affinity | nindent 0 }}
+{{- else }}
+{{- include "default_affinity" . }}
+{{- end }}
+{{- end }}
diff --git a/weaviate/values.yaml b/weaviate/values.yaml
index bebf3a75..68a060a8 100644
--- a/weaviate/values.yaml
+++ b/weaviate/values.yaml
@@ -1658,6 +1658,17 @@ tolerations:
 hostAliases:
 
 affinity:
+#  podAntiAffinity:
+#    preferredDuringSchedulingIgnoredDuringExecution:
+#      - weight: 1
+#        podAffinityTerm:
+#          topologyKey: "kubernetes.io/hostname"
+#          labelSelector:
+#            matchExpressions:
+#              - key: "app"
+#                operator: In
+#                values:
+#                  - weaviate
 
 ## Optionally specify priorityClass name for the pod
 ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/#pod-priority

From f60498ce365fe8201b4a8a10603050494eaec289 Mon Sep 17 00:00:00 2001
From: Yaroslav Dmytryk <excelsioner@gmail.com>
Date: Fri, 10 May 2024 15:48:08 +0300
Subject: [PATCH 10/25] wip

---
 weaviate/templates/contextionaryDeployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/weaviate/templates/contextionaryDeployment.yaml b/weaviate/templates/contextionaryDeployment.yaml
index 258fae27..2171b7fb 100644
--- a/weaviate/templates/contextionaryDeployment.yaml
+++ b/weaviate/templates/contextionaryDeployment.yaml
@@ -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 }}

From 8cc3eb3699cb9e6a3868912301beaa1f98766e40 Mon Sep 17 00:00:00 2001
From: Yaroslav Dmytryk <excelsioner@gmail.com>
Date: Fri, 10 May 2024 15:50:54 +0300
Subject: [PATCH 11/25] add comment

---
 weaviate/templates/_helpers.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/weaviate/templates/_helpers.tpl b/weaviate/templates/_helpers.tpl
index 282368f4..29361484 100644
--- a/weaviate/templates/_helpers.tpl
+++ b/weaviate/templates/_helpers.tpl
@@ -244,7 +244,7 @@ podAntiAffinity:
 {{- end }}
 
 {{/*
-Affinity configuration
+Affinity configuration, try to use the provided affinity configuration, otherwise use the default one
 */}}
 {{- define "affinity" -}}
 {{- if .Values.affinity }}

From 4ea90d2c6a59207431fe21553143bf2b61433031 Mon Sep 17 00:00:00 2001
From: Yaroslav Dmytryk <excelsioner@gmail.com>
Date: Fri, 10 May 2024 18:31:40 +0300
Subject: [PATCH 12/25] update deployment

---
 weaviate/templates/gpt4allInferenceDeployment.yaml      | 2 +-
 weaviate/templates/img2vecNeuralDeployment.yaml         | 2 +-
 weaviate/templates/multi2vecBindDeployment.yaml         | 2 +-
 weaviate/templates/multi2vecClipDeployment.yaml         | 2 +-
 weaviate/templates/nerTransformersDeployment.yaml       | 2 +-
 weaviate/templates/qnaTransformersDeployment.yaml       | 2 +-
 weaviate/templates/rerankerTransformersDeployment.yaml  | 2 +-
 weaviate/templates/sumTransformersDeployment.yaml       | 2 +-
 weaviate/templates/textSpellcheckDeployment.yaml        | 2 +-
 weaviate/templates/transformersInferenceDeployment.yaml | 2 +-
 weaviate/templates/weaviateStatefulset.yaml             | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/weaviate/templates/gpt4allInferenceDeployment.yaml b/weaviate/templates/gpt4allInferenceDeployment.yaml
index eb26e59c..fd5d9ea4 100644
--- a/weaviate/templates/gpt4allInferenceDeployment.yaml
+++ b/weaviate/templates/gpt4allInferenceDeployment.yaml
@@ -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 }}
diff --git a/weaviate/templates/img2vecNeuralDeployment.yaml b/weaviate/templates/img2vecNeuralDeployment.yaml
index 90dc57e6..f4c17c8f 100644
--- a/weaviate/templates/img2vecNeuralDeployment.yaml
+++ b/weaviate/templates/img2vecNeuralDeployment.yaml
@@ -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 }}
diff --git a/weaviate/templates/multi2vecBindDeployment.yaml b/weaviate/templates/multi2vecBindDeployment.yaml
index 99bb2f17..58ad7808 100644
--- a/weaviate/templates/multi2vecBindDeployment.yaml
+++ b/weaviate/templates/multi2vecBindDeployment.yaml
@@ -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 }}
diff --git a/weaviate/templates/multi2vecClipDeployment.yaml b/weaviate/templates/multi2vecClipDeployment.yaml
index 0cebc38b..80b762c1 100644
--- a/weaviate/templates/multi2vecClipDeployment.yaml
+++ b/weaviate/templates/multi2vecClipDeployment.yaml
@@ -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 }}
diff --git a/weaviate/templates/nerTransformersDeployment.yaml b/weaviate/templates/nerTransformersDeployment.yaml
index 7318a4ea..a61dc0ad 100644
--- a/weaviate/templates/nerTransformersDeployment.yaml
+++ b/weaviate/templates/nerTransformersDeployment.yaml
@@ -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 }}
diff --git a/weaviate/templates/qnaTransformersDeployment.yaml b/weaviate/templates/qnaTransformersDeployment.yaml
index 92d5c6f2..e404245f 100644
--- a/weaviate/templates/qnaTransformersDeployment.yaml
+++ b/weaviate/templates/qnaTransformersDeployment.yaml
@@ -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 }}
diff --git a/weaviate/templates/rerankerTransformersDeployment.yaml b/weaviate/templates/rerankerTransformersDeployment.yaml
index 0b78ec65..e991d532 100644
--- a/weaviate/templates/rerankerTransformersDeployment.yaml
+++ b/weaviate/templates/rerankerTransformersDeployment.yaml
@@ -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 }}
diff --git a/weaviate/templates/sumTransformersDeployment.yaml b/weaviate/templates/sumTransformersDeployment.yaml
index 6acf3bec..d727633c 100644
--- a/weaviate/templates/sumTransformersDeployment.yaml
+++ b/weaviate/templates/sumTransformersDeployment.yaml
@@ -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 }}
diff --git a/weaviate/templates/textSpellcheckDeployment.yaml b/weaviate/templates/textSpellcheckDeployment.yaml
index e5cb0737..dce149e6 100644
--- a/weaviate/templates/textSpellcheckDeployment.yaml
+++ b/weaviate/templates/textSpellcheckDeployment.yaml
@@ -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 }}
diff --git a/weaviate/templates/transformersInferenceDeployment.yaml b/weaviate/templates/transformersInferenceDeployment.yaml
index 1efed406..1ba9b6da 100644
--- a/weaviate/templates/transformersInferenceDeployment.yaml
+++ b/weaviate/templates/transformersInferenceDeployment.yaml
@@ -74,7 +74,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 }}
diff --git a/weaviate/templates/weaviateStatefulset.yaml b/weaviate/templates/weaviateStatefulset.yaml
index 15c61cd0..cf2ba536 100644
--- a/weaviate/templates/weaviateStatefulset.yaml
+++ b/weaviate/templates/weaviateStatefulset.yaml
@@ -461,7 +461,7 @@ spec:
       nodeSelector:
         {{ toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.affinity | default (include "default_affinity" . | fromYaml) }}
+      {{- with .Values.affinity | default (include "affinity" . | fromYaml) }}
       affinity:
         {{ toYaml . | nindent 8 }}
       {{- end }}

From 8a3aa022daa954cae4941534b24b3f2c3b4c1f97 Mon Sep 17 00:00:00 2001
From: Yaroslav Dmytryk <excelsioner@gmail.com>
Date: Fri, 10 May 2024 19:19:00 +0300
Subject: [PATCH 13/25] add octoai

---
 weaviate/templates/apiKeyOctoAISecret.yaml  | 4 ++--
 weaviate/templates/weaviateStatefulset.yaml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/weaviate/templates/apiKeyOctoAISecret.yaml b/weaviate/templates/apiKeyOctoAISecret.yaml
index e8473606..e65cda1b 100644
--- 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/weaviateStatefulset.yaml b/weaviate/templates/weaviateStatefulset.yaml
index ec1641c0..41ab2d15 100644
--- a/weaviate/templates/weaviateStatefulset.yaml
+++ b/weaviate/templates/weaviateStatefulset.yaml
@@ -252,7 +252,7 @@ spec:
           - name: OCTOAI_APIKEY
             valueFrom:
               secretKeyRef:
-                name: weaviate-octoai
+                name: {{ .Release.Name }}-octoai
                 key: apiKey
           {{- end  }}
           {{- if and (index .Values "backups" "filesystem" "enabled") (index .Values "backups" "filesystem" "envconfig") }}

From 88ef0a5db078dd8877d6b94b12561ddb4204ffd1 Mon Sep 17 00:00:00 2001
From: Yaroslav Dmytryk <excelsioner@gmail.com>
Date: Sat, 11 May 2024 15:50:28 +0300
Subject: [PATCH 14/25] update deployment names

---
 weaviate/templates/contextionaryDeployment.yaml  | 16 ++++++++--------
 .../templates/gpt4allInferenceDeployment.yaml    | 16 ++++++++--------
 weaviate/templates/img2vecNeuralDeployment.yaml  | 16 ++++++++--------
 weaviate/templates/multi2vecBindDeployment.yaml  | 16 ++++++++--------
 weaviate/templates/multi2vecClipDeployment.yaml  | 16 ++++++++--------
 .../templates/nerTransformersDeployment.yaml     | 16 ++++++++--------
 .../templates/qnaTransformersDeployment.yaml     | 16 ++++++++--------
 .../rerankerTransformersDeployment.yaml          | 16 ++++++++--------
 .../templates/sumTransformersDeployment.yaml     | 16 ++++++++--------
 weaviate/templates/textSpellcheckDeployment.yaml | 16 ++++++++--------
 .../transformersInferenceDeployment.yaml         | 16 ++++++++--------
 11 files changed, 88 insertions(+), 88 deletions(-)

diff --git a/weaviate/templates/contextionaryDeployment.yaml b/weaviate/templates/contextionaryDeployment.yaml
index 2171b7fb..9a118548 100644
--- a/weaviate/templates/contextionaryDeployment.yaml
+++ b/weaviate/templates/contextionaryDeployment.yaml
@@ -3,10 +3,10 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ index $module "fullnameOverride" }}
+  name: {{ .Release.Name}}-contextionary
   labels:
-    name: {{ index $module "fullnameOverride" }}
-    app: {{ index $module "fullnameOverride" }}
+    name: {{ .Release.Name}}-contextionary
+    app: {{ .Release.Name}}-contextionary
     app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
@@ -15,11 +15,11 @@ spec:
 {{ toYaml (index $module "strategy") | indent 4}}
   selector:
     matchLabels:
-      app: {{ index $module "fullnameOverride" }}
+      app: {{ .Release.Name}}-contextionary
   template:
     metadata:
       labels:
-        app: {{ index $module "fullnameOverride" }}
+        app: {{ .Release.Name}}-contextionary
         app.kubernetes.io/name: {{ .Release.Name }}
         app.kubernetes.io/managed-by: {{ .Release.Service }}
     spec:
@@ -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:
@@ -76,14 +76,14 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ index $module "fullnameOverride" }}
+  name: {{ .Release.Name}}-contextionary
   labels:
     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
index fd5d9ea4..6c02930b 100644
--- a/weaviate/templates/gpt4allInferenceDeployment.yaml
+++ b/weaviate/templates/gpt4allInferenceDeployment.yaml
@@ -3,10 +3,10 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ index $module "fullnameOverride" }}
+  name: {{ .Release.Name }}-gpt4all-inference
   labels:
-    name: {{ index $module "fullnameOverride" }}
-    app: {{ index $module "fullnameOverride" }}
+    name: {{ .Release.Name }}-gpt4all-inference
+    app: {{ .Release.Name }}-gpt4all-inference
     app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
@@ -15,11 +15,11 @@ spec:
 {{ 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:
@@ -65,14 +65,14 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ index $module "fullnameOverride" }}
+  name: {{ .Release.Name }}-gpt4all-inference
   labels:
     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
diff --git a/weaviate/templates/img2vecNeuralDeployment.yaml b/weaviate/templates/img2vecNeuralDeployment.yaml
index f4c17c8f..bb756441 100644
--- a/weaviate/templates/img2vecNeuralDeployment.yaml
+++ b/weaviate/templates/img2vecNeuralDeployment.yaml
@@ -3,10 +3,10 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ index $module "fullnameOverride" }}
+  name: {{ .Release.Name }}-img2vec-neural
   labels:
-    name: {{ index $module "fullnameOverride" }}
-    app: {{ index $module "fullnameOverride" }}
+    name: {{ .Release.Name }}-img2vec-neural
+    app: {{ .Release.Name }}-img2vec-neural
     app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
@@ -15,11 +15,11 @@ spec:
 {{ toYaml (index $module "strategy") | indent 4}}
   selector:
     matchLabels:
-      app: {{ index $module "fullnameOverride" }}
+      app: {{ .Release.Name }}-img2vec-neural
   template:
     metadata:
       labels:
-        app: {{ index $module "fullnameOverride" }}
+        app: {{ .Release.Name }}-img2vec-neural
     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 }}-img2vec-neural
         image: {{ index $module "registry" }}/{{ index $module "repo" }}:{{ index $module "tag" }}
         imagePullPolicy: {{ index $module "imagePullPolicy" }}
         env:
@@ -76,14 +76,14 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ index $module "fullnameOverride" }}
+  name: {{ .Release.Name }}-img2vec-neural
   labels:
     app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   type: ClusterIP
   selector:
-    app: {{ index $module "fullnameOverride" }}
+    app: {{ .Release.Name }}-img2vec-neural
   ports:
     - protocol: TCP
       port: 8080
diff --git a/weaviate/templates/multi2vecBindDeployment.yaml b/weaviate/templates/multi2vecBindDeployment.yaml
index 58ad7808..e344c827 100644
--- a/weaviate/templates/multi2vecBindDeployment.yaml
+++ b/weaviate/templates/multi2vecBindDeployment.yaml
@@ -3,10 +3,10 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ index $module "fullnameOverride" }}
+  name: {{ .Release.Name }}-bind-inference
   labels:
-    name: {{ index $module "fullnameOverride" }}
-    app: {{ index $module "fullnameOverride" }}
+    name: {{ .Release.Name }}-bind-inference
+    app: {{ .Release.Name }}-bind-inference
     app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
@@ -15,11 +15,11 @@ spec:
 {{ toYaml (index $module "strategy") | indent 4}}
   selector:
     matchLabels:
-      app: {{ index $module "fullnameOverride" }}
+      app: {{ .Release.Name }}-bind-inference
   template:
     metadata:
       labels:
-        app: {{ index $module "fullnameOverride" }}
+        app: {{ .Release.Name }}-bind-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 }}-bind-inference
         image: {{ index $module "registry" }}/{{ index $module "repo" }}:{{ index $module "tag" }}
         imagePullPolicy: {{ index $module "imagePullPolicy" }}
         env:
@@ -76,14 +76,14 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ index $module "fullnameOverride" }}
+  name: {{ .Release.Name }}-bind-inference
   labels:
     app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   type: ClusterIP
   selector:
-    app: {{ index $module "fullnameOverride" }}
+    app: {{ .Release.Name }}-bind-inference
   ports:
     - protocol: TCP
       port: 8080
diff --git a/weaviate/templates/multi2vecClipDeployment.yaml b/weaviate/templates/multi2vecClipDeployment.yaml
index 80b762c1..4edf4e17 100644
--- a/weaviate/templates/multi2vecClipDeployment.yaml
+++ b/weaviate/templates/multi2vecClipDeployment.yaml
@@ -3,10 +3,10 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ index $module "fullnameOverride" }}
+  name: {{ .Release.Name }}-clip-inference
   labels:
-    name: {{ index $module "fullnameOverride" }}
-    app: {{ index $module "fullnameOverride" }}
+    name: {{ .Release.Name }}-clip-inference
+    app: {{ .Release.Name }}-clip-inference
     app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
@@ -15,11 +15,11 @@ spec:
 {{ toYaml (index $module "strategy") | indent 4}}
   selector:
     matchLabels:
-      app: {{ index $module "fullnameOverride" }}
+      app: {{ .Release.Name }}-clip-inference
   template:
     metadata:
       labels:
-        app: {{ index $module "fullnameOverride" }}
+        app: {{ .Release.Name }}-clip-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 }}-clip-inference
         image: {{ index $module "registry" }}/{{ index $module "repo" }}:{{ index $module "tag" }}
         imagePullPolicy: {{ index $module "imagePullPolicy" }}
         env:
@@ -76,14 +76,14 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ index $module "fullnameOverride" }}
+  name: {{ .Release.Name }}-clip-inference
   labels:
     app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   type: ClusterIP
   selector:
-    app: {{ index $module "fullnameOverride" }}
+    app: {{ .Release.Name }}-clip-inference
   ports:
     - protocol: TCP
       port: 8080
diff --git a/weaviate/templates/nerTransformersDeployment.yaml b/weaviate/templates/nerTransformersDeployment.yaml
index a61dc0ad..0720427a 100644
--- a/weaviate/templates/nerTransformersDeployment.yaml
+++ b/weaviate/templates/nerTransformersDeployment.yaml
@@ -3,10 +3,10 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ index $module "fullnameOverride" }}
+  name:  {{ .Release.Name }}-ner-transformers
   labels:
-    name: {{ index $module "fullnameOverride" }}
-    app: {{ index $module "fullnameOverride" }}
+    name: {{ .Release.Name }}-ner-transformers
+    app: {{ .Release.Name }}-ner-transformers
     app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
@@ -15,11 +15,11 @@ spec:
 {{ toYaml (index $module "strategy") | indent 4}}
   selector:
     matchLabels:
-      app: {{ index $module "fullnameOverride" }}
+      app: {{ .Release.Name }}-ner-transformers
   template:
     metadata:
       labels:
-        app: {{ index $module "fullnameOverride" }}
+        app: {{ .Release.Name }}-ner-transformers
     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 }}-ner-transformers
         image: {{ index $module "registry" }}/{{ index $module "repo" }}:{{ index $module "tag" }}
         imagePullPolicy: {{ index $module "imagePullPolicy" }}
         env:
@@ -76,14 +76,14 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ index $module "fullnameOverride" }}
+  name: {{ .Release.Name }}-ner-transformers
   labels:
     app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   type: ClusterIP
   selector:
-    app: {{ index $module "fullnameOverride" }}
+    app: {{ .Release.Name }}-ner-transformers
   ports:
     - protocol: TCP
       port: 8080
diff --git a/weaviate/templates/qnaTransformersDeployment.yaml b/weaviate/templates/qnaTransformersDeployment.yaml
index e404245f..a7bca53f 100644
--- a/weaviate/templates/qnaTransformersDeployment.yaml
+++ b/weaviate/templates/qnaTransformersDeployment.yaml
@@ -3,10 +3,10 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ index $module "fullnameOverride" }}
+  name:  {{ .Release.Name }}-qna-transformers
   labels:
-    name: {{ index $module "fullnameOverride" }}
-    app: {{ index $module "fullnameOverride" }}
+    name: {{ .Release.Name }}-qna-transformers
+    app: {{ .Release.Name }}-qna-transformers
     app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
@@ -15,11 +15,11 @@ spec:
 {{ toYaml (index $module "strategy") | indent 4}}
   selector:
     matchLabels:
-      app: {{ index $module "fullnameOverride" }}
+      app: {{ .Release.Name }}-qna-transformers
   template:
     metadata:
       labels:
-        app: {{ index $module "fullnameOverride" }}
+        app: {{ .Release.Name }}-qna-transformers
     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 }}-qna-transformers
         image: {{ index $module "registry" }}/{{ index $module "repo" }}:{{ index $module "tag" }}
         imagePullPolicy: {{ index $module "imagePullPolicy" }}
         env:
@@ -76,14 +76,14 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ index $module "fullnameOverride" }}
+  name: {{ .Release.Name }}-qna-transformers
   labels:
     app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   type: ClusterIP
   selector:
-    app: {{ index $module "fullnameOverride" }}
+    app: {{ .Release.Name }}-qna-transformers
   ports:
     - protocol: TCP
       port: 8080
diff --git a/weaviate/templates/rerankerTransformersDeployment.yaml b/weaviate/templates/rerankerTransformersDeployment.yaml
index e991d532..0989d1de 100644
--- a/weaviate/templates/rerankerTransformersDeployment.yaml
+++ b/weaviate/templates/rerankerTransformersDeployment.yaml
@@ -3,10 +3,10 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ index $module "fullnameOverride" }}
+  name: {{ .Release.Name }}-reranker-transformers
   labels:
-    name: {{ index $module "fullnameOverride" }}
-    app: {{ index $module "fullnameOverride" }}
+    name: {{ .Release.Name }}-reranker-transformers
+    app: {{ .Release.Name }}-reranker-transformers
     app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
@@ -15,11 +15,11 @@ spec:
 {{ toYaml (index $module "strategy") | indent 4}}
   selector:
     matchLabels:
-      app: {{ index $module "fullnameOverride" }}
+      app: {{ .Release.Name }}-reranker-transformers
   template:
     metadata:
       labels:
-        app: {{ index $module "fullnameOverride" }}
+        app: {{ .Release.Name }}-reranker-transformers
     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 }}-reranker-transformers
         image: {{ index $module "registry" }}/{{ index $module "repo" }}:{{ index $module "tag" }}
         imagePullPolicy: {{ index $module "imagePullPolicy" }}
         env:
@@ -76,14 +76,14 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ index $module "fullnameOverride" }}
+  name: {{ .Release.Name }}-reranker-transformers
   labels:
     app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   type: ClusterIP
   selector:
-    app: {{ index $module "fullnameOverride" }}
+    app: {{ .Release.Name }}-reranker-transformers
   ports:
     - protocol: TCP
       port: 8080
diff --git a/weaviate/templates/sumTransformersDeployment.yaml b/weaviate/templates/sumTransformersDeployment.yaml
index d727633c..cb088251 100644
--- a/weaviate/templates/sumTransformersDeployment.yaml
+++ b/weaviate/templates/sumTransformersDeployment.yaml
@@ -3,10 +3,10 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ index $module "fullnameOverride" }}
+  name: {{ .Release.Name }}-sum-transformers
   labels:
-    name: {{ index $module "fullnameOverride" }}
-    app: {{ index $module "fullnameOverride" }}
+    name: {{ .Release.Name }}-sum-transformers
+    app: {{ .Release.Name }}-sum-transformers
     app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
@@ -15,11 +15,11 @@ spec:
 {{ toYaml (index $module "strategy") | indent 4}}
   selector:
     matchLabels:
-      app: {{ index $module "fullnameOverride" }}
+      app: {{ .Release.Name }}-sum-transformers
   template:
     metadata:
       labels:
-        app: {{ index $module "fullnameOverride" }}
+        app: {{ .Release.Name }}-sum-transformers
     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 }}-sum-transformers
         image: {{ index $module "registry" }}/{{ index $module "repo" }}:{{ index $module "tag" }}
         imagePullPolicy: {{ index $module "imagePullPolicy" }}
         env:
@@ -76,14 +76,14 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ index $module "fullnameOverride" }}
+  name: {{ .Release.Name }}-sum-transformers
   labels:
     app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   type: ClusterIP
   selector:
-    app: {{ index $module "fullnameOverride" }}
+    app: {{ .Release.Name }}-sum-transformers
   ports:
     - protocol: TCP
       port: 8080
diff --git a/weaviate/templates/textSpellcheckDeployment.yaml b/weaviate/templates/textSpellcheckDeployment.yaml
index dce149e6..89b2dee7 100644
--- a/weaviate/templates/textSpellcheckDeployment.yaml
+++ b/weaviate/templates/textSpellcheckDeployment.yaml
@@ -3,10 +3,10 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ index $module "fullnameOverride" }}
+  name: {{ .Release.Name }}-text-spellcheck
   labels:
-    name: {{ index $module "fullnameOverride" }}
-    app: {{ index $module "fullnameOverride" }}
+    name: {{ .Release.Name }}-text-spellcheck
+    app: {{ .Release.Name }}-text-spellcheck
     app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
@@ -15,11 +15,11 @@ spec:
 {{ toYaml (index $module "strategy") | indent 4}}
   selector:
     matchLabels:
-      app: {{ index $module "fullnameOverride" }}
+      app: {{ .Release.Name }}-text-spellcheck
   template:
     metadata:
       labels:
-        app: {{ index $module "fullnameOverride" }}
+        app: {{ .Release.Name }}-text-spellcheck
     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 }}-text-spellcheck
         image: {{ index $module "registry" }}/{{ index $module "repo" }}:{{ index $module "tag" }}
         imagePullPolicy: {{ index $module "imagePullPolicy" }}
         resources:
@@ -65,7 +65,7 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ index $module "fullnameOverride" }}
+  name: {{ .Release.Name }}-text-spellcheck
   labels:
     app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
@@ -73,7 +73,7 @@ metadata:
 spec:
   type: ClusterIP
   selector:
-    app: {{ index $module "fullnameOverride" }}
+    app: {{ .Release.Name }}-text-spellcheck
   ports:
     - protocol: TCP
       port: 8080
diff --git a/weaviate/templates/transformersInferenceDeployment.yaml b/weaviate/templates/transformersInferenceDeployment.yaml
index 1ba9b6da..53dae1f5 100644
--- a/weaviate/templates/transformersInferenceDeployment.yaml
+++ b/weaviate/templates/transformersInferenceDeployment.yaml
@@ -5,10 +5,10 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ index $module "fullnameOverride" }}
+  name: {{ .Release.Name }}-transformers-inference
   labels:
-    name: {{ index $module "fullnameOverride" }}
-    app: {{ index $module "fullnameOverride" }}
+    name: {{ .Release.Name }}-transformers-inference
+    app: {{ .Release.Name }}-transformers-inference
     app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
@@ -17,11 +17,11 @@ spec:
 {{ toYaml (index $module "strategy") | indent 4}}
   selector:
     matchLabels:
-      app: {{ index $module "fullnameOverride" }}
+      app: {{ .Release.Name }}-transformers-inference
   template:
     metadata:
       labels:
-        app: {{ index $module "fullnameOverride" }}
+        app: {{ .Release.Name }}-transformers-inference
     spec:
       securityContext:
 {{ toYaml (index $module "securityContext") | indent 8}}
@@ -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 }}-transformers-inference
         image: {{ index $module "registry" }}/{{ index $module "repo" }}:{{ index $module "tag" }}
         imagePullPolicy: {{ index $module "imagePullPolicy" }}
         env:
@@ -86,14 +86,14 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ index $module "fullnameOverride" }}
+  name: {{ .Release.Name }}-transformers-inference
   labels:
     app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   type: ClusterIP
   selector:
-    app: {{ index $module "fullnameOverride" }}
+    app: {{ .Release.Name }}-transformers-inference
   ports:
     - protocol: TCP
       port: 8080

From 937bdc640f3e6b9a00073b4d54b0d0c3528b6684 Mon Sep 17 00:00:00 2001
From: Yaroslav Dmytryk <excelsioner@gmail.com>
Date: Sat, 11 May 2024 15:54:55 +0300
Subject: [PATCH 15/25] clean up values

---
 .../templates/transformersInferenceDeployment.yaml  |  1 +
 weaviate/values.yaml                                | 13 -------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/weaviate/templates/transformersInferenceDeployment.yaml b/weaviate/templates/transformersInferenceDeployment.yaml
index 53dae1f5..94657791 100644
--- a/weaviate/templates/transformersInferenceDeployment.yaml
+++ b/weaviate/templates/transformersInferenceDeployment.yaml
@@ -83,6 +83,7 @@ spec:
         {{ toYaml . | nindent 8 }}
       {{- end }}
 ---
+{{/*TODO: update this*/}}
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/weaviate/values.yaml b/weaviate/values.yaml
index b1485eb4..1d269a94 100644
--- a/weaviate/values.yaml
+++ b/weaviate/values.yaml
@@ -464,7 +464,6 @@ modules:
     enabled: false
 
     # The configuration below is ignored if enabled==false
-    fullnameOverride: contextionary
     tag: en0.16.0-v1.2.1
     repo: semitechnologies/contextionary
     registry: cr.weaviate.io
@@ -540,7 +539,6 @@ modules:
     imagePullPolicy: IfNotPresent
     imagePullSecrets: []
     priorityClassName: ""
-    fullnameOverride: transformers-inference
     # Deprecated setting use initialDelaySeconds instead in each probe instead
     # probeInitialDelaySeconds: 120
     livenessProbe:
@@ -612,7 +610,6 @@ modules:
         replicas: 1
         strategy:
           type: RollingUpdate
-        fullnameOverride: transformers-inference-passage
         livenessProbe:
           initialDelaySeconds: 120
           periodSeconds: 3
@@ -682,7 +679,6 @@ modules:
         replicas: 1
         strategy:
           type: RollingUpdate
-        fullnameOverride: transformers-inference-query
         livenessProbe:
           initialDelaySeconds: 120
           periodSeconds: 3
@@ -762,7 +758,6 @@ modules:
     imagePullPolicy: IfNotPresent
     imagePullSecrets: []
     priorityClassName: ""
-    fullnameOverride: gpt4all-inference
     livenessProbe:
       initialDelaySeconds: 120
       periodSeconds: 3
@@ -970,7 +965,6 @@ modules:
     imagePullPolicy: IfNotPresent
     imagePullSecrets: []
     priorityClassName: ""
-    fullnameOverride: clip-inference
     livenessProbe:
       initialDelaySeconds: 120
       periodSeconds: 3
@@ -1042,7 +1036,6 @@ modules:
     imagePullPolicy: IfNotPresent
     imagePullSecrets: []
     priorityClassName: ""
-    fullnameOverride: bind-inference
     livenessProbe:
       initialDelaySeconds: 120
       periodSeconds: 3
@@ -1124,7 +1117,6 @@ modules:
     imagePullPolicy: IfNotPresent
     imagePullSecrets: []
     priorityClassName: ""
-    fullnameOverride: qna-transformers
     livenessProbe:
       initialDelaySeconds: 120
       periodSeconds: 3
@@ -1324,7 +1316,6 @@ modules:
     imagePullPolicy: IfNotPresent
     imagePullSecrets: []
     priorityClassName: ""
-    fullnameOverride: img2vec-neural
     livenessProbe:
       initialDelaySeconds: 120
       periodSeconds: 3
@@ -1426,7 +1417,6 @@ modules:
     imagePullPolicy: IfNotPresent
     imagePullSecrets: []
     priorityClassName: ""
-    fullnameOverride: reranker-transformers
     livenessProbe:
       initialDelaySeconds: 120
       periodSeconds: 3
@@ -1500,7 +1490,6 @@ modules:
     imagePullPolicy: IfNotPresent
     imagePullSecrets: []
     priorityClassName: ""
-    fullnameOverride: text-spellcheck
     livenessProbe:
       initialDelaySeconds: 120
       periodSeconds: 3
@@ -1557,7 +1546,6 @@ modules:
     imagePullPolicy: IfNotPresent
     imagePullSecrets: []
     priorityClassName: ""
-    fullnameOverride: ner-transformers
     livenessProbe:
       initialDelaySeconds: 120
       periodSeconds: 3
@@ -1630,7 +1618,6 @@ modules:
     imagePullPolicy: IfNotPresent
     imagePullSecrets: []
     priorityClassName: ""
-    fullnameOverride: sum-transformers
     livenessProbe:
       initialDelaySeconds: 120
       periodSeconds: 3

From deb5eabefc4e049393969b9280bede97b7095505 Mon Sep 17 00:00:00 2001
From: Yaroslav Dmytryk <excelsioner@gmail.com>
Date: Sun, 12 May 2024 20:08:27 +0300
Subject: [PATCH 16/25] update service URLs

---
 weaviate/templates/weaviateConfigMap.yaml   |  2 +-
 weaviate/templates/weaviateStatefulset.yaml | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/weaviate/templates/weaviateConfigMap.yaml b/weaviate/templates/weaviateConfigMap.yaml
index b899de0f..e9c0b195 100644
--- a/weaviate/templates/weaviateConfigMap.yaml
+++ b/weaviate/templates/weaviateConfigMap.yaml
@@ -15,7 +15,7 @@ data:
       {{ toYaml .Values.authorization | nindent 6 | trim }}
     {{ if index .Values "modules" "text2vec-contextionary" "enabled" }}
     contextionary:
-      url: {{ index .Values "modules" "text2vec-contextionary" "fullnameOverride" }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:9999
+      url: {{ .Release.Name}}-contextionary.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:9999
     {{ end }}
     query_defaults:
       {{ toYaml .Values.query_defaults | nindent 6 | trim }}
diff --git a/weaviate/templates/weaviateStatefulset.yaml b/weaviate/templates/weaviateStatefulset.yaml
index 41ab2d15..e637e77b 100644
--- a/weaviate/templates/weaviateStatefulset.yaml
+++ b/weaviate/templates/weaviateStatefulset.yaml
@@ -124,63 +124,63 @@ spec:
           {{- end }}
           {{- if index .Values "modules" "text2vec-gpt4all" "enabled" }}
           - name: GPT4ALL_INFERENCE_API
-            value: http://{{ index .Values "modules" "text2vec-gpt4all" "fullnameOverride" }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:8080
+            value: http://{{ .Release.Name }}-gpt4all-inference.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:8080
           {{- else if index .Values "modules" "text2vec-gpt4all" "inferenceUrl" }}
           - name: GPT4ALL_INFERENCE_API
             value: {{ index .Values "modules" "text2vec-gpt4all" "inferenceUrl" }}
           {{- end }}
           {{- if index .Values "modules" "multi2vec-clip" "enabled" }}
           - name: CLIP_INFERENCE_API
-            value: http://{{ index .Values "modules" "multi2vec-clip" "fullnameOverride" }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:8080
+            value: http://{{ .Release.Name }}-clip-inference.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:8080
           {{- else if index .Values "modules" "multi2vec-clip" "inferenceUrl" }}
           - name: CLIP_INFERENCE_API
             value: {{ index .Values "modules" "multi2vec-clip" "inferenceUrl" }}
           {{- end }}
           {{- if index .Values "modules" "multi2vec-bind" "enabled" }}
           - name: BIND_INFERENCE_API
-            value: http://{{ index .Values "modules" "multi2vec-bind" "fullnameOverride" }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:8080
+            value: http://{{ .Release.Name }}-bind-inference.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:8080
           {{- else if index .Values "modules" "multi2vec-bind" "inferenceUrl" }}
           - name: BIND_INFERENCE_API
             value: {{ index .Values "modules" "multi2vec-bind" "inferenceUrl" }}
           {{- end }}
           {{- if index .Values "modules" "qna-transformers" "enabled" }}
           - name: QNA_INFERENCE_API
-            value: http://{{ index .Values "modules" "qna-transformers" "fullnameOverride" }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:8080
+            value: http://{{ .Release.Name }}-qna-transformers.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:8080
           {{- else if index .Values "modules" "qna-transformers" "inferenceUrl" }}
           - name: QNA_INFERENCE_API
             value: {{ index .Values "modules" "qna-transformers" "inferenceUrl" }}
           {{- end }}
           {{- if index .Values "modules" "img2vec-neural" "enabled" }}
           - name: IMAGE_INFERENCE_API
-            value: http://{{ index .Values "modules" "img2vec-neural" "fullnameOverride" }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:8080
+            value: http://{{ .Release.Name }}-img2vec-neural.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:8080
           {{- else if index .Values "modules" "img2vec-neural" "inferenceUrl" }}
           - name: IMAGE_INFERENCE_API
             value: {{ index .Values "modules" "img2vec-neural" "inferenceUrl" }}
           {{- end }}
           {{- if index .Values "modules" "text-spellcheck" "enabled" }}
           - name: SPELLCHECK_INFERENCE_API
-            value: http://{{ index .Values "modules" "text-spellcheck" "fullnameOverride" }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:8080
+            value: http://{{ .Release.Name }}-text-spellcheck.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:8080
           {{- else if index .Values "modules" "text-spellcheck" "inferenceUrl" }}
           - name: SPELLCHECK_INFERENCE_API
             value: {{ index .Values "modules" "text-spellcheck" "inferenceUrl" }}
           {{- end }}
           {{- if index .Values "modules" "ner-transformers" "enabled" }}
           - name: NER_INFERENCE_API
-            value: http://{{ index .Values "modules" "ner-transformers" "fullnameOverride" }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:8080
+            value: http://{{ .Release.Name }}-ner-transformers.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:8080
           {{- else if index .Values "modules" "ner-transformers" "inferenceUrl" }}
           - name: NER_INFERENCE_API
             value: {{ index .Values "modules" "ner-transformers" "inferenceUrl" }}
           {{- end }}
           {{- if index .Values "modules" "sum-transformers" "enabled" }}
           - name: SUM_INFERENCE_API
-            value: http://{{ index .Values "modules" "sum-transformers" "fullnameOverride" }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:8080
+            value: http://{{ .Release.Name }}-sum-transformers.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:8080
           {{- else if index .Values "modules" "sum-transformers" "inferenceUrl" }}
           - name: SUM_INFERENCE_API
             value: {{ index .Values "modules" "sum-transformers" "inferenceUrl" }}
           {{- end }}
           {{- if index .Values "modules" "reranker-transformers" "enabled" }}
           - name: RERANKER_INFERENCE_API
-            value: http://{{ index .Values "modules" "reranker-transformers" "fullnameOverride" }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:8080
+            value: http://{{ .Release.Name }}-reranker-transformers.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:8080
           {{- else if index .Values "modules" "reranker-transformers" "inferenceUrl" }}
           - name: RERANKER_INFERENCE_API
             value: {{ index .Values "modules" "reranker-transformers" "inferenceUrl" }}

From 3e9110da6ee083ae9092d4a48c9e71716c8f50da Mon Sep 17 00:00:00 2001
From: Yaroslav Dmytryk <excelsioner@gmail.com>
Date: Sun, 12 May 2024 20:13:06 +0300
Subject: [PATCH 17/25] update transformersInferenceDeployment.yaml

---
 .../transformersInferenceDeployment.yaml      | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/weaviate/templates/transformersInferenceDeployment.yaml b/weaviate/templates/transformersInferenceDeployment.yaml
index 94657791..db5f2df8 100644
--- a/weaviate/templates/transformersInferenceDeployment.yaml
+++ b/weaviate/templates/transformersInferenceDeployment.yaml
@@ -105,21 +105,21 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ index $passage "fullnameOverride" }}
+  name: {{ .Release.Name }}-transformers-inference-passage
   labels:
-    name: {{ index $passage "fullnameOverride" }}
-    app: {{ index $passage "fullnameOverride" }}
+    name: {{ .Release.Name }}-transformers-inference-passage
+    app: {{ .Release.Name }}-transformers-inference-passage
 spec:
   replicas: {{ index $passage "replicas" }}
   strategy:
 {{ toYaml (index $passage "strategy") | indent 4}}
   selector:
     matchLabels:
-      app: {{ index $passage "fullnameOverride" }}
+      app: {{ .Release.Name }}-transformers-inference-passage
   template:
     metadata:
       labels:
-        app: {{ index $passage "fullnameOverride" }}
+        app: {{ .Release.Name }}-transformers-inference-passage
     spec:
       securityContext:
 {{ toYaml (index $passage "securityContext") | indent 8}}
@@ -133,7 +133,7 @@ spec:
       {{- include "image.pullSecrets" (dict "pullSecrets" (index $passage "imagePullSecrets")) | nindent 6 }}
       {{- include "pod.priorityClassName" ( dict "global" $.Values.globalPriorityClassName "priorityClassName" (index $passage "priorityClassName")) | nindent 6 }}
       containers:
-      - name: {{ index $passage "fullnameOverride" }}
+      - name: {{ .Release.Name }}-transformers-inference-passage
         image: {{ index $passage "registry" }}/{{ index $passage "repo" }}:{{ index $passage "tag" }}
         imagePullPolicy: {{ index $passage "imagePullPolicy" }}
         env:
@@ -178,11 +178,11 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ index $passage "fullnameOverride" }}
+  name: {{ .Release.Name }}-transformers-inference-passage
 spec:
   type: ClusterIP
   selector:
-    app: {{ index $passage "fullnameOverride" }}
+    app: {{ .Release.Name }}-transformers-inference-passage
   ports:
     - protocol: TCP
       port: 8080
@@ -193,21 +193,21 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ index $query "fullnameOverride" }}
+  name: {{ .Release.Name }}-transformers-inference-query
   labels:
-    name: {{ index $query "fullnameOverride" }}
-    app: {{ index $query "fullnameOverride" }}
+    name: {{ .Release.Name }}-transformers-inference-query
+    app: {{ .Release.Name }}-transformers-inference-query
 spec:
   replicas: {{ index $query "replicas" }}
   strategy:
 {{ toYaml (index $query "strategy") | indent 4}}
   selector:
     matchLabels:
-      app: {{ index $query "fullnameOverride" }}
+      app: {{ .Release.Name }}-transformers-inference-query
   template:
     metadata:
       labels:
-        app: {{ index $query "fullnameOverride" }}
+        app: {{ .Release.Name }}-transformers-inference-query
     spec:
       securityContext:
 {{ toYaml (index $query "securityContext") | indent 8}}
@@ -221,7 +221,7 @@ spec:
       {{- include "image.pullSecrets" (dict "pullSecrets" (index $query "imagePullSecrets")) | nindent 6 }}
       {{- include "pod.priorityClassName" ( dict "global" $.Values.globalPriorityClassName "priorityClassName" (index $query "priorityClassName")) | nindent 6 }}
       containers:
-      - name: {{ index $query "fullnameOverride" }}
+      - name: {{ .Release.Name }}-transformers-inference-query
         image: {{ index $query "registry" }}/{{ index $query "repo" }}:{{ index $query "tag" }}
         imagePullPolicy: {{ index $query "imagePullPolicy" }}
         env:
@@ -266,11 +266,11 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ index $query "fullnameOverride" }}
+  name: {{ .Release.Name }}-transformers-inference-query
 spec:
   type: ClusterIP
   selector:
-    app: {{ index $query "fullnameOverride" }}
+    app: {{ .Release.Name }}-transformers-inference-query
   ports:
     - protocol: TCP
       port: 8080

From 692b0f6d3a7c28cba4e5f35f79faeaacb21206c5 Mon Sep 17 00:00:00 2001
From: Yaroslav Dmytryk <excelsioner@gmail.com>
Date: Sun, 12 May 2024 20:15:07 +0300
Subject: [PATCH 18/25] update StatefulSet config

---
 weaviate/templates/weaviateStatefulset.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/weaviate/templates/weaviateStatefulset.yaml b/weaviate/templates/weaviateStatefulset.yaml
index e637e77b..a7f3e8fc 100644
--- a/weaviate/templates/weaviateStatefulset.yaml
+++ b/weaviate/templates/weaviateStatefulset.yaml
@@ -102,21 +102,21 @@ spec:
           {{ template "raft_configuration" . }}
           {{- if index .Values "modules" "text2vec-transformers" "enabled" }}
           - name: TRANSFORMERS_INFERENCE_API
-            value: http://{{ index .Values "modules" "text2vec-transformers" "fullnameOverride" }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:8080
+            value: http://{{ .Release.Name }}-transformers-inference.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:8080
           {{- else if index .Values "modules" "text2vec-transformers" "inferenceUrl" }}
           - name: TRANSFORMERS_INFERENCE_API
             value: {{ index .Values "modules" "text2vec-transformers" "inferenceUrl" }}
           {{- else }}
               {{- if index .Values "modules" "text2vec-transformers" "passageQueryServices" "passage" "enabled" }}
           - name: TRANSFORMERS_PASSAGE_INFERENCE_API
-            value: http://{{ index .Values "modules" "text2vec-transformers" "passageQueryServices" "passage" "fullnameOverride" }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:8080
+            value: http://{{ .Release.Name }}-transformers-inference-passage.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:8080
               {{- else if index .Values "modules" "text2vec-transformers" "passageQueryServices" "passage" "inferenceUrl" }}
           - name: TRANSFORMERS_PASSAGE_INFERENCE_API
             value: {{ index .Values "modules" "text2vec-transformers" "passageQueryServices" "passage" "inferenceUrl" }}
               {{- end }}
               {{- if index .Values "modules" "text2vec-transformers" "passageQueryServices" "query" "enabled" }}
           - name: TRANSFORMERS_QUERY_INFERENCE_API
-            value: http://{{ index .Values "modules" "text2vec-transformers" "passageQueryServices" "query" "fullnameOverride" }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:8080
+            value: http://{{ .Release.Name }}-transformers-inference-query.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:8080
               {{- else if index .Values "modules" "text2vec-transformers" "passageQueryServices" "query" "inferenceUrl" }}
           - name: TRANSFORMERS_QUERY_INFERENCE_API
             value: {{ index .Values "modules" "text2vec-transformers" "passageQueryServices" "query" "inferenceUrl" }}

From 3d8e39dccb019d375b823922ba205170b9b2bc66 Mon Sep 17 00:00:00 2001
From: Yaroslav Dmytryk <excelsioner@gmail.com>
Date: Sun, 12 May 2024 20:17:09 +0300
Subject: [PATCH 19/25] remove service names from values.yaml

---
 weaviate/templates/weaviateService.yaml     | 2 +-
 weaviate/templates/weaviateServiceGRPC.yaml | 2 +-
 weaviate/values.yaml                        | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/weaviate/templates/weaviateService.yaml b/weaviate/templates/weaviateService.yaml
index 0b3e7544..13be8443 100644
--- a/weaviate/templates/weaviateService.yaml
+++ b/weaviate/templates/weaviateService.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.service.name | default .Release.Name }}
+  name: {{ .Release.Name }}
   labels:
     app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
diff --git a/weaviate/templates/weaviateServiceGRPC.yaml b/weaviate/templates/weaviateServiceGRPC.yaml
index cd96ff5b..64087586 100644
--- a/weaviate/templates/weaviateServiceGRPC.yaml
+++ b/weaviate/templates/weaviateServiceGRPC.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.grpcService.name | default (printf "%s-grpc" .Release.Name) }}
+  name: {{ .Release.Name }}-grpc
   labels:
     app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
diff --git a/weaviate/values.yaml b/weaviate/values.yaml
index 1d269a94..c511a02f 100644
--- a/weaviate/values.yaml
+++ b/weaviate/values.yaml
@@ -114,7 +114,6 @@ storage:
 # don't want a public load balancer, you can also choose 'ClusterIP' to make
 # weaviate only accessible within your cluster.
 service:
-  name: weaviate
   ports:
     - name: http
       protocol: TCP
@@ -133,7 +132,6 @@ service:
 # environment then it can be disabled by setting enabled: false option.
 grpcService:
   enabled: true
-  name: weaviate-grpc
   ports:
     - name: grpc
       protocol: TCP

From 11a4028be3ca579f983e8d0fa898d253a996d050 Mon Sep 17 00:00:00 2001
From: Yaroslav Dmytryk <excelsioner@gmail.com>
Date: Sun, 12 May 2024 20:17:42 +0300
Subject: [PATCH 20/25] remove TODOs

---
 weaviate/templates/transformersInferenceDeployment.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/weaviate/templates/transformersInferenceDeployment.yaml b/weaviate/templates/transformersInferenceDeployment.yaml
index db5f2df8..993f7748 100644
--- a/weaviate/templates/transformersInferenceDeployment.yaml
+++ b/weaviate/templates/transformersInferenceDeployment.yaml
@@ -83,7 +83,6 @@ spec:
         {{ toYaml . | nindent 8 }}
       {{- end }}
 ---
-{{/*TODO: update this*/}}
 apiVersion: v1
 kind: Service
 metadata:

From 0fac4c0fac17d8fb742203c2126269ec1ef869fe Mon Sep 17 00:00:00 2001
From: Yaroslav Dmytryk <excelsioner@gmail.com>
Date: Sun, 12 May 2024 20:18:06 +0300
Subject: [PATCH 21/25] bump chat version

---
 weaviate/Chart.yaml                               | 2 +-
 weaviate/templates/nerTransformersDeployment.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/weaviate/Chart.yaml b/weaviate/Chart.yaml
index 3398532c..8cdd5d64 100644
--- 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/nerTransformersDeployment.yaml b/weaviate/templates/nerTransformersDeployment.yaml
index 0720427a..0748d366 100644
--- a/weaviate/templates/nerTransformersDeployment.yaml
+++ b/weaviate/templates/nerTransformersDeployment.yaml
@@ -3,7 +3,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name:  {{ .Release.Name }}-ner-transformers
+  name: {{ .Release.Name }}-ner-transformers
   labels:
     name: {{ .Release.Name }}-ner-transformers
     app: {{ .Release.Name }}-ner-transformers

From 382db06b51d657d4fb96e09476e7bf0130226d24 Mon Sep 17 00:00:00 2001
From: Yaroslav Dmytryk <excelsioner@gmail.com>
Date: Sun, 12 May 2024 20:35:34 +0300
Subject: [PATCH 22/25] fix affinity in transformersInferenceDeployment.yaml

---
 weaviate/templates/transformersInferenceDeployment.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/weaviate/templates/transformersInferenceDeployment.yaml b/weaviate/templates/transformersInferenceDeployment.yaml
index 993f7748..82f847d2 100644
--- a/weaviate/templates/transformersInferenceDeployment.yaml
+++ b/weaviate/templates/transformersInferenceDeployment.yaml
@@ -165,7 +165,7 @@ spec:
       nodeSelector:
         {{ toYaml . | nindent 8 }}
       {{- end }}
-      {{- with index $passage "affinity" | default .Values.affinity }}
+      {{- with index $module "affinity" | default (include "affinity" . | fromYaml) }}
       affinity:
         {{ toYaml . | nindent 8 }}
       {{- end }}
@@ -253,7 +253,7 @@ spec:
       nodeSelector:
         {{ toYaml . | nindent 8 }}
       {{- end }}
-      {{- with index $query "affinity" | default .Values.affinity }}
+      {{- with index $module "affinity" | default (include "affinity" . | fromYaml) }}
       affinity:
         {{ toYaml . | nindent 8 }}
       {{- end }}

From ef437c823ee1a8963f6e1434dd0767614710fe21 Mon Sep 17 00:00:00 2001
From: Yaroslav Dmytryk <excelsioner@gmail.com>
Date: Sun, 12 May 2024 20:39:39 +0300
Subject: [PATCH 23/25] fix secret in _helpers.tpl

---
 weaviate/templates/_helpers.tpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/weaviate/templates/_helpers.tpl b/weaviate/templates/_helpers.tpl
index 1e0a5afd..7c0b329e 100644
--- a/weaviate/templates/_helpers.tpl
+++ b/weaviate/templates/_helpers.tpl
@@ -150,7 +150,8 @@ imagePullSecrets:
 Cluster API Secrets
 */}}
 {{- define "cluster_api.secret" -}}
-{{- $secret := lookup "v1" "Secret" .Release.Namespace "weaviate-cluster-api-basic-auth" -}}
+{{/*TODO: udpate all secret usage, also search for weaviate-* */}}
+{{- $secret := lookup "v1" "Secret" .Release.Namespace (printf "%s-cluster-api-basic-auth" .Release.Name) -}}
 {{- if $secret -}}
 {{/*
    Reusing value of secret if exist

From 1617952bc72e787d22a32582fa2072ecf23f7b49 Mon Sep 17 00:00:00 2001
From: Yaroslav Dmytryk <excelsioner@gmail.com>
Date: Sun, 12 May 2024 21:53:01 +0300
Subject: [PATCH 24/25] fix raft_configuration

---
 weaviate/templates/_helpers.tpl | 4 ++--
 weaviate/values.yaml            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/weaviate/templates/_helpers.tpl b/weaviate/templates/_helpers.tpl
index 7c0b329e..43d023b6 100644
--- a/weaviate/templates/_helpers.tpl
+++ b/weaviate/templates/_helpers.tpl
@@ -150,7 +150,6 @@ imagePullSecrets:
 Cluster API Secrets
 */}}
 {{- define "cluster_api.secret" -}}
-{{/*TODO: udpate all secret usage, also search for weaviate-* */}}
 {{- $secret := lookup "v1" "Secret" .Release.Namespace (printf "%s-cluster-api-basic-auth" .Release.Name) -}}
 {{- if $secret -}}
 {{/*
@@ -192,6 +191,7 @@ 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 -}}
@@ -214,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 -}}
diff --git a/weaviate/values.yaml b/weaviate/values.yaml
index c511a02f..96b2f7ce 100644
--- a/weaviate/values.yaml
+++ b/weaviate/values.yaml
@@ -61,7 +61,7 @@ initContainers:
 # Scale replicas of Weaviate. Note that as of v1.8.0 dynamic scaling is limited
 # 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
+replicas: 3
 
 # Define how pods will be created. Possible values: OrderedReady | Parallel
 # OrderedReady - pods will be created one after another
@@ -107,7 +107,7 @@ clusterDomain: cluster.local.
 # storage.fullnameOverride field set, then the default pvc will not be
 # created, instead the one defined in fullnameOverride will be used
 storage:
-  size: 32Gi
+  size: 2Gi
   storageClassName: ""
 
 # The service controls how weaviate is exposed to the outside world. If you

From d6e4113a07499e60edd0832e4e8db300dfedf3af Mon Sep 17 00:00:00 2001
From: Yaroslav Dmytryk <excelsioner@gmail.com>
Date: Sun, 12 May 2024 22:00:38 +0300
Subject: [PATCH 25/25] clean up values.yaml

---
 weaviate/values.yaml | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/weaviate/values.yaml b/weaviate/values.yaml
index 96b2f7ce..e3aaf58c 100644
--- a/weaviate/values.yaml
+++ b/weaviate/values.yaml
@@ -61,7 +61,7 @@ initContainers:
 # Scale replicas of Weaviate. Note that as of v1.8.0 dynamic scaling is limited
 # 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: 3
+replicas: 1
 
 # Define how pods will be created. Possible values: OrderedReady | Parallel
 # OrderedReady - pods will be created one after another
@@ -107,7 +107,7 @@ clusterDomain: cluster.local.
 # storage.fullnameOverride field set, then the default pvc will not be
 # created, instead the one defined in fullnameOverride will be used
 storage:
-  size: 2Gi
+  size: 32Gi
   storageClassName: ""
 
 # The service controls how weaviate is exposed to the outside world. If you
@@ -1695,17 +1695,6 @@ tolerations:
 hostAliases:
 
 affinity:
-#  podAntiAffinity:
-#    preferredDuringSchedulingIgnoredDuringExecution:
-#      - weight: 1
-#        podAffinityTerm:
-#          topologyKey: "kubernetes.io/hostname"
-#          labelSelector:
-#            matchExpressions:
-#              - key: "app"
-#                operator: In
-#                values:
-#                  - weaviate
 
 ## Optionally specify priorityClass name for the pod
 ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/#pod-priority