035

lavanet · Aug 8, 2024 · 8459eaa · 8459eaa
1 parent 489b631
commit 8459eaa
Show file tree

Hide file tree

Showing 13 changed files with 94 additions and 29 deletions.
diff --git a/charts/cache/Chart.yaml b/charts/cache/Chart.yaml
@@ -6,7 +6,7 @@ icon: https://github.com/lavanet/helm-charts/blob/main/docs/logo/logo.png?raw=tr
 sources:
   - https://github.com/lavanet/helm-charts
 type: application
-version: 0.3.4
+version: 0.3.5
 appVersion: "v2.2.6"
 kubeVersion: ">=1.16.0-0"
 home: https://lavanet.xyz

diff --git a/charts/cache/README.md b/charts/cache/README.md
@@ -2,7 +2,7 @@
 
 Lava helm chart for the cache service
 
-![Version: 0.3.4](https://img.shields.io/badge/Version-0.3.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.2.6](https://img.shields.io/badge/AppVersion-v2.2.6-informational?style=flat-square)
+![Version: 0.3.5](https://img.shields.io/badge/Version-0.3.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.2.6](https://img.shields.io/badge/AppVersion-v2.2.6-informational?style=flat-square)
 
 ## Lavanet Cache Helm Chart
 

diff --git a/charts/consumer/Chart.yaml b/charts/consumer/Chart.yaml
@@ -6,7 +6,7 @@ icon: https://github.com/lavanet/helm-charts/blob/main/docs/logo/logo.png?raw=tr
 sources:
   - https://github.com/lavanet/helm-charts
 type: application
-version: 0.3.4
+version: 0.3.5
 appVersion: "v2.2.6"
 kubeVersion: ">=1.16.0-0"
 home: https://lavanet.xyz

diff --git a/charts/consumer/README.md b/charts/consumer/README.md
@@ -2,7 +2,7 @@
 
 Lava helm chart for the consumer service
 
-![Version: 0.3.4](https://img.shields.io/badge/Version-0.3.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.2.6](https://img.shields.io/badge/AppVersion-v2.2.6-informational?style=flat-square)
+![Version: 0.3.5](https://img.shields.io/badge/Version-0.3.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.2.6](https://img.shields.io/badge/AppVersion-v2.2.6-informational?style=flat-square)
 
 ## Lavanet Consumer Helm Chart
 
@@ -31,7 +31,7 @@ Kubernetes: `>=1.16.0-0`
 | autoscaling.targetCPUUtilizationPercentage | int | `80` |  |
 | cache.address | string | `"cache:20100"` | cache address |
 | cache.enabled | bool | `true` | should add cache arg |
-| chainId | string | `"testnet"` |  |
+| chainId | string | `"lava-testnet-2"` |  |
 | chains.agr.default_interface | string | `"rest"` |  |
 | chains.agr.interfaces[0].interface | string | `"rest"` |  |
 | chains.agr.interfaces[0].port | int | `2002` |  |
@@ -213,17 +213,20 @@ Kubernetes: `>=1.16.0-0`
 | ingress.tls | list | `[]` |  |
 | key.passwordSecretKey | string | `"password"` | the key in the kubernetes secret that contains the password for the private key |
 | key.passwordSecretName | string | `"wallet"` | the kubernetes secret that contains the password for the private key |
-| key.secretKey | string | `"passphrase"` | the key in the kubernetes secret to use |
+| key.secretKey | string | `"key"` | the key in the kubernetes secret to use |
 | key.secretName | string | `"wallet"` | the kubernetes secret name containing the private key |
 | keyringBackend | string | `"test"` |  |
 | log.format | string | `"json"` |  |
 | log.level | string | `"warn"` |  |
 | metrics.enabled | bool | `true` | should enable prometheus metrics |
-| metrics.port | int | `3200` | prometheus metrics address |
+| metrics.port | int | `9000` | prometheus metrics address |
 | metrics.serviceMonitor.enabled | bool | `false` |  |
 | nameOverride | string | `""` |  |
 | node | string | `"https://testnet2-rpc.lavapro.xyz:443"` |  |
 | nodeSelector | object | `{}` |  |
+| persistence.accessModes[0] | string | `"ReadWriteOnce"` |  |
+| persistence.enabled | bool | `true` | should create pvc for the consumer data |
+| persistence.size | string | `"100Mi"` |  |
 | podAnnotations | object | `{}` |  |
 | podSecurityContext | object | `{}` |  |
 | relayServerAddress | string | `nil` | address of the relay server |

diff --git a/charts/consumer/templates/configmap.yaml b/charts/consumer/templates/configmap.yaml
@@ -7,13 +7,13 @@ metadata:
   labels:
     {{- include "consumer.labels" $ | nindent 4 }}
 data:
-  config.yaml: |
+  config.yml: |
     endpoints:
     {{- range $interfaceEntry := $itemValue.interfaces }}
       - chain-id: {{ $itemKey | upper }}
         disable_tls: {{ $interfaceEntry.disable_tls | default "false" }}
         api-interface: {{ $interfaceEntry.interface }}
         network-address: 0.0.0.0:{{ $interfaceEntry.port }}
     {{- end }}
-    metrics-listen-address: "0.0.0.0:{{ $itemValue.metrics_port }}"
+    metrics-listen-address: "0.0.0.0:{{ $.Values.metrics.port }}"
 {{- end }}
diff --git a/charts/consumer/templates/deployment.yaml b/charts/consumer/templates/deployment.yaml
@@ -16,8 +16,9 @@ spec:
       {{- include "consumer.selectorLabels" $ | nindent 6 }}
   template:
     metadata:
-      {{- with $.Values.podAnnotations }}
       annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") $ | sha256sum }}
+      {{- with $.Values.podAnnotations }}
         {{- toYaml $ | nindent 8 }}
       {{- end }}
       labels:
@@ -109,6 +110,12 @@ spec:
               containerPort: {{ $.Values.metrics.port }}
               protocol: TCP
           {{- end }}
+          volumeMounts:
+            - mountPath: "/lava"
+              name: data
+            - mountPath: /lava/config/config.yml
+              subPath: config.yml
+              name: config
           {{- if $.Values.metrics.enabled }}
           livenessProbe:
             httpGet:
@@ -121,6 +128,24 @@ spec:
           {{- end }}
           resources:
             {{- toYaml $.Values.resources | nindent 12 }}
+      volumes:
+        - name: "private-key-volume"
+          secret:
+            secretName: {{ $.Values.key.secretName }}
+            optional: false
+        - name: config
+          configMap:
+            name: {{ $itemKey | lower }}-{{ include "consumer.fullname" $ }}
+            items:
+              - key: config.yml
+                path: config.yml
+        - name: data
+          {{- if $.Values.persistence.enabled }}
+          persistentVolumeClaim:
+            claimName: {{ $itemKey | lower }}-{{ include "consumer.fullname" $ }}
+          {{- else }}
+          emptyDir: {}
+          {{- end }}
       {{- with $.Values.nodeSelector }}
       nodeSelector:
         {{- toYaml $ | nindent 8 }}

diff --git a/charts/consumer/templates/pvc.yaml b/charts/consumer/templates/pvc.yaml
@@ -0,0 +1,22 @@
+{{- if $.Values.persistence.enabled }}
+{{- range $itemKey, $itemValue := $.Values.chains }}
+---
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name:  {{ $itemKey | lower }}-{{ include "consumer.fullname" $ }}
+  labels:
+    {{- include "consumer.labels" $ | nindent 4 }}
+    app.lavanet.io/chain: {{ $itemKey | lower }}
+  annotations:
+    helm.sh/resource-policy: keep
+spec:
+  accessModes:
+  {{- range $.Values.persistence.accessModes }}
+    - {{ . | quote }}
+  {{- end }}
+  resources:
+    requests:
+      storage: {{ $.Values.persistence.size | quote }}
+{{- end }}
+{{- end }}
diff --git a/charts/consumer/templates/service.yaml b/charts/consumer/templates/service.yaml
@@ -15,6 +15,12 @@ spec:
       protocol: TCP
       name: {{ $interfaceEntry.interface | lower }}
   {{- end }}
+  {{- if $.Values.metrics.enabled }}
+    - name: metrics
+      targetPort: metrics
+      port: {{ $.Values.metrics.port }}
+      protocol: TCP
+  {{- end }}
   selector:
     {{- include "consumer.selectorLabels" $ | nindent 4 }}
     app.lavanet.io/chain: {{ $itemKey | lower }}

diff --git a/charts/consumer/values.yaml b/charts/consumer/values.yaml
@@ -84,7 +84,7 @@ geolocation: 2
 
 node: https://testnet2-rpc.lavapro.xyz:443
 
-chainId: testnet
+chainId: lava-testnet-2
 
 keyringBackend: test
 
@@ -94,7 +94,7 @@ key:
   # -- the kubernetes secret name containing the private key
   secretName: "wallet"
   # -- the key in the kubernetes secret to use
-  secretKey: "passphrase"
+  secretKey: "key"
   # -- the kubernetes secret that contains the password for the private key
   passwordSecretName: "wallet"
   # -- the key in the kubernetes secret that contains the password for the private key
@@ -119,10 +119,17 @@ metrics:
   # -- should enable prometheus metrics
   enabled: true
   # -- prometheus metrics address
-  port: 3200
+  port: 9000
   serviceMonitor:
     enabled: false
 
+persistence:
+  # -- should create pvc for the consumer data
+  enabled: true
+  accessModes:
+    - "ReadWriteOnce"
+  size: "100Mi"
+
 chains:
   lav1:
     metrics_port: 3007

diff --git a/charts/provider/Chart.yaml b/charts/provider/Chart.yaml
@@ -6,7 +6,7 @@ icon: https://github.com/lavanet/helm-charts/blob/main/docs/logo/logo.png?raw=tr
 sources:
   - https://github.com/lavanet/helm-charts
 type: application
-version: 0.3.4
+version: 0.3.5
 appVersion: "v2.2.6"
 kubeVersion: ">=1.16.0-0"
 home: https://lavanet.xyz

diff --git a/charts/provider/README.md b/charts/provider/README.md
@@ -2,7 +2,7 @@
 
 Lava helm chart for the provider service
 
-![Version: 0.3.4](https://img.shields.io/badge/Version-0.3.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.2.6](https://img.shields.io/badge/AppVersion-v2.2.6-informational?style=flat-square)
+![Version: 0.3.5](https://img.shields.io/badge/Version-0.3.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.2.6](https://img.shields.io/badge/AppVersion-v2.2.6-informational?style=flat-square)
 
 ## Lavanet Provider Helm Chart
 
@@ -183,24 +183,16 @@ Kubernetes: `>=1.16.0-0`
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | affinity | object | `{}` |  |
-| chains.lav1.cache.address | string | `"provider-cache:20100"` | cache address |
-| chains.lav1.cache.enabled | bool | `true` | should add cache arg to provider |
-| chains.lav1.chainId | string | `"lava-testnet-2"` | lava chain id |
-| chains.lav1.existingSecret | string | `"config"` | existing configuration secret name |
+| cache.address | string | `"provider-cache:20100"` | cache address |
+| cache.enabled | bool | `true` | should add cache arg to provider |
+| chainId | string | `"lava-testnet-2"` | lava chain id |
+| chains.lav1.existingSecret | string | `"provider-config"` | existing configuration secret name |
 | chains.lav1.existingSecretKey | string | `"config.yml"` | existing configuration secret key |
-| chains.lav1.geolocation | string | `"2"` | provider geo-location can be one of the [geolocations](https://docs.lavanet.xyz/provider-setup#geolocations) |
-| chains.lav1.key | object | `{"passwordSecretKey":"password","passwordSecretName":"wallet","secretKey":"passphrase","secretName":"wallet"}` | information about the private key to use for the node |
-| chains.lav1.key.passwordSecretKey | string | `"password"` | the key in the kubernetes secret that contains the password for the private key |
-| chains.lav1.key.passwordSecretName | string | `"wallet"` | the kubernetes secret that contains the password for the private key |
-| chains.lav1.key.secretKey | string | `"passphrase"` | the key in the kubernetes secret to use |
-| chains.lav1.key.secretName | string | `"wallet"` | the kubernetes secret name containing the private key |
-| chains.lav1.keyringBackend | string | `"test"` | provider keyring backend |
-| chains.lav1.node | string | `"https://testnet2-rpc.lavapro.xyz:443"` | lava node to connect to |
 | chains.lav1.persistence.accessModes[0] | string | `"ReadWriteOnce"` |  |
 | chains.lav1.persistence.enabled | bool | `true` | should create pvc for the provider data |
 | chains.lav1.persistence.size | string | `"8Gi"` |  |
-| chains.lav1.wallet | string | `"test"` | wallet name |
 | fullnameOverride | string | `""` |  |
+| geolocation | string | `"2"` | provider geo-location can be one of the [geolocations](https://docs.lavanet.xyz/provider-setup#geolocations) |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"ghcr.io/lavanet/lava/lavap"` |  |
 | image.tag | string | `""` | overrides the image tag whose default is the chart appVersion. |
@@ -212,12 +204,19 @@ Kubernetes: `>=1.16.0-0`
 | ingress.hosts[0].paths[0].path | string | `"/"` |  |
 | ingress.hosts[0].paths[0].pathType | string | `"ImplementationSpecific"` |  |
 | ingress.tls | list | `[]` |  |
+| key | object | `{"passwordSecretKey":"password","passwordSecretName":"wallet","secretKey":"key","secretName":"wallet"}` | information about the private key to use for the node |
+| key.passwordSecretKey | string | `"password"` | the key in the kubernetes secret that contains the password for the private key |
+| key.passwordSecretName | string | `"wallet"` | the kubernetes secret that contains the password for the private key |
+| key.secretKey | string | `"key"` | the key in the kubernetes secret to use |
+| key.secretName | string | `"wallet"` | the kubernetes secret name containing the private key |
+| keyringBackend | string | `"test"` | provider keyring backend |
 | log.format | string | `"json"` | log format, can be json or text |
 | log.level | string | `"info"` | log level |
 | metrics.enabled | bool | `true` | should enable prometheus metrics |
 | metrics.port | int | `3200` | prometheus metrics address |
 | metrics.serviceMonitor.enabled | bool | `false` |  |
 | nameOverride | string | `""` |  |
+| node | string | `"https://testnet2-rpc.lavapro.xyz:443"` | lava node to connect to |
 | nodeSelector | object | `{}` |  |
 | podAnnotations | object | `{}` |  |
 | podSecurityContext | object | `{}` |  |
@@ -230,6 +229,7 @@ Kubernetes: `>=1.16.0-0`
 | serviceAccount.create | bool | `true` | specifies whether a service account should be created |
 | serviceAccount.name | string | `""` | the name of the service account to use. If not set and create is true, a name is generated using the fullname template |
 | tolerations | list | `[]` |  |
+| wallet | string | `"test"` | wallet name |
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)
diff --git a/charts/provider/templates/pvc.yaml b/charts/provider/templates/pvc.yaml
@@ -1,4 +1,5 @@
 {{- range $itemKey, $itemValue := $.Values.chains }}
+{{- if $itemValue.persistence.enabled }}
 ---
 kind: PersistentVolumeClaim
 apiVersion: v1
@@ -18,3 +19,4 @@ spec:
     requests:
       storage: {{ $itemValue.persistence.size | quote }}
 {{- end }}
+{{- end }}
diff --git a/charts/provider/templates/statefulset.yaml b/charts/provider/templates/statefulset.yaml
@@ -73,7 +73,7 @@ spec:
           args:
             - "rpcprovider"
             {{- if $itemValue.existingSecret }}
-            - {{ $itemValue.existingSecretKey }}            
+            - {{ $itemValue.existingSecretKey }}
             {{- else }}
             - config.yml
             {{- end }}