feat: helm chart version 1.0.0 - gpu support, tester using bonsol-cli (…

…#38) Co-authored-by: austbot <[email protected]>
anagrambuild · Oct 16, 2024 · 900ea9f · 900ea9f
1 parent 8949806
commit 900ea9f
Show file tree

Hide file tree

Showing 7 changed files with 90 additions and 5 deletions.
diff --git a/charts/Chart.yaml b/charts/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: bonsol-node
 description: A Solana Verifiable compute coprocessor node
 type: application
-version: 0.1.0
-appVersion: "0.1.0"
+version: 1.0.0
+appVersion: "1.0.0"
diff --git a/charts/input_files/simple_execution_request.json b/charts/input_files/simple_execution_request.json
@@ -0,0 +1,30 @@
+{
+  "imageId": "68f4b0c5f9ce034aa60ceb264a18d6c410a3af68fafd931bcfd9ebe7c1e42960",
+  "executionConfig": {
+    "verifyInputHash": false,
+    "forwardOutput": true
+  },
+  "inputs": [
+    {
+      "inputType": "PublicData",
+      "data": "{\"attestation\":\"test\"}"
+    },
+    {
+      "inputType": "Private",
+      "data": "https://echoserver.dev/server?response=N4IgFgpghgJhBOBnEAuA2mkBjA9gOwBcJCBaAgTwAcIQAaEIgDwIHpKAbKASzxAF0+9AEY4Y5VKArVUDCMzogYUAlBlFEBEAF96G5QFdkKAEwAGU1qA"
+    }
+  ],
+  "tip": 12000,
+  "expiry": 100,
+  "callbackConfig": {
+    "programId": "exay1T7QqsJPNcwzMiWubR6vZnqrgM16jZRraHgqBGG",
+    "instructionPrefix": [1],
+    "extraAccounts": [
+      {
+        "pubkey": "exay1T7QqsJPNcwzMiWubR6vZnqrgM16jZRraHgqBGG",
+        "isSigner": false,
+        "isWritable": false
+      }
+    ]
+  }
+}
diff --git a/charts/input_files/simple_manifest.json b/charts/input_files/simple_manifest.json
@@ -0,0 +1,11 @@
+{
+  "name": "simple2",
+  "binaryPath": "/images/simple2",
+  "imageId": "68f4b0c5f9ce034aa60ceb264a18d6c410a3af68fafd931bcfd9ebe7c1e42960",
+  "inputOrder": [
+    "Public",
+    "Private"
+  ],
+  "signature": "4RBscJtuw32qGuCuTVEY6wF7nuTu3NFxS4phDrTBGqtZ5feY41ogNKKEptj3R5jNyVyj4UUCEJ5RoyyfXKjZxDTc",
+  "size": 266612
+}
diff --git a/charts/templates/_helpers.tpl b/charts/templates/_helpers.tpl
@@ -103,3 +103,18 @@ Selector labels
 app.kubernetes.io/name: {{ include "bonsol-tester.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
+
+{{/*
+Path to deployment manifest
+*/}}
+{{- define "bonsol-tester.manifestPath" -}}
+/input_files/simple_manifest.json
+{{- end }}
+
+{{/*
+Path to execution request
+*/}}
+{{- define "bonsol-tester.executionReqPath" -}}
+/input_files/simple_execution_request.json
+{{- end }}
+
diff --git a/charts/templates/configmap_tester.yaml b/charts/templates/configmap_tester.yaml
@@ -0,0 +1,16 @@
+{{- if .Values.tester.enabled }}
+{{ $root := . }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "bonsol-tester.fullname" . }}
+  labels:
+    {{- include "bonsol-tester.labels" . | nindent 4 }}
+data:
+  {{- range $f := splitList "," (printf "%s,%s" (include "bonsol-tester.manifestPath" .) (include "bonsol-tester.executionReqPath" . ))  }}
+  {{ base $f }} : |-
+    {{- tpl ($root.Files.Get (printf "input_files/%s" (base $f) ) ) $root  | nindent 4 }}
+  {{- end }}
+{{- end }}
+
diff --git a/charts/templates/deployment-tester.yaml b/charts/templates/deployment-tester.yaml
@@ -40,6 +40,8 @@ spec:
             value: {{ .Values.signer.path }}
           - name: RPC_ENDPOINT
             value: "{{ .Values.rpc.url }}/{{ .Values.rpc.token }}"
+          - name: SIMPLE_IMAGE
+            value: "https://bonsol-public-images.s3.amazonaws.com/simple-68f4b0c5f9ce034aa60ceb264a18d6c410a3af68fafd931bcfd9ebe7c1e42960"
           {{- if and (hasKey .Values.tester "env") (.Values.tester.env) }}
           {{- range $k,$v := .Values.tester.env }}
           - name: {{ $k }}
@@ -56,9 +58,11 @@ spec:
           - bash
           - -c
           - |
+            solana config set --keypair {{ .Values.signer.path }} -u $RPC_ENDPOINT
+            bonsol deploy -y -m {{ include "bonsol-tester.manifestPath" . }} -t url --url $SIMPLE_IMAGE
             while :
             do
-              /root/.local/share/pnpm/pnpm jest --silent=false
+              bonsol execute -f {{ include "bonsol-tester.executionReqPath" . }} -x 1000 -m 10000 -w
               sleep 300
             done
           {{- end }}
@@ -69,13 +73,22 @@ spec:
             - name: key # only works with keypair signer for now
               mountPath: {{ .Values.signer.path }}
               subPath: {{ base .Values.signer.path }}
+            - name: infiles
+              mountPath: {{ include "bonsol-tester.manifestPath" . }}
+              subPath: {{ base (include "bonsol-tester.manifestPath" .) }}
+            - name: infiles
+              mountPath: {{ include "bonsol-tester.executionReqPath" . }}
+              subPath: {{ base (include "bonsol-tester.executionReqPath" .) }}
             {{- with .Values.tester.volumeMounts }}
             {{- toYaml . | nindent 12 }}
             {{- end }}
       volumes:
         - name: key
           secret:
             secretName: {{ include "bonsol-provernode.fullname" . }}
+        - name: infiles
+          configMap:
+            name: {{ include "bonsol-tester.fullname" . }}
         {{- with .Values.tester.volumes }}
         {{- toYaml . | nindent 8 }}
         {{- end }}

diff --git a/charts/values.yaml b/charts/values.yaml
@@ -42,7 +42,7 @@ provernode:
 ##
   image:
     repository: ghcr.io/anagrambuild/bonsol-node@sha256
-    tag: a44f47818cbbc0bafcd27ae46226fdb2271662c3a070df6a1a84d5cc6b031a6d
+    tag: 05d33ce69b8db9cd0755fa6ff474db8b51cc680c874ff36a17de814e70e31eae
     pullPolicy: "IfNotPresent" 
     imagePullSecrets: []
 
@@ -158,7 +158,7 @@ tester:
 ##
   image:
     repository: docker.io/zerocomputing/bonsol-tester
-    tag: 0.2.0
+    tag: 0.4.0
     pullPolicy: "IfNotPresent" 
     imagePullSecrets: []