Vec 215 update helm chart to point to 0.9 container version (#26)

* Rename proximus to avs and update to 0.9
aerospike · Jul 18, 2024 · ce193fb · ce193fb
1 parent 9ecdfe1
commit ce193fb
Show file tree

Hide file tree

Showing 14 changed files with 64 additions and 67 deletions.
diff --git a/aerospike-backup-service/README.md b/aerospike-backup-service/README.md
@@ -26,21 +26,21 @@ helm repo add aerospike https://aerospike.github.io/helm-charts
 
 | Parameter                 | Description                                                                                                                                                                          | Default                        |
 |---------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------|
-| `replicaCount`            | Configures the number Aerospike Proximus instance pods to run.                                                                                                                       | '1'                            |
-| `image`                   | Configures Aerospike Proximus image repository, tag and pull policy.                                                                                                                 | see [values.yaml](values.yaml) |
+| `replicaCount`            | Configures the number Aerospike Backup Service instance pods to run.                                                                                                                 | '1'                            |
+| `image`                   | Configures Aerospike Aerospike Backup Service image repository, tag and pull policy.                                                                                                 | see [values.yaml](values.yaml) |
 | `imagePullSecrets`        | For Private docker registries, when authentication is needed.                                                                                                                        | see [values.yaml](values.yaml) |
 | `args`                    | Arguments to pass to ABS                                                                                                                                                             | `[]`                           |
-| `backupServiceConfig`     | ABS cluster configuration deployed to `/etc/aerospike-backup-service/aerospike-backup-service.yml`.                                                                                              | see [values.yaml](values.yaml) |
-| `initContainers`          | List of initContainers added to each proximus pods for custom cluster behavior.                                                                                                      | `[]`                           |
+| `backupServiceConfig`     | ABS cluster configuration deployed to `/etc/aerospike-backup-service/aerospike-backup-service.yml`.                                                                                  | see [values.yaml](values.yaml) |
+| `initContainers`          | List of initContainers added to each abs pods for custom cluster behavior.                                                                                                           | `[]`                           |
 | `serviceAccount`          | Service Account details like name and annotations.                                                                                                                                   | see [values.yaml](values.yaml) |
 | `podAnnotations`          | Additional pod [annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/). Should be specified as a map of annotation names to annotation values. | `{}`                           |
 | `podLabels`               | Additional pod [labels](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/). Should be specified as a map of label names to label values.                     | `{}`                           |
 | `podSecurityContext`      | Pod [security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/)                                                                                   | `{}`                           |
 | `securityContext`         | Container [security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container)                                    | `{}`                           |
 | `service`                 | Load-Balancer configuration for more details please refer to a Load-Balancer docs.                                                                                                   | `{}`                           |
-| `resources`               | Resource [requests and limits](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the proximus pods.                                                | `{}`                           |
+| `resources`               | Resource [requests and limits](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the abs pods.                                                     | `{}`                           |
 | `autoscaling`             | Enable the horizontal pod auto-scaler.                                                                                                                                               | see [values.yaml](values.yaml) |
-| `volumes`                 | List of additional volumes to attach to the Proximus pod.                                                                                                                            | see [values.yaml](values.yaml) |
+| `volumes`                 | List of additional volumes to attach to the abs pod.                                                                                                                                 | see [values.yaml](values.yaml) |
 | `extraVolumeMounts`       | Extra volume mounts corresponding to the volumes added to `extraVolumes`.                                                                                                            | see [values.yaml](values.yaml) |
 | `extraSecretVolumeMounts` | Extra secret volume mounts corresponding to the volumes added to `extraVolumes`.                                                                                                     | see [values.yaml](values.yaml) |
 | `affinity`                | [Affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity)  rules if any for the pods.                                          | `{}`                           |

diff --git a/aerospike-vector-search/Chart.yaml b/aerospike-vector-search/Chart.yaml
@@ -11,7 +11,7 @@ maintainers:
     email: [email protected]
 
 # The helm chart version
-version:  0.3.0
+version:  0.4.0
 
 # The default version of Aerospike Kafka Outbound Connector
-appVersion: "0.4.0"
+appVersion: "0.9.0"
diff --git a/aerospike-vector-search/README.md b/aerospike-vector-search/README.md
@@ -1,6 +1,6 @@
 # Aerospike Vector Search
 
-This Helm chart allows you to configure and run our official [Aerospike Vector Search](https://hub.docker.com/repository/docker/aerospike/aerospike-proximus)
+This Helm chart allows you to configure and run our official [Aerospike Vector Search](https://hub.docker.com/repository/docker/aerospike/aerospike-vector-search)
 docker image on a Kubernetes cluster.
 
 This helm chart sets up a `StatefulSet` for each AVS instance. We use a `StatefulSet` instead of a `Deployment`, to have stable DNS names for the  
@@ -30,7 +30,7 @@ helm repo add aerospike https://aerospike.github.io/helm-charts
 | `replicaCount`                | Configures the number AVS instance pods to run.                                                                                                                                      | '1'                            |
 | `image`                       | Configures AVS image repository, tag and pull policy.                                                                                                                                | see [values.yaml](values.yaml) |
 | `imagePullSecrets`            | For Private docker registries, when authentication is needed.                                                                                                                        | see [values.yaml](values.yaml) |
-| `aerospikeVectorSearchConfig` | AVS cluster configuration deployed to `/etc/aerospike-proximus/aerospike-proximus.yml`.                                                                                              | see [values.yaml](values.yaml) |
+| `aerospikeVectorSearchConfig` | AVS cluster configuration deployed to `/etc/aerospike-vector-search/aerospike-vector-search.yml`.                                                                                              | see [values.yaml](values.yaml) |
 | `initContainers`              | List of initContainers added to each AVS pods for custom cluster behavior.                                                                                                           | `[]`                           |
 | `serviceAccount`              | Service Account details like name and annotations.                                                                                                                                   | see [values.yaml](values.yaml) |
 | `podAnnotations`              | Additional pod [annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/). Should be specified as a map of annotation names to annotation values. | `{}`                           |
@@ -58,7 +58,7 @@ A sample values yaml file is shown below:
 replicaCount: 1
 
 image:
-  tag: "0.4.0"
+  tag: "0.9.0"
 
 aerospikeVectorSearchConfig:
   aerospike:

diff --git a/aerospike-vector-search/examples/eks/README.md b/aerospike-vector-search/examples/eks/README.md
@@ -1,11 +1,11 @@
-# Aerospike Proximus EKS example
+# Aerospike Vector Search EKS example
 
 ## Prerequisites
 - EKS cluster
 - Helm v3
 - An Aerospike cluster that can connect to Pods in the Kubernetes cluster
   The Aerospike cluster can be deployed in the same Kubernetes cluster using [Aerospike Kubernetes Operator](https://docs.aerospike.com/cloud/kubernetes/operator)
-- Aerospike Proximus [Helm chart](../../README.md#configuration)
+- Aerospike Vector Search [Helm chart](../../README.md#configuration)
 
 ## Adding the helm chart repository
 
@@ -15,7 +15,7 @@ Add the `aerospike` helm repository if not already done
 helm repo add aerospike https://aerospike.github.io/helm-charts
 ```
 
-## Deploy Proximus Cluster.
+## Deploy Aerospike Vector Search Cluster.
 
 All subsequent commands are run from this directory.
 
@@ -43,11 +43,11 @@ kubectl create namespace aerospike
 ### EKS LoadBalancer configuration
 In this example we configure internal facing L4 LoadBalancer (NLB) for more details please refer to AWS [documentation](https://docs.aws.amazon.com/eks/latest/userguide/network-load-balancing.html).
 
-### Deploy Proximus.
-Update the [as-proximus-eks-values.yaml](as-proximus-eks-values.yaml) file to change Proximus configuration.
+### Deploy Aerospike Vector Search.
+Update the [avs-eks-values.yaml](avs-eks-values.yaml) file to change Aerospike Vector Search configuration.
 
 
-Deploy the Proximus cluster using configuration from [as-proximus-eks-values.yaml](as-proximus-eks-values.yaml)
+Deploy the Aerospike Vector Search cluster using configuration from [avs-eks-values.yaml](avs-eks-values.yaml)
 ```shell
-helm install --namespace aerospike as-proximus-eks -f as-proximus-eks-values.yaml ../../../aerospike-proximus
+helm install --namespace aerospike avs-eks -f avs-eks-values.yaml ../../../aerospike-vector-search
 ```
diff --git a/aerospike-vector-search/examples/eks/avs-eks-values.yaml b/aerospike-vector-search/examples/eks/avs-eks-values.yaml
@@ -2,7 +2,7 @@ replicaCount: 3
 aerospikeVectorSearchConfig:
   cluster:
     cluster-name: "avs-db-1"
-  feature-key-file: "/etc/aerospike-proximus/features.conf"
+  feature-key-file: "/etc/aerospike-vector-search/features.conf"
   service:
     ports:
       5000:
@@ -21,12 +21,11 @@ aerospikeVectorSearchConfig:
         addresses:
           0.0.0.0
   aerospike:
-    metadata-namespace: "avs-meta"
     seeds:
       - aerospike-cluster-0-0.aerospike-cluster.aerospike.svc.cluster.local:
           port: 3000
   logging:
-    #    file: /var/log/aerospike-proximus/aerospike-proximus.log
+    #    file: /var/log/aerospike-vector-search/aerospike-vector-search.log
     enable-console-logging: false
     format: simple
     max-history: 30

diff --git a/aerospike-vector-search/examples/gke/README.md b/aerospike-vector-search/examples/gke/README.md
@@ -1,11 +1,11 @@
-# Aerospike Proximus GKE example
+# Aerospike Aerospike Vector Search GKE example
 
 ## Prerequisites
 - GKE cluster
 - Helm v3
 - An Aerospike cluster that can connect to Pods in the Kubernetes cluster
   The Aerospike cluster can be deployed in the same Kubernetes cluster using [Aerospike Kubernetes Operator](https://docs.aerospike.com/cloud/kubernetes/operator)
-- Aerospike Proximus [Helm chart](../../README.md#configuration)
+- Aerospike Vector Search [Helm chart](../../README.md#configuration)
 
 ## Adding the helm chart repository
 
@@ -15,7 +15,7 @@ Add the `aerospike` helm repository if not already done
 helm repo add aerospike https://aerospike.github.io/helm-charts
 ```
 
-## Deploy Proximus Cluster.
+## Deploy Aerospike Vector Search Cluster.
 
 All subsequent commands are run from this directory.
 
@@ -43,11 +43,11 @@ kubectl create namespace aerospike
 ### GKE LoadBalancer configuration
 In this example we configure internal facing L4 LoadBalancer for more details please refer to GCP [documentation](https://cloud.google.com/kubernetes-engine/docs/concepts/service-load-balancer).
 
-### Deploy Proximus.
-Update the [avs-gke-values.yaml](avs-gke-values.yaml) file to change Proximus configuration.
+### Deploy Aerospike Vector Search.
+Update the [avs-gke-values.yaml](avs-gke-values.yaml) file to change Aerospike Vector Search configuration.
 
 
-Deploy the Proximus cluster using configuration from [avs-gke-values.yaml](avs-gke-values.yaml)
+Deploy the Aerospike Vector Search cluster using configuration from [avs-gke-values.yaml](avs-gke-values.yaml)
 ```shell
-helm install --namespace aerospike as-proximus-gke -f avs-gke-values.yaml ../../../aerospike-proximus
+helm install --namespace aerospike avs-eks -f avs-gke-values.yaml ../../../aerospike-vector-search
 ```
diff --git a/aerospike-vector-search/examples/gke/avs-gke-values.yaml b/aerospike-vector-search/examples/gke/avs-gke-values.yaml
@@ -2,7 +2,7 @@ replicaCount: 3
 aerospikeVectorSearchConfig:
   cluster:
     cluster-name: "avs-db-1"
-  feature-key-file: "/etc/aerospike-proximus/features.conf"
+  feature-key-file: "/etc/aerospike-vector-search/features.conf"
   service:
     ports:
       5000:
@@ -22,12 +22,11 @@ aerospikeVectorSearchConfig:
         addresses:
           0.0.0.0
   aerospike:
-    metadata-namespace: "avs-meta"
     seeds:
       - aerospike-cluster-0-0.aerospike-cluster.aerospike.svc.cluster.local:
           port: 3000
   logging:
-    #    file: /var/log/aerospike-proximus/aerospike-proximus.log
+    #    file: /var/log/aerospike-vector-search/aerospike-vector-search.log
     enable-console-logging: false
     format: simple
     max-history: 30

diff --git a/aerospike-vector-search/examples/kind/README.md b/aerospike-vector-search/examples/kind/README.md
@@ -1,23 +1,23 @@
-# Aerospike Proximus Quote Search example
+# Aerospike Vector Search Quote Search example
 
-This example deploys Aerospike Proximus cluster along with an Aerospike cluster and runs `quote-search` example app.
+This example deploys Aerospike Vector Search cluster along with an Aerospike cluster and runs `quote-search` example app.
 
 ## Prerequisites
 - Kubernetes cluster
 - Helm v3
 - An Aerospike cluster that can connect to Pods in the Kubernetes cluster
   The Aerospike cluster can be deployed in the same Kubernetes cluster using [Aerospike Kubernetes Operator](https://docs.aerospike.com/cloud/kubernetes/operator)
-- Aerospike Proximus [Helm chart](../../README.md#configuration)
+- Aerospike Vector Search [Helm chart](../../README.md#configuration)
 
 ## Clone this repository.
 - A clone of this git repository
 
-## Deploy Proximus Cluster.
+## Deploy Aerospike Vector Search Cluster.
 
 All subsequent commands are run from this directory.
 
 ### Install and Configure Load-Balancer
-Proximus cluster can be reach outside of Kubernetes cluster using a Load-Balancer in this example we're using Metallb but it could be any L4 Load-Balancer of your choice.
+Aerospike Vector Search cluster can be reach outside of Kubernetes cluster using a Load-Balancer in this example we're using Metallb but it could be any L4 Load-Balancer of your choice.
 #### Deploy MetalLB
 ```shell
 kubectl apply -f https://raw.githubusercontent.com/metallb/metallb/v0.14.4/config/manifests/metallb-native.yaml
@@ -65,41 +65,41 @@ Create a Kubernetes namespace if not already done
 kubectl create namespace aerospike
 ```
 
-### Deploy Proximus.
-Update the [quote-search-values.yaml](quote-search-values.yaml) file to change Proximus configuration.
+### Deploy Aerospike Vector Search.
+Update the [quote-search-values.yaml](quote-search-values.yaml) file to change Aerospike Vector Search configuration.
 
-Deploy the Proximus cluster using configuration from [quote-search-values.yaml](quote-search-values.yaml)
+Deploy the Aerospike Vector Search cluster using configuration from [quote-search-values.yaml](quote-search-values.yaml)
 ```shell
-helm install --namespace aerospike as-quote-search -f quote-search-values.yaml ../../../aerospike-proximus
+helm install --namespace aerospike as-quote-search -f quote-search-values.yaml ../../../aerospike-vector-search
 ```
 
 ### Deploy `quote-search` app
 #### Build Docker Image
-Follow this [manual](https://github.com/aerospike/proximus-examples/blob/main/quote-semantic-search/README.md#1-build-the-image) to build `qoute-search` app.
+Follow this [manual](https://github.com/aerospike/aerospike-vector-search-examples/blob/main/quote-semantic-search/README.md#1-build-the-image) to build `qoute-search` app.
 #### Download sample data set
 ```shell
 mkdir -p ./data
-curl -L -o ./data/quotes.csv.tgz https://github.com/aerospike/proximus-examples/raw/main/quote-semantic-search/container-volumes/quote-search/data/quotes.csv.tgz
+curl -L -o ./data/quotes.csv.tgz https://github.com/aerospike/aerospike-vector-search-examples/raw/main/quote-semantic-search/container-volumes/quote-search/data/quotes.csv.tgz
 ```
 #### Run tha app
 ```shell
 docker run -d \
 --name "quote-search" \
 -v "./data:/container-volumes/quote-search/data" \
 --network "kind" -p "8080:8080" \
--e "PROXIMUS_HOST=$(kubectl -n aerospike get svc/as-quote-search-aerospike-proximus-lb -o=jsonpath='{.status.loadBalancer.ingress[0].ip}')" \
--e "PROXIMUS_PORT=80" \
+-e "AVS_HOST=$(kubectl -n aerospike get svc/as-quote-search-aerospike-vector-search-lb -o=jsonpath='{.status.loadBalancer.ingress[0].ip}')" \
+-e "AVS_PORT=80" \
 -e "APP_NUM_QUOTES=5000" \
 -e "GRPC_DNS_RESOLVER=native" \
--e "PROXIMUS_IS_LOADBALANCER=True" quote-search
+-e "AVS_IS_LOADBALANCER=True" quote-search
 ```
 ## Cleanup
 ### Stop `quote-search` app
 ```shell
 docker stop quote-search
 docker rm quote-search
 ```
-### Uninstall Proximus cluster
+### Uninstall Aerospike Vector Search cluster
 ```shell
 helm delete as-quote-search --namespace aerospike
 ```

diff --git a/aerospike-vector-search/examples/kind/avs-kind-values.yaml b/aerospike-vector-search/examples/kind/avs-kind-values.yaml
@@ -1,7 +1,7 @@
 aerospikeVectorSearchConfig:
   cluster:
     cluster-name: "avs-db-1"
-  feature-key-file: "/etc/aerospike-proximus/features.conf"
+  feature-key-file: "/etc/aerospike-vector-search/features.conf"
   service:
     ports:
       5000:
@@ -16,12 +16,11 @@ aerospikeVectorSearchConfig:
         addresses:
           "0.0.0.0"
   aerospike:
-    metadata-namespace: "avs-meta"
     seeds:
       - aerospike-cluster-0-0.aerospike-cluster.aerospike.svc.cluster.local:
           port: 3000
   logging:
-    #    file: /var/log/aerospike-proximus/aerospike-proximus.log
+    #    file: /var/log/aerospike-vector-search/aerospike-vector-search.log
     enable-console-logging: false
     format: simple
     max-history: 30

diff --git a/aerospike-vector-search/templates/configmap.yaml b/aerospike-vector-search/templates/configmap.yaml
@@ -5,5 +5,5 @@ metadata:
   labels:
     {{- include "aerospike-vector-search.labels" . | nindent 4 }}
 data:
-  aerospike-proximus.yml: |-
+  aerospike-vector-search.yml: |-
     {{- .Values.aerospikeVectorSearchConfig | toYaml | nindent 4 }}
diff --git a/aerospike-vector-search/templates/statefulset.yaml b/aerospike-vector-search/templates/statefulset.yaml
@@ -63,8 +63,8 @@ spec:
             {{- end }}
           volumeMounts:
             - name: aerospike-vector-search-configmap
-              mountPath: /etc/aerospike-proximus/aerospike-proximus.yml
-              subPath: aerospike-proximus.yml
+              mountPath: /etc/aerospike-vector-search/aerospike-vector-search.yml
+              subPath: aerospike-vector-search.yml
               readOnly: true
             - name: aerospike-secret
               mountPath: {{ index .Values.aerospikeVectorSearchConfig "feature-key-file" }}