Vec 218 update 1.0 (#44)

* move non-customer facing images into internal folder * Update to 0.9.0 and rename proximus to AVS (#43) * Update README.md * added explicit versions and fixed configuration for 0.9.0 --------- Co-authored-by: Joe Martin <[email protected]> Co-authored-by: Jesse Schmidt <[email protected]> Co-authored-by: David Gerchikov <[email protected]>
aerospike · Jul 24, 2024 · e4f327e · e4f327e
1 parent b9ca6f6
commit e4f327e
Show file tree

Hide file tree

Showing 34 changed files with 225 additions and 265 deletions.
diff --git a/...ic-search/Dockerfile-quote-search-preview → .internal/Dockerfile-quote-search-preview b/...ic-search/Dockerfile-quote-search-preview → .internal/Dockerfile-quote-search-preview
@@ -6,8 +6,8 @@ RUN apt-get update \
     && pip3 install setuptools sql
 
 RUN mkdir /quote-search
-COPY ./quote-search /quote-search
-COPY --parents ./container-volumes/quote-search/data/quotes.csv.tgz .
+COPY ./quote-semantic-search/quote-search /quote-search
+COPY --parents ./quote-semantic-search/container-volumes/quote-search/data/quotes.csv.tgz .
 
 WORKDIR /quote-search
 RUN python3 -m pip install -r requirements.txt --extra-index-url https://aerospike.jfrog.io/artifactory/api/pypi/aerospike-pypi-dev/simple

diff --git a/prism-image-search/docker-compose-dev.yml → .internal/docker-compose-prism-dev.yml b/prism-image-search/docker-compose-dev.yml → .internal/docker-compose-prism-dev.yml
@@ -6,18 +6,18 @@ services:
     networks:
       - avs-demo
     volumes:
-      - ./container-volumes/aerospike/etc/aerospike:/opt/aerospike/etc/aerospike
+      - ./prism-image-search/container-volumes/aerospike/etc/aerospike:/opt/aerospike/etc/aerospike
     command:
       - "--config-file"
       - "/opt/aerospike/etc/aerospike/aerospike.conf"
   avs:
-    image: aerospike/aerospike-proximus:0.4.0
+    image: aerospike/aerospike-vector-search:0.9.0
     # ports:
       # - "5000:5000"
     networks:
       - avs-demo
     volumes:
-      - ./container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-proximus
+      - ./prism-image-search/container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-proximus
   app:
     build:
       context: .
@@ -37,7 +37,7 @@ services:
       APP_NUM_QUOTES: "5000"
       GRPC_DNS_RESOLVER: native
     volumes:
-      - ./container-volumes/prism/images:/prism/static/images/data
+      - ./prism-image-search/container-volumes/prism/images:/prism/static/images/data
 
 networks:
   avs-demo: {}
diff --git a/quote-semantic-search/docker-compose-dev.yml → ...ernal/docker-compose-quote-search-dev.yml b/quote-semantic-search/docker-compose-dev.yml → ...ernal/docker-compose-quote-search-dev.yml
@@ -6,18 +6,18 @@ services:
     networks:
       - avs-demo
     volumes:
-      - ./container-volumes/aerospike/etc/aerospike:/opt/aerospike/etc/aerospike
+      - ./quote-semantic-search/container-volumes/aerospike/etc/aerospike:/opt/aerospike/etc/aerospike
     command:
       - "--config-file"
       - "/opt/aerospike/etc/aerospike/aerospike.conf"
   avs:
-    image: aerospike/aerospike-proximus:0.4.0
+    image: aerospike/aerospike-vector-search:0.9.0
     # ports:
     #   - "5002:5002"
     networks:
       - avs-demo
     volumes:
-      - ./container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-proximus
+      - ./quote-semantic-search/container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-proximus
   app:
     build:
       context: .
@@ -32,8 +32,7 @@ services:
     networks:
       - avs-demo
     volumes:
-      - ./container-volumes/quote-search/data:/container-volumes/quote-search/data
-      # ./usr/local/lib/python3.10/dist-packages/sentence_transformers
+      - ./quote-semantic-search/container-volumes/quote-search/data:/container-volumes/quote-search/data
     environment:
       AVS_HOST: avs
       AVS_PORT: "5000"

diff --git a/README.md b/README.md
@@ -7,9 +7,9 @@ This is a companion repo for scripts and examples that are helpful to AVS users.
 
 ## Installation Examples
 This repo contains scripts and configuration details for installing AVS. 
-For more information about AVS, see our [install documentation](https://aerospike.com/docs/vector/operate/install). This repo contains the following:
+For more information about AVS, see our [install documentation](https://aerospike.com/docs/vector/install). This repo contains the following:
 
-* [Kubernetes install script](./kubernetes) - A bash script and configuration details for [Installing on Kubernetes](https://aerospike.com/docs/vector/operate/install/kubernetes).
+* [Kubernetes install script](./kubernetes) - A bash script and configuration details for [Installing on Kubernetes](https://aerospike.com/docs/vector/install/kubernetes).
 * [Docker-compose files](./docker) - The `./docker` folder contains a docker-compose file for deploying Aerospike and AVS as containers. Additionally, each example app has a docker-compose file that deploys Aerospike, AVS, and the application itself. 
 
 

diff --git a/basic-search/requirements.txt b/basic-search/requirements.txt
@@ -1 +1 @@
-aerospike-vector-search==0.6.1
+aerospike-vector-search==1.0.0
diff --git a/docker/README.md b/docker/README.md
@@ -5,7 +5,7 @@ Locate valid `features.conf` in the `./config` directory:
 
 > [!IMPORTANT]
 > If you are running MacOS you will need to replace all occurrences of port 5000 with 
-> port 5002 in your docker compose file and aerospike-proximus.yml file.
+> port 5002 in your docker compose file and aerospike-vector-search.yml file.
 
 ## Installation Aerospike and AVS Clusters (docker-compose)
 ```shell
@@ -32,8 +32,8 @@ docker run -d \
 --network svc \
 -p 5000:5000 \
 -p 5040:5040 \
--v ./config:/etc/aerospike-proximus \
-aerospike/aerospike-proximus:0.4.0
+-v ./config:/etc/aerospike-vector-search \
+aerospike/aerospike-vector-search:0.9.0
 ```
 
 
diff --git a/docker/config/aerospike-proximus.yml → docker/config/aerospike-vector-search.yml b/docker/config/aerospike-proximus.yml → docker/config/aerospike-vector-search.yml
@@ -4,9 +4,9 @@ cluster:
   # node-id: a1
 
   # Unique identifier for this cluster.
-  cluster-name: aerospike-proximus
+  cluster-name: aerospike-vector-search
 
-# The Proximus service listening ports, TLS and network interface.
+# The AVS service listening ports, TLS and network interface.
 service:
   ports:
     5000: {}
@@ -63,7 +63,7 @@ aerospike:
 # The logging properties.
 logging:
   #format: json
-  #file: /var/log/aerospike-proximus/aerospike-proximus.log
+  #file: /var/log/aerospike-vector-search/aerospike-vector-search.log
   enable-console-logging: true
   levels:
     metrics-ticker: off
diff --git a/docker/config/aerospike.conf b/docker/config/aerospike.conf
@@ -55,12 +55,12 @@ namespace test {
         }
 }
 
-namespace proximus-meta {
+namespace avs-meta {
         replication-factor 1
         nsup-period 100
 
         storage-engine device {
-               file /opt/aerospike/data/proximus-meta.dat
+               file /opt/aerospike/data/avs-meta.dat
                filesize 5G
         }
 }
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
@@ -19,9 +19,9 @@ services:
       retries: 3
     networks:
       - svc
-  aerospike-proximus:
-    image: aerospike/aerospike-proximus:0.4.0
-    container_name: "aerospike-proximus"
+  aerospike-vector-search:
+    image: aerospike/aerospike-vector-search:0.9.0
+    container_name: "aerospike-vector-search"
     depends_on:
       aerospike-cluster:
         condition: service_healthy
@@ -31,9 +31,9 @@ services:
     networks:
       - svc
     volumes:
-      - ${PWD}/config:/etc/aerospike-proximus
+      - ${PWD}/config:/etc/aerospike-vector-search
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://aerospike-proximus:5040/manage/rest/v1"]
+      test: ["CMD", "curl", "-f", "http://aerospike-vector-search:5040/manage/rest/v1"]
       interval: 30s
       timeout: 20s
       retries: 3

diff --git a/kubernetes/README.md b/kubernetes/README.md
@@ -1,6 +1,6 @@
-# Aerospike, Proximus, and Monitoring Deployment on GKE (Google Kubernetes Engine)
+# Aerospike Vector Search, and Monitoring Deployment on GKE (Google Kubernetes Engine)
 
-Use the scripts and manifests in this directory deploy Aerospike, Proximus, and monitoring tools on Google Kubernetes Engine (GKE).
+Use the scripts and manifests in this directory deploy Aerospike Vector Search, and monitoring tools on Google Kubernetes Engine (GKE).
 
 ## Prerequisites
 
@@ -12,7 +12,7 @@ Before you start, make sure you have installed the necessary tools:
 
 ## Scripts
 
-- `full-create-and-install.sh`: Creates a GKE cluster, installs Aerospike, Proximus, and sets up monitoring services.
+- `full-create-and-install.sh`: Creates a GKE cluster, installs Aerospike Vector Search, and sets up monitoring services.
 
 ### Grafana Dashboards
 

diff --git a/kubernetes/full-create-and-install.sh b/kubernetes/full-create-and-install.sh
@@ -155,7 +155,7 @@ kubectl apply -f manifests/istio/avs-virtual-service.yaml
 
 helm repo add aerospike-helm https://artifact.aerospike.io/artifactory/api/helm/aerospike-helm
 helm repo update
-helm install avs-gke --values "manifests/avs-gke-values.yaml" --namespace avs aerospike-helm/aerospike-vector-search --wait
+helm install avs-gke --values "manifests/avs-gke-values.yaml" --namespace avs aerospike-helm/aerospike-vector-search --version 0.4.0 --wait
 
 ##############################################
 # Monitoring namespace

diff --git a/kubernetes/helm/quote-semantic-search/Chart.yaml b/kubernetes/helm/quote-semantic-search/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name:  quote-semantic-search
-description: A Helm chart for Aerospike Proximus
+description: A Helm chart for Aerospike Quote Search App
 type: application
 icon: https://avatars0.githubusercontent.com/u/2214313?s=200&v=4
 keywords:

diff --git a/kubernetes/manifests/avs-gke-values.yaml b/kubernetes/manifests/avs-gke-values.yaml
@@ -1,11 +1,17 @@
 
 replicaCount: 3
-
+image:
+  repository: "aerospike/aerospike-vector-search"
+  pullPolicy: "IfNotPresent"
+  # Overrides the image tag whose default is the chart appVersion.
+  tag: "0.9.0"
+
 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:
+    metadata-namespace: "avs-meta"
     ports:
       5000:
         addresses:
@@ -27,13 +33,12 @@ aerospikeVectorSearchConfig:
       5001:
         addresses:
           0.0.0.0
-  aerospike:
-    metadata-namespace: "avs-meta"
+  storage:
     seeds:
       - aerocluster-0-0.aerocluster.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
@@ -63,7 +68,7 @@ service:
 #       port: 5000
 #       targetPort: 5000
 
-# schedule proximus nodes
+# schedule avs nodes
   affinity:
     nodeAffinity:
       requiredDuringSchedulingIgnoredDuringExecution:

diff --git a/prism-image-search/README.md b/prism-image-search/README.md
@@ -74,6 +74,7 @@ Add your features.conf file to container-volumes/avs/etc/avs.
 ```
 docker compose up
 ```
+
 ## Developing
 This demo is built using [Python Flask](https://flask.palletsprojects.com/en/2.3.x/)
 and [Vue.js](https://vuejs.org/). To start developing, follow the steps to 

diff --git a/prism-image-search/container-volumes/aerospike/etc/aerospike/aerospike.conf b/prism-image-search/container-volumes/aerospike/etc/aerospike/aerospike.conf
@@ -54,7 +54,7 @@ namespace test {
         }
 }
 
-namespace proximus-meta {
+namespace avs-meta {
         replication-factor 1
         nsup-period 100
 

diff --git a/prism-image-search/container-volumes/avs/etc/aerospike-vector-search/aerospike-proximus.yml b/prism-image-search/container-volumes/avs/etc/aerospike-vector-search/aerospike-proximus.yml
diff --git a/...mage-search/container-volumes/avs/etc/aerospike-vector-search/aerospike-vector-search.yml b/...mage-search/container-volumes/avs/etc/aerospike-vector-search/aerospike-vector-search.yml
@@ -0,0 +1,39 @@
+# Change the configuration for your use case.
+cluster:
+  # Custom node-id. It will be auto-generated if not specified.
+  # node-id: a1
+
+  # Unique identifier for this cluster.
+  cluster-name: prism-image-search
+
+# The AVS service listening ports, TLS and network interface.
+service:
+  ports:
+    5000: {}
+
+# Management API listening ports, TLS and network interface.
+manage:
+  ports:
+    5040: {}
+
+# Intra cluster interconnect listening ports, TLS and network interface.
+interconnect:
+  ports:
+    5001: {}
+
+#heartbeat:
+#  seeds:
+#    - address: localhost
+#      port: 6001
+
+# Target Aerospike cluster
+storage:
+  seeds:
+    - aerospike:
+        port: 3000
+
+# The logging properties.
+logging:
+  enable-console-logging: true
+  levels:
+    metrics-ticker: off
diff --git a/prism-image-search/docker-compose.yml b/prism-image-search/docker-compose.yml
@@ -11,15 +11,13 @@ services:
       - "--config-file"
       - "/opt/aerospike/etc/aerospike/aerospike.conf"
   avs:
-    image: aerospike/aerospike-proximus:0.4.0
-    # ports:
-      # - "5000:5000"
+    image: aerospike/aerospike-vector-search:0.9.0
     networks:
       - avs-demo
     volumes:
-      - ./container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-proximus
+      - ./container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-vector-search
   app:
-    image: aerospike/prism-search-example:latest
+    image: prism:latest
     ports:
       - "8080:8080"
     networks:
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		aerospike-vector-search==0.6.1
		aerospike-vector-search==1.0.0