Merge branch 'main' into VEC-360-create-a-version-of-the-kubernetes-i…

…nstall-script-for-eks
aerospike · Nov 8, 2024 · 6233b27 · 6233b27
2 parents 00f805e + 8a70df1
commit 6233b27
Show file tree

Hide file tree

Showing 8 changed files with 91 additions and 22 deletions.
diff --git a/kubernetes/manifests/aerospike-cr-auth.yaml b/kubernetes/manifests/aerospike-cr-auth.yaml
@@ -24,21 +24,36 @@ spec:
             size: 1Gi
       - name: avs-meta
         aerospike:
-          path: /avs/dev/xvdf
+          path: /avs-meta/dev/xvdf
+        source:
+          persistentVolume:
+            storageClass: ssd
+            volumeMode: Block
+            size: 2Gi
+      - name: avs-index
+        aerospike:
+          path: /avs-index/dev/xvdf
+        source:
+          persistentVolume:
+            storageClass: ssd
+            volumeMode: Block
+            size: 20Gi
+      - name: avs-data
+        aerospike:
+          path: /avs-data/dev/xvdf
         source:
           persistentVolume:
             storageClass: ssd
             volumeMode: Block
             size: 20Gi
-
       - name: ns
         aerospike:
           path: /test/dev/xvdf
         source:
           persistentVolume:
             storageClass: ssd
             volumeMode: Block
-            size: 20Gi
+            size: 1Gi
       - name: aerospike-config-secret
         source:
           secret:
@@ -128,7 +143,18 @@ spec:
           type: device
           devices:
             - /test/dev/xvdf
-
+      - name: avs-index
+        replication-factor: 2
+        storage-engine:
+          type: device
+          devices:
+            - /avs-index/dev/xvdf
+      - name: avs-data
+        replication-factor: 2
+        storage-engine:
+          type: device
+          devices:
+            - /avs-data/dev/xvdf
       - name: avs-meta
         nsup-period: 600
         nsup-threads: 2
@@ -137,4 +163,4 @@ spec:
         storage-engine:
           type: device
           devices:
-            - /avs/dev/xvdf
+            - /avs-meta/dev/xvdf
diff --git a/kubernetes/manifests/aerospike-cr.yaml b/kubernetes/manifests/aerospike-cr.yaml
@@ -24,21 +24,36 @@ spec:
             size: 1Gi
       - name: avs-meta
         aerospike:
-          path: /avs/dev/xvdf
+          path: /avs-meta/dev/xvdf
+        source:
+          persistentVolume:
+            storageClass: ssd
+            volumeMode: Block
+            size: 2Gi
+      - name: avs-index
+        aerospike:
+          path: /avs-index/dev/xvdf
+        source:
+          persistentVolume:
+            storageClass: ssd
+            volumeMode: Block
+            size: 20Gi
+      - name: avs-data
+        aerospike:
+          path: /avs-data/dev/xvdf
         source:
           persistentVolume:
             storageClass: ssd
             volumeMode: Block
             size: 20Gi
-
       - name: ns
         aerospike:
           path: /test/dev/xvdf
         source:
           persistentVolume:
             storageClass: ssd
             volumeMode: Block
-            size: 20Gi
+            size: 1Gi
       - name: aerospike-config-secret
         source:
           secret:
@@ -90,7 +105,18 @@ spec:
           type: device
           devices:
             - /test/dev/xvdf
-
+      - name: avs-index
+        replication-factor: 2
+        storage-engine:
+          type: device
+          devices:
+            - /avs-index/dev/xvdf
+      - name: avs-data
+        replication-factor: 2
+        storage-engine:
+          type: device
+          devices:
+            - /avs-data/dev/xvdf
       - name: avs-meta
         nsup-period: 600
         nsup-threads: 2
@@ -99,4 +125,4 @@ spec:
         storage-engine:
           type: device
           devices:
-            - /avs/dev/xvdf
+            - /avs-meta/dev/xvdf
diff --git a/prism-image-search/README.md b/prism-image-search/README.md
@@ -65,14 +65,15 @@ ln -s ~/Pictures container-volumes/prism/images/static/data
 cd prism-image-search && \\
 docker build -t prism . -f Dockerfile-prism
 ```
-
 ### 2. Add features.conf
 AVS needs an Aerospike features.conf file with the vector-search feature enabled.
-Add your features.conf file to `container-volumes/avs/etc/aerospike-vector-search`.
+
+Optionally set `FEATURE_KEY` environment variable with the location of your `features.conf` file or 
+if no variable is set it will expect the features.conf to be in  `container-volumes/avs/etc/aerospike-vector-search`.
 
 ### 3. Start the environment
 ```
-docker compose -f docker-compose-dev.yml up
+FEATURE_KEY=/path/to/features.conf docker compose -f docker-compose-dev.yml up
 ```
 
 ## Developing

diff --git a/prism-image-search/docker-compose-dev.yml b/prism-image-search/docker-compose-dev.yml
@@ -19,22 +19,25 @@ services:
       timeout: 20s
       retries: 10
   avs:
-
     image: aerospike/aerospike-vector-search:0.11.1
+    environment:
+      FEATURE_KEY: "${FEATURE_KEY:-./container-volumes/avs/etc/aerospike-vector-search/features.conf}"
+
     depends_on:
       aerospike:
         condition: service_healthy
     networks:
       - avs-demo
     volumes:
       - ./container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-vector-search
+      - ${FEATURE_KEY:-./container-volumes/avs/etc/aerospike-vector-search/features.conf}:/etc/aerospike-vector-search/features.conf:ro
     healthcheck:
       test: ["CMD", "curl", "-f", "http://avs:5040/manage/rest/v1"]
       interval: 5s
       timeout: 20s
       retries: 10
   app:
-    image: prism:latest
+    image: "prism:latest"
     depends_on: 
       avs:
         condition: service_healthy

diff --git a/prism-image-search/docker-compose.yml b/prism-image-search/docker-compose.yml
@@ -20,20 +20,23 @@ services:
       retries: 10
   avs:
     image: aerospike/aerospike-vector-search:0.11.1
+    environment:
+      FEATURE_KEY: "${FEATURE_KEY:-./container-volumes/avs/etc/aerospike-vector-search/features.conf}"
     depends_on:
       aerospike:
         condition: service_healthy
     networks:
       - avs-demo
     volumes:
       - ./container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-vector-search
+      - ${FEATURE_KEY:-./container-volumes/avs/etc/aerospike-vector-search/features.conf}:/etc/aerospike-vector-search/features.conf:ro
     healthcheck:
       test: ["CMD", "curl", "-f", "http://avs:5040/manage/rest/v1"]
       interval: 5s
       timeout: 20s
       retries: 10
   app:
-    image: aerospike/prism-search-example:latest
+    image: "aerospike/prism-search-example:latest"
     depends_on: 
       avs:
         condition: service_healthy

diff --git a/quote-semantic-search/README.md b/quote-semantic-search/README.md
@@ -57,12 +57,16 @@ docker build -t quote-search . -f Dockerfile-quote-search
 
 ### 2. Add features.conf
 AVS needs an Aerospike features.conf file with the vector-search feature enabled.
-Add your features.conf file to container-volumes/avs/etc/aerospike-vector-search.
+Optionally set `FEATURE_KEY` environment variable with the location of your `features.conf` file.
+
+If no variable is set it will expect the features.conf to be in  `container-volumes/avs/etc/aerospike-vector-search`
+
 
 
 ### 3. Start the environment
 ```
-docker compose -f docker-compose-dev.yml up
+FEATURE_KEY=/path/to/features.conf docker compose -f docker-compose-dev.yml up
+
 ```
 
 ## Developing

diff --git a/quote-semantic-search/docker-compose-dev.yml b/quote-semantic-search/docker-compose-dev.yml
@@ -19,23 +19,26 @@ services:
       timeout: 20s
       retries: 10
   avs:
+    image: aerospike/aerospike-vector-search:0.11.1
+    environment:
+      FEATURE_KEY: "${FEATURE_KEY:-./container-volumes/avs/etc/aerospike-vector-search/features.conf}"
     depends_on:
       aerospike:
         condition: service_healthy
-    image: aerospike/aerospike-vector-search:0.11.1
     # ports:
     #   - "5002:5002"
     networks:
       - avs-demo
     volumes:
       - ./container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-vector-search
+      - ${FEATURE_KEY:-./container-volumes/avs/etc/aerospike-vector-search/features.conf}:/etc/aerospike-vector-search/features.conf:ro
     healthcheck:
       test: ["CMD", "curl", "-f", "http://avs:5040/manage/rest/v1"]
       interval: 5s
       timeout: 20s
       retries: 10
   app:
-    image: quote-search:latest
+    image: "quote-search:latest"
     depends_on:
       avs:
         condition: service_healthy

diff --git a/quote-semantic-search/docker-compose.yml b/quote-semantic-search/docker-compose.yml
@@ -19,23 +19,26 @@ services:
       timeout: 20s
       retries: 10
   avs:
+    image: aerospike/aerospike-vector-search:0.11.1
+    environment:
+      FEATURE_KEY: "${FEATURE_KEY:-./container-volumes/avs/etc/aerospike-vector-search/features.conf}"
     depends_on:
       aerospike:
         condition: service_healthy
-    image: aerospike/aerospike-vector-search:0.11.1
     # ports:
     #   - "5002:5002"
     networks:
       - avs-demo
     volumes:
       - ./container-volumes/avs/etc/aerospike-vector-search:/etc/aerospike-vector-search
+      - ${FEATURE_KEY:-./container-volumes/avs/etc/aerospike-vector-search/features.conf}:/etc/aerospike-vector-search/features.conf:ro
     healthcheck:
       test: ["CMD", "curl", "-f", "http://avs:5040/manage/rest/v1"]
       interval: 5s
       timeout: 20s
       retries: 10
   app:
-    image: aerospike/quote-search-example:latest
+    image: "aerospike/quote-search-example:latest"
     depends_on:
       avs:
         condition: service_healthy