diff --git a/charts/nitro/ci/sepolia-values.yaml b/charts/nitro/ci/sepolia-values.yaml index c8991a5..84332ec 100644 --- a/charts/nitro/ci/sepolia-values.yaml +++ b/charts/nitro/ci/sepolia-values.yaml @@ -10,15 +10,41 @@ readinessProbe: initialDelaySeconds: 10 periodSeconds: 3 +jwtSecret: + enabled: true + value: "9911e3404a316d61ddbda18b1d23479002535efebb7a4c8dbc3408a1d9ac6b06" + blobPersistence: enabled: true +validator: + enabled: true + + defaultNodeSelector: + kubernetes.io/arch: arm64 + + splitvalidator: + deployments: + - name: "1" + - name: "2" + + global: + configmap: + data: + metrics: true + + metrics: + enabled: true + configmap: data: conf: env-prefix: "NITROCI" chain: id: 421614 + node: + staker: + enable: true parent-chain: id: 11155111 blob-client: @@ -26,10 +52,11 @@ configmap: wallet: account: "44a2864f7e5fc6ac1704ffae163730ad66d02fc1" password: "test123" + metrics: true wallet: files: - key1.json: "{\"address\":\"44a2864f7e5fc6ac1704ffae163730ad66d02fc1\",\"id\":\"0410ec05-04c1-47fa-bb1f-e14a8fa7c54b\",\"version\":3,\"Crypto\":{\"cipher\":\"aes-128-ctr\",\"cipherparams\":{\"iv\":\"6cceaacd065a07ae7cc6cf9856f4e5fe\"},\"ciphertext\":\"33549ecaa70a3f31c9fbd16ecd93a9ddfcd5bbfde87420e3843312509d16002d\",\"kdf\":\"scrypt\",\"kdfparams\":{\"salt\":\"25a8b71f4fa6593753783746ed6a072b43713a8226b39855e35c8855690e3226\",\"n\":131072,\"dklen\":32,\"p\":1,\"r\":8},\"mac\":\"56a7de08e50295f976bbfb71a4125379cf7d00ee0171c7fb43dd3aafdf770649\"},\"x-ethers\":{\"client\":\"ethers/6.12.1\",\"gethFilename\":\"UTC--2024-05-07T05-35-58.0Z--44a2864f7e5fc6ac1704ffae163730ad66d02fc1\",\"path\":\"m/44'/60'/0'/0/0\",\"locale\":\"en\",\"mnemonicCounter\":\"9810530864bddf04b8fee8b9e535fcdc\",\"mnemonicCiphertext\":\"9f46a31391cca84a2dc361255e5ff467\",\"version\":\"0.1\"}}" + key1.json: '{"address":"44a2864f7e5fc6ac1704ffae163730ad66d02fc1","id":"0410ec05-04c1-47fa-bb1f-e14a8fa7c54b","version":3,"Crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"6cceaacd065a07ae7cc6cf9856f4e5fe"},"ciphertext":"33549ecaa70a3f31c9fbd16ecd93a9ddfcd5bbfde87420e3843312509d16002d","kdf":"scrypt","kdfparams":{"salt":"25a8b71f4fa6593753783746ed6a072b43713a8226b39855e35c8855690e3226","n":131072,"dklen":32,"p":1,"r":8},"mac":"56a7de08e50295f976bbfb71a4125379cf7d00ee0171c7fb43dd3aafdf770649"},"x-ethers":{"client":"ethers/6.12.1","gethFilename":"UTC--2024-05-07T05-35-58.0Z--44a2864f7e5fc6ac1704ffae163730ad66d02fc1","path":"m/44''/60''/0''/0/0","locale":"en","mnemonicCounter":"9810530864bddf04b8fee8b9e535fcdc","mnemonicCiphertext":"9f46a31391cca84a2dc361255e5ff467","version":"0.1"}}' extraEnv: - name: NITROCI_PARENT__CHAIN_CONNECTION_URL diff --git a/charts/nitro/templates/validator/deployments.yaml b/charts/nitro/templates/validator/deployments.yaml index 134e025..071ab86 100644 --- a/charts/nitro/templates/validator/deployments.yaml +++ b/charts/nitro/templates/validator/deployments.yaml @@ -90,14 +90,14 @@ spec: - name: auth containerPort: {{ $mergedValues.auth.port }} {{- end }} - {{- if $mergedValues.configmap.data.metrics }} + {{- if $mergedValues.metrics }} - name: metrics - containerPort: {{ index $.Values "validator" "configmap" "data" "metrics-server" "port" }} + containerPort: {{ index $mergedValues "metrics" "port" }} protocol: TCP {{- end }} - {{- if $mergedValues.configmap.data.pprof }} + {{- if $mergedValues.pprof }} - name: pprof - containerPort: {{ index $.Values "validator" "configmap" "data" "pprof-cfg" "port" }} + containerPort: {{ index $mergedValues "pprof" "port" }} protocol: TCP {{- end }} {{- with $mergedValues.extraPorts }} diff --git a/charts/nitro/templates/validator/servicemonitor.yaml b/charts/nitro/templates/validator/servicemonitor.yaml index d025d82..daa30b2 100644 --- a/charts/nitro/templates/validator/servicemonitor.yaml +++ b/charts/nitro/templates/validator/servicemonitor.yaml @@ -11,7 +11,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ include "nitro.fullname" . }}-val-{{ .name }} + name: {{ include "nitro.fullname" $ }}-val-{{ .name }} labels: {{- $labels | nindent 4 }} spec: diff --git a/charts/nitro/values.yaml b/charts/nitro/values.yaml index 28c2b4f..0c8ce74 100644 --- a/charts/nitro/values.yaml +++ b/charts/nitro/values.yaml @@ -277,13 +277,13 @@ validator: ## @param validator.splitvalidator.global.configmap.data.auth.jwtsecret Path to jwt secret for auth service jwtsecret: "/secrets/jwtsecret" - ## @param validator.splitvalidator.global.metrics Enable metrics - metrics: false - metrics-server: - ## @param validator.splitvalidator.global.metrics-server.addr Address to bind metrics server to - addr: "0.0.0.0" - ## @param validator.splitvalidator.global.metrics-server.port Port to bind metrics server to - port: 6070 + ## @param validator.splitvalidator.global.configmap.data.metrics Enable metrics + metrics: false + metrics-server: + ## @param validator.splitvalidator.global.configmap.data.metrics-server.addr Address to bind metrics server to + addr: "0.0.0.0" + ## @param validator.splitvalidator.global.configmap.data.metrics-server.port Port to bind metrics server to + port: 6070 ## @param validator.splitvalidator.global.extraArgs Extra arguments for the validator container extraArgs: [] @@ -294,6 +294,12 @@ validator: ## @param validator.splitvalidator.global.auth.port Port to bind auth service to port: 8549 + metrics: + ## @param validator.splitvalidator.global.metrics Enable metrics for the validator statefulset + enabled: false + ## @param validator.splitvalidator.global.metrics.port Port to bind metrics server to + port: 6070 + ## @param validator.splitvalidator.global.extraLabels Extra labels for the validator statefulset extraLabels: {}