From f09cd7192614f454397eb567c601ccbb42f22bed Mon Sep 17 00:00:00 2001 From: bsgrigorov Date: Thu, 5 Oct 2023 17:55:11 -0700 Subject: [PATCH 1/4] Updated charts to use v2 version of autoscaling kube API --- charts/agents/Chart.lock | 8 ++++---- charts/agents/Chart.yaml | 6 +++--- charts/cctp/Chart.yaml | 2 +- charts/cctp/templates/hpa.yaml | 2 +- charts/explorer/Chart.lock | 6 +++--- charts/explorer/Chart.yaml | 4 ++-- charts/explorer/templates/server_hpa.yaml | 2 +- charts/omnirpc/Chart.yaml | 2 +- charts/omnirpc/templates/hpa.yaml | 2 +- charts/scribe/Chart.lock | 6 +++--- charts/scribe/Chart.yaml | 4 ++-- charts/scribe/templates/server_hpa.yaml | 2 +- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/charts/agents/Chart.lock b/charts/agents/Chart.lock index 645559823f..107064604b 100644 --- a/charts/agents/Chart.lock +++ b/charts/agents/Chart.lock @@ -4,12 +4,12 @@ dependencies: version: 9.3.2 - name: omnirpc repository: file://../omnirpc/ - version: 0.2.7 + version: 0.2.8 - name: scribe repository: file://../scribe/ - version: 0.2.12 + version: 0.2.13 - name: jaeger repository: https://jaegertracing.github.io/helm-charts version: 0.69.1 -digest: sha256:a8a1765796d6723e457bda17b02aecf0c5bcaac34cd60d0e851febd186217e77 -generated: "2023-08-02T03:07:07.884124+03:00" +digest: sha256:eef6d5dc7a9673c3b5150ddf49ca4de2be5657811d7f747cc97a340c595f357f +generated: "2023-10-05T17:52:35.850465-07:00" diff --git a/charts/agents/Chart.yaml b/charts/agents/Chart.yaml index 18c6c901fb..70ecee64f3 100644 --- a/charts/agents/Chart.yaml +++ b/charts/agents/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.1.26 +version: 0.1.27 # 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 @@ -29,11 +29,11 @@ dependencies: repository: "https://charts.bitnami.com/bitnami" condition: mysql.enabled - name: omnirpc - version: "0.2.7" + version: "0.2.8" repository: "file://../omnirpc/" condition: omnirpc.enabled - name: scribe - version: "0.2.12" + version: "0.2.13" repository: "file://../scribe/" condition: scribe.enabled - name: jaeger diff --git a/charts/cctp/Chart.yaml b/charts/cctp/Chart.yaml index 4dbee14f30..869d5bfddf 100644 --- a/charts/cctp/Chart.yaml +++ b/charts/cctp/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.2.0 +version: 0.2.1 # 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 diff --git a/charts/cctp/templates/hpa.yaml b/charts/cctp/templates/hpa.yaml index d68f66baac..7379935fb1 100644 --- a/charts/cctp/templates/hpa.yaml +++ b/charts/cctp/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ include "cctp.fullname" . }} diff --git a/charts/explorer/Chart.lock b/charts/explorer/Chart.lock index cf88d9f904..dc34261aa2 100644 --- a/charts/explorer/Chart.lock +++ b/charts/explorer/Chart.lock @@ -1,9 +1,9 @@ dependencies: - name: omnirpc repository: file://../omnirpc/ - version: 0.2.7 + version: 0.2.8 - name: clickhouse repository: https://sentry-kubernetes.github.io/charts version: 3.1.3 -digest: sha256:1dc2ef92672513a91b6a285960084789bf4096b0ccc2e7df45be2c3e972b6e25 -generated: "2023-08-02T02:16:29.734171+03:00" +digest: sha256:eadd49d152a154074db2f1fe8280a468afb499776b613e89f56a1cbc1533b424 +generated: "2023-10-05T17:53:10.926443-07:00" diff --git a/charts/explorer/Chart.yaml b/charts/explorer/Chart.yaml index 8da7b9b537..ca47c33397 100644 --- a/charts/explorer/Chart.yaml +++ b/charts/explorer/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.2.11 +version: 0.2.13 # 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 @@ -25,7 +25,7 @@ appVersion: "1.16.0" dependencies: - name: omnirpc - version: "0.2.7" + version: "0.2.8" repository: "file://../omnirpc/" condition: omnirpc.enabled - name: clickhouse diff --git a/charts/explorer/templates/server_hpa.yaml b/charts/explorer/templates/server_hpa.yaml index a83a86941b..d101e802ed 100644 --- a/charts/explorer/templates/server_hpa.yaml +++ b/charts/explorer/templates/server_hpa.yaml @@ -1,6 +1,6 @@ {{- if .Values.server.enabled }} {{- if .Values.server.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ include "explorer.fullname" . }} diff --git a/charts/omnirpc/Chart.yaml b/charts/omnirpc/Chart.yaml index 0f1c5bfd8d..6d9186af0e 100644 --- a/charts/omnirpc/Chart.yaml +++ b/charts/omnirpc/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.2.7 +version: 0.2.8 # 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 diff --git a/charts/omnirpc/templates/hpa.yaml b/charts/omnirpc/templates/hpa.yaml index aba6043f56..590d7eda2a 100644 --- a/charts/omnirpc/templates/hpa.yaml +++ b/charts/omnirpc/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ include "omnirpc.fullname" . }} diff --git a/charts/scribe/Chart.lock b/charts/scribe/Chart.lock index 91b14f6594..1bde12a4a4 100644 --- a/charts/scribe/Chart.lock +++ b/charts/scribe/Chart.lock @@ -4,6 +4,6 @@ dependencies: version: 9.3.2 - name: omnirpc repository: file://../omnirpc/ - version: 0.2.7 -digest: sha256:e4344cf16c3e5394ff7231fa8852881c0adb57511172865c9679655decb76524 -generated: "2023-08-02T02:16:11.156893+03:00" + version: 0.2.8 +digest: sha256:c774c50f46900f4442e0ec3022689181be431e7018a7cdc25903129c0977fb5a +generated: "2023-10-05T17:53:22.515087-07:00" diff --git a/charts/scribe/Chart.yaml b/charts/scribe/Chart.yaml index 5fc1a26be3..16f30b47d3 100644 --- a/charts/scribe/Chart.yaml +++ b/charts/scribe/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.2.12 +version: 0.2.13 # 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 @@ -29,6 +29,6 @@ dependencies: repository: "https://charts.bitnami.com/bitnami" condition: mysql.enabled - name: omnirpc - version: "0.2.7" + version: "0.2.8" repository: "file://../omnirpc/" condition: omnirpc.enabled diff --git a/charts/scribe/templates/server_hpa.yaml b/charts/scribe/templates/server_hpa.yaml index b6589e13e2..2b27440e22 100644 --- a/charts/scribe/templates/server_hpa.yaml +++ b/charts/scribe/templates/server_hpa.yaml @@ -1,6 +1,6 @@ {{- if .Values.server.enabled }} {{- if .Values.server.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ include "scribe.fullname" . }} From 2fa4e2a94f076da2135daef6518e4e87dd1e82d0 Mon Sep 17 00:00:00 2001 From: bsgrigorov Date: Fri, 6 Oct 2023 14:05:10 -0700 Subject: [PATCH 2/4] Fixed explorer helm chart format --- charts/explorer/templates/configmap.yaml | 2 +- charts/explorer/values.yaml | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/charts/explorer/templates/configmap.yaml b/charts/explorer/templates/configmap.yaml index c7c16dca13..f9b250468d 100644 --- a/charts/explorer/templates/configmap.yaml +++ b/charts/explorer/templates/configmap.yaml @@ -9,5 +9,5 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} data: -{{ toYaml .Values.files | indent 2 }} +{{ tpl (toYaml .Values.files) . | indent 2 }} {{- end }} diff --git a/charts/explorer/values.yaml b/charts/explorer/values.yaml index c06bdd1ff8..433ad46fe0 100644 --- a/charts/explorer/values.yaml +++ b/charts/explorer/values.yaml @@ -176,9 +176,7 @@ server: tolerations: [] args: - server - - '--port=5080' - - '--scribe-url=https://scribe.interoperability.institute/graphql' - - '--address=tcp://default:clickhouse@{{ .Release.Namespace }}-clickhouse:9000' + - --config=/config/config.yaml ports: - name: http containerPort: 5080 @@ -216,13 +214,13 @@ files: refresh_rate: 1 scribe_url: https://scribe.interoperability.institute/graphql rpc_url: https://rpc.interoperability.institute/confirmations/1/rpc/ + db_address: tcp://default:clickhouse@{{ .Release.Namespace }}-clickhouse:9000 bridge_config_address: 0x5217c83ca75559B1f8a8803824E5b7ac233A12a1 bridge_config_chain_id: 1 chains: - - chain_id: 1 - fetch_block_increment: 1000 - max_goroutines: 10 - contracts: - - contract_type: bridge - address: 0x2796317b0fF8538F253012862c06787Adfb8cEb6 - start_block: 15930000 + 1: + chain_id: 1 + fetch_block_increment: 1000 + max_goroutines: 10 + contracts: + bridge: 0x2796317b0fF8538F253012862c06787Adfb8cEb6 From 88764aebf7521bc77d1b6c752777e7f5e7c1b338 Mon Sep 17 00:00:00 2001 From: bsgrigorov Date: Fri, 6 Oct 2023 14:26:24 -0700 Subject: [PATCH 3/4] Updated config --- charts/explorer/values.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/charts/explorer/values.yaml b/charts/explorer/values.yaml index 433ad46fe0..be07fcd573 100644 --- a/charts/explorer/values.yaml +++ b/charts/explorer/values.yaml @@ -109,7 +109,7 @@ clickhouse: storage: "30Gi" indexer: - enabled: true + enabled: false podAnnotations: {} nodeSelector: {} podSecurityContext: {} @@ -220,6 +220,9 @@ files: chains: 1: chain_id: 1 + avg_block_time: 13 + get_logs_range: 256 + get_logs_batch_amount: 1 fetch_block_increment: 1000 max_goroutines: 10 contracts: From 631495e50174bebbe388a3429e36e679b88d6da1 Mon Sep 17 00:00:00 2001 From: bsgrigorov Date: Fri, 6 Oct 2023 14:50:24 -0700 Subject: [PATCH 4/4] Added port to config --- charts/explorer/values.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/explorer/values.yaml b/charts/explorer/values.yaml index be07fcd573..a3507f7826 100644 --- a/charts/explorer/values.yaml +++ b/charts/explorer/values.yaml @@ -214,6 +214,7 @@ files: refresh_rate: 1 scribe_url: https://scribe.interoperability.institute/graphql rpc_url: https://rpc.interoperability.institute/confirmations/1/rpc/ + http_port: 5080 db_address: tcp://default:clickhouse@{{ .Release.Namespace }}-clickhouse:9000 bridge_config_address: 0x5217c83ca75559B1f8a8803824E5b7ac233A12a1 bridge_config_chain_id: 1