Deployment

.github/workflows/docker-build.yaml

@@ -0,0 +1,17 @@
+name: Makefile Workflow
+
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v2
+
+    - name: Run Makefile command
+      run: make api

Makefile

@@ -1,35 +1,39 @@
 build: api embeddings
 
+TAG ?= 0.1.2 # want to keep things all aligned here
+
 .PHONY: api embeddings push
 
+build: api stablelm stablelm-7b embeddings whisper
+
 push:
-	docker push ghcr.io/defenseunicorns/leapfrogai/api:0.0.1
-	docker push ghcr.io/defenseunicorns/leapfrogai/stablelm-3b:0.0.1
-	docker push ghcr.io/defenseunicorns/leapfrogai/embeddings:0.0.1
+	docker push ghcr.io/defenseunicorns/leapfrogai/api:${TAG}
+	docker push ghcr.io/defenseunicorns/leapfrogai/stablelm-3b:${TAG}
+	docker push ghcr.io/defenseunicorns/leapfrogai/embeddings:${TAG}
 
 api:
 	cd api && \
-	docker build --network=host -t ghcr.io/defenseunicorns/leapfrogai/api:0.0.1 .
+	docker build --network=host -t ghcr.io/defenseunicorns/leapfrogai/api:${TAG} .
 
 stablelm:
 	cd llms/stablelm && \
-	docker build --network=host -t ghcr.io/defenseunicorns/leapfrogai/stablelm-3b:0.0.1 .
+	docker build --network=host -t ghcr.io/defenseunicorns/leapfrogai/stablelm-3b:${TAG} .
 
 stablelm-7b:
 	cd llms/stablelm-7b && \
-	docker build --network=host -t ghcr.io/defenseunicorns/leapfrogai/stablelm-7b:0.0.1 .
+	docker build --network=host -t ghcr.io/defenseunicorns/leapfrogai/stablelm-7b:${TAG} .
 
 
 embeddings:
 	cd embeddings && \
-	docker build --network=host -t ghcr.io/defenseunicorns/leapfrogai/embeddings:0.0.1 .
+	docker build --network=host -t ghcr.io/defenseunicorns/leapfrogai/embeddings:${TAG} .
 
 whisper:
 	cd models/whisper && \
-	docker build --network=host -t ghcr.io/defenseunicorns/leapfrogai/whisper:0.0.1 .
+	docker build --network=host -t ghcr.io/defenseunicorns/leapfrogai/whisper:${TAG} .
 
 whisper-push:
-	docker push ghcr.io/defenseunicorns/leapfrogai/whisper:0.0.1
+	docker push ghcr.io/defenseunicorns/leapfrogai/whisper:${TAG}
 
 # This thing is massive, so directly pushing to the zarf registry is quicker/easier
 zarf-push-api:

chart/Chart.yaml

@@ -15,7 +15,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: 0.0.1
+version: 0.0.2
 
 # 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
@@ -26,10 +26,10 @@ appVersion: "1.16.0"
 annotations:
   helm.sh/images: |
     - name: api
-      image: ghcr.io/defenseunicorns/leapfrogai/api:0.0.1
+      image: ghcr.io/defenseunicorns/leapfrogai/api:0.0.2
     - name: stable-3b
-      image: ghcr.io/defenseunicorns/leapfrogai/stablelm-3b:0.0.1
+      image: ghcr.io/defenseunicorns/leapfrogai/stablelm-3b:0.0.2
     - name: embeddings
-      image: ghcr.io/defenseunicorns/leapfrogai/embeddings:0.0.1
+      image: ghcr.io/defenseunicorns/leapfrogai/embeddings:0.0.2
     - name: whisper
-      image: ghcr.io/defenseunicorns/leapfrogai/whisper:0.0.1
+      image: ghcr.io/defenseunicorns/leapfrogai/whisper:0.0.2

chart/templates/api/deployment.yaml

@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: api-container
-          image: ghcr.io/defenseunicorns/leapfrogai/api:0.0.1
+          image: ghcr.io/defenseunicorns/leapfrogai/api:0.0.4
           imagePullPolicy: Always
           ports:
             - containerPort: 50051

values.yaml

@@ -24,27 +24,25 @@ modules:
     enabled: true
   text2vec-openai:
     enabled: true
+  stablelm3b:
+    enabled: ###ZARF_VAR_STABLELM_3B_ENABLED###
+    name: stablelm-3b
+
+  all_MiniLM_L6_v2:
+    enabled: ###ZARF_VAR_ALL_MINILM_L6_V2_ENABLED###
+    name: all-MiniLM-L6-v2
+
+  whisper:
+    enabled: ###ZARF_VAR_WHISPER_ENABLED###
+    name: whisper
 storage:
   size: 32Gi # default
 
-domain: dd.bigbang.dev
+domain: "###ZARF_VAR_DOMAIN###"
 
 istio:
   enabled: true
 
 monitoring:
   enabled: true
 
-
-models:
-  stablelm3b:
-    enabled: true
-    name: stablelm-3b
-
-  all_MiniLM_L6_v2:
-    enabled: true
-    name: all-MiniLM-L6-v2
-
-  whisper:
-    enabled: true
-    name: whisper

weaviate/manifests/vs.yaml

@@ -7,7 +7,7 @@ spec:
   gateways:
   - istio-system/tenant
   hosts:
-  - weaviate.dd.bigbang.dev
+  - "weaviate.###ZARF_VAR_DOMAIN###"
   http:
   - route:
     - destination:

weaviate/zarf.yaml

@@ -50,8 +50,8 @@ components:
       - manifests/vs.yaml
     repos:
     - "###ZARF_PKG_VAR_REPO###"
-    images:
-    - "semitechnologies/weaviate:1.18.3"
-    - "ghcr.io/defenseunicorns/leapfrogai/weaviate:0.0.3"
-    - semitechnologies/transformers-inference:sentence-transformers-all-MiniLM-L6-v2
-    - semitechnologies/transformers-inference:distilbert-base-uncased
+    # images:
+    # - "semitechnologies/weaviate:1.18.3"
+    # - "ghcr.io/defenseunicorns/leapfrogai/weaviate:0.0.3"
+    # - semitechnologies/transformers-inference:sentence-transformers-all-MiniLM-L6-v2
+    # - semitechnologies/transformers-inference:distilbert-base-uncased

zarf-config.yaml

@@ -7,4 +7,7 @@ package:
       values_file: "../values.yaml"
       path: "./weaviate"
       namespace: "weaviate"
-    max_package_size: "1000000000"
+    max_package_size: "1000000000"
+  deploy:
+    set:
+      domain: dd.bigbang.dev

zarf.yaml

@@ -24,13 +24,13 @@ components:
     - name: leapfrogai
       namespace: leapfrogai
       localPath: chart
-      version: 0.0.1
+      version: 0.0.2
       valuesFiles:
         - "values.yaml"
-    # images:
-    #   - "ghcr.io/defenseunicorns/leapfrogai/api:0.0.1"
-    #   # - "ghcr.io/defenseunicorns/leapfrogai/stablelm-3b:0.0.1"
-    #   - "ghcr.io/defenseunicorns/leapfrogai/embeddings:0.0.1"
+    images:
+      - "ghcr.io/defenseunicorns/leapfrogai/api:0.0.4"
+      - "ghcr.io/defenseunicorns/leapfrogai/stablelm-3b:0.0.1"
+      - "ghcr.io/defenseunicorns/leapfrogai/embeddings:0.0.1"
   - name: dcgm-exporter
     required: true
     charts: