From 641a1dc6fd84a640f417af6a36fdae9206ec241f Mon Sep 17 00:00:00 2001 From: sbaizet <74511063+sbaizet-ledger@users.noreply.github.com> Date: Thu, 31 Oct 2024 10:38:32 +0100 Subject: [PATCH] remove l1-explorer from scroll-sdk default value (#217) * remove l1-explorer from scroll-sdk default value * bump version scroll-monitor * update makefile * update makefile --- charts/scroll-monitor/Chart.yaml | 2 +- charts/scroll-monitor/README.md | 4 ++-- charts/scroll-sdk/Chart.yaml | 4 ++-- charts/scroll-sdk/README.md | 8 ++++---- charts/scroll-sdk/values.yaml | 2 +- devnet/Makefile | 2 +- examples/Makefile.example | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/charts/scroll-monitor/Chart.yaml b/charts/scroll-monitor/Chart.yaml index e6112f7c..a755ddbe 100644 --- a/charts/scroll-monitor/Chart.yaml +++ b/charts/scroll-monitor/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: helm chart to deploy grafana, prometheus and loki to monitor scroll-sdk name: scroll-monitor -version: 0.0.7 +version: 0.0.8 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: diff --git a/charts/scroll-monitor/README.md b/charts/scroll-monitor/README.md index 244606b6..66b99d06 100644 --- a/charts/scroll-monitor/README.md +++ b/charts/scroll-monitor/README.md @@ -1,6 +1,6 @@ # scroll-monitor -![Version: 0.0.6](https://img.shields.io/badge/Version-0.0.6-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) +![Version: 0.0.8](https://img.shields.io/badge/Version-0.0.8-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) helm chart to deploy grafana, prometheus and loki to monitor scroll-sdk @@ -80,7 +80,7 @@ Kubernetes: `>=1.22.0-0` | kube-prometheus-stack.prometheus.prometheusSpec.serviceMonitorSelector.matchExpressions[0].operator | string | `"Exists"` | | | loki.backend.replicas | int | `0` | | | loki.deploymentMode | string | `"SingleBinary"` | | -| loki.enabled | bool | `true` | | +| loki.enabled | bool | `false` | | | loki.fullnameOverride | string | `"loki"` | | | loki.loki.commonConfig.replication_factor | int | `1` | | | loki.loki.schemaConfig.configs[0].from | string | `"2024-01-01"` | | diff --git a/charts/scroll-sdk/Chart.yaml b/charts/scroll-sdk/Chart.yaml index dd668834..cd104055 100644 --- a/charts/scroll-sdk/Chart.yaml +++ b/charts/scroll-sdk/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: scroll helm charts to deploy scroll sdk name: scroll-sdk -version: 0.0.60 +version: 0.0.61 appVersion: v0.1.0 kubeVersion: ">=1.22.0-0" maintainers: @@ -98,7 +98,7 @@ dependencies: repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: scroll-common.enabled - name: scroll-monitor - version: 0.0.7 + version: 0.0.8 repository: "oci://ghcr.io/scroll-tech/scroll-sdk/helm" condition: scroll-monitor.enabled - name: admin-system-backend diff --git a/charts/scroll-sdk/README.md b/charts/scroll-sdk/README.md index 3d627915..b2ded628 100644 --- a/charts/scroll-sdk/README.md +++ b/charts/scroll-sdk/README.md @@ -1,6 +1,6 @@ # scroll-sdk -![Version: 0.0.59](https://img.shields.io/badge/Version-0.0.59-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) +![Version: 0.0.61](https://img.shields.io/badge/Version-0.0.61-informational?style=flat-square) ![AppVersion: v0.1.0](https://img.shields.io/badge/AppVersion-v0.1.0-informational?style=flat-square) scroll helm charts to deploy scroll sdk @@ -41,7 +41,7 @@ Kubernetes: `>=1.22.0-0` | oci://ghcr.io/scroll-tech/scroll-sdk/helm | rollup-node | 0.0.15 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | rpc-gateway | 0.0.2 | | oci://ghcr.io/scroll-tech/scroll-sdk/helm | scroll-common | 0.0.5 | -| oci://ghcr.io/scroll-tech/scroll-sdk/helm | scroll-monitor | 0.0.6 | +| oci://ghcr.io/scroll-tech/scroll-sdk/helm | scroll-monitor | 0.0.8 | | oci://registry-1.docker.io/bitnamicharts | postgresql | 15.5.0 | ## Values @@ -84,7 +84,7 @@ Kubernetes: `>=1.22.0-0` | l1-devnet.ingress.main.hosts[0].host | string | `"l1-devnet.scrollsdk"` | | | l1-devnet.ingress.main.hosts[0].paths[0].path | string | `"/"` | | | l1-devnet.ingress.main.hosts[0].paths[0].pathType | string | `"Prefix"` | | -| l1-explorer.enabled | bool | `true` | | +| l1-explorer.enabled | bool | `false` | | | l1-explorer.ingress.main.enabled | bool | `true` | | | l1-explorer.ingress.main.hosts[0].host | string | `"l1-explorer.scrollsdk"` | | | l1-explorer.ingress.main.hosts[0].paths[0].path | string | `"/"` | | @@ -140,7 +140,7 @@ Kubernetes: `>=1.22.0-0` | scroll-monitor.grafana.ingress.hosts[0] | string | `"grafana.scrollsdk"` | | | scroll-monitor.grafana.ingress.ingressClassName | string | `"nginx"` | | | scroll-monitor.kube-prometheus-stack.enabled | bool | `true` | | -| scroll-monitor.loki.enabled | bool | `true` | | +| scroll-monitor.loki.enabled | bool | `false` | | | scroll-monitor.promtail.enabled | bool | `true` | | ---------------------------------------------- diff --git a/charts/scroll-sdk/values.yaml b/charts/scroll-sdk/values.yaml index 68b1cbbd..3683df80 100644 --- a/charts/scroll-sdk/values.yaml +++ b/charts/scroll-sdk/values.yaml @@ -79,7 +79,7 @@ rollup-node: enabled: true l1-explorer: - enabled: true + enabled: false ingress: main: enabled: true diff --git a/devnet/Makefile b/devnet/Makefile index 398dfc2d..02bfbf43 100644 --- a/devnet/Makefile +++ b/devnet/Makefile @@ -7,7 +7,7 @@ L1_RPC_HOST := l1-devnet.scrollsdk bootstrap: echo "Pulling helm chart..." - helm pull oci://ghcr.io/scroll-tech/scroll-sdk/helm/scroll-sdk --version 0.0.60 + helm pull oci://ghcr.io/scroll-tech/scroll-sdk/helm/scroll-sdk --version 0.0.61 echo "Extracting helm chart..." tar -xvf *.tgz $(MAKE) config diff --git a/examples/Makefile.example b/examples/Makefile.example index 9c303705..a883d80e 100644 --- a/examples/Makefile.example +++ b/examples/Makefile.example @@ -2,7 +2,7 @@ NAMESPACE ?= default install: helm upgrade -i scroll-monitor oci://ghcr.io/scroll-tech/scroll-sdk/helm/scroll-monitor -n $(NAMESPACE) \ - --version=0.0.7 \ + --version=0.0.8 \ --values values/scroll-monitor-production.yaml \ --values values/alert-manager.yaml @@ -129,4 +129,4 @@ delete: helm delete -n $(NAMESPACE) balance-checker delete-l1-devnet: - helm delete -n $(NAMESPACE) l1-devnet \ No newline at end of file + helm delete -n $(NAMESPACE) l1-devnet