From 425db71bd4312e866b174565d7c1e7975691e4fe Mon Sep 17 00:00:00 2001 From: Deepthi S Kumar Date: Thu, 8 Apr 2021 19:16:24 -0700 Subject: [PATCH 1/7] test-labels --- .../community_fast_unlock.accounts.json | 13 ++ .../testnets/test-labels/fish.accounts.json | 60 +++++++ .../testnets/test-labels/genesis_ledger.json | 114 +++++++++++++ .../terraform/testnets/test-labels/main.tf | 151 ++++++++++++++++++ .../testnets/test-labels/whales.accounts.json | 30 ++++ 5 files changed, 368 insertions(+) create mode 100644 automation/terraform/testnets/test-labels/community_fast_unlock.accounts.json create mode 100644 automation/terraform/testnets/test-labels/fish.accounts.json create mode 100644 automation/terraform/testnets/test-labels/genesis_ledger.json create mode 100755 automation/terraform/testnets/test-labels/main.tf create mode 100644 automation/terraform/testnets/test-labels/whales.accounts.json diff --git a/automation/terraform/testnets/test-labels/community_fast_unlock.accounts.json b/automation/terraform/testnets/test-labels/community_fast_unlock.accounts.json new file mode 100644 index 00000000000..c5acfa4cde2 --- /dev/null +++ b/automation/terraform/testnets/test-labels/community_fast_unlock.accounts.json @@ -0,0 +1,13 @@ +{ + "pk": "B62qrMm1fSizfgGuFK7KsZZdxEvFK7etUt272wX5cQfWixZkoEy5Sgq", + "balance": "66000.000000000", + "delegate": "B62qrMm1fSizfgGuFK7KsZZdxEvFK7etUt272wX5cQfWixZkoEy5Sgq", + "sk": null, + "timing": { + "initial_minimum_balance": "60000", + "cliff_time": "150", + "cliff_amount": "12000", + "vesting_period": "6", + "vesting_increment": "150" + } +} diff --git a/automation/terraform/testnets/test-labels/fish.accounts.json b/automation/terraform/testnets/test-labels/fish.accounts.json new file mode 100644 index 00000000000..2de8a95b685 --- /dev/null +++ b/automation/terraform/testnets/test-labels/fish.accounts.json @@ -0,0 +1,60 @@ +{ + "pk": "B62qmmyFhM51jEuSKsBp1VdPxxpuf1jvKvVQdzfqDqGofRwaB37tdgB", + "balance": "20000.000000000", + "delegate": "B62qmmyFhM51jEuSKsBp1VdPxxpuf1jvKvVQdzfqDqGofRwaB37tdgB", + "sk": null +} +{ + "pk": "B62qrY36cZbJDLmxXS6Gf3keryLLUEwRJJH1DJFU2Q4vhyoc1Adrw11", + "balance": "20000.000000000", + "delegate": "B62qrY36cZbJDLmxXS6Gf3keryLLUEwRJJH1DJFU2Q4vhyoc1Adrw11", + "sk": null +} +{ + "pk": "B62qoSVGbUvuaezbuUnqqai4mkMsgDckY367koR76Wysx6QVS5pQZhL", + "balance": "20000.000000000", + "delegate": "B62qoSVGbUvuaezbuUnqqai4mkMsgDckY367koR76Wysx6QVS5pQZhL", + "sk": null +} +{ + "pk": "B62qkhVC4jdRHWAJGaZuvvB555qXA8Ys2vVWTewMdNpg2jmT8ZqDJh3", + "balance": "20000.000000000", + "delegate": "B62qkhVC4jdRHWAJGaZuvvB555qXA8Ys2vVWTewMdNpg2jmT8ZqDJh3", + "sk": null +} +{ + "pk": "B62qpgAtQHb3JhzeBSYmNQUXWkrnZ6KVxDdDBFY6yKVVX6RjCWsB9Wj", + "balance": "20000.000000000", + "delegate": "B62qpgAtQHb3JhzeBSYmNQUXWkrnZ6KVxDdDBFY6yKVVX6RjCWsB9Wj", + "sk": null +} +{ + "pk": "B62qrTLLzysdpmKwDffpS4BTRoSE4yC3pot5F4D4ZwAn5oxNb9yCxhz", + "balance": "20000.000000000", + "delegate": "B62qmmyFhM51jEuSKsBp1VdPxxpuf1jvKvVQdzfqDqGofRwaB37tdgB", + "sk": null +} +{ + "pk": "B62qp1jrz9S5pU8MT6j5xMQawxFbNxHzkT1YnQspyDXxESb4Au8aeWL", + "balance": "20000.000000000", + "delegate": "B62qrY36cZbJDLmxXS6Gf3keryLLUEwRJJH1DJFU2Q4vhyoc1Adrw11", + "sk": null +} +{ + "pk": "B62qpBLWeBjAnnQGehYrHZ9vrh1HXwpm9Pp7qksT6AkMumswyJpGF4X", + "balance": "20000.000000000", + "delegate": "B62qoSVGbUvuaezbuUnqqai4mkMsgDckY367koR76Wysx6QVS5pQZhL", + "sk": null +} +{ + "pk": "B62qj2jSJhbUwLYXeoLndzw5cwmWGFeeSRSDxEwYQUmpdBeiMPFQ5jq", + "balance": "20000.000000000", + "delegate": "B62qkhVC4jdRHWAJGaZuvvB555qXA8Ys2vVWTewMdNpg2jmT8ZqDJh3", + "sk": null +} +{ + "pk": "B62qp7toDo2vTrNSVjsRSXkKBQCjvByLdwFcoGTqay6kuDSiU3pubeS", + "balance": "20000.000000000", + "delegate": "B62qpgAtQHb3JhzeBSYmNQUXWkrnZ6KVxDdDBFY6yKVVX6RjCWsB9Wj", + "sk": null +} diff --git a/automation/terraform/testnets/test-labels/genesis_ledger.json b/automation/terraform/testnets/test-labels/genesis_ledger.json new file mode 100644 index 00000000000..963530328ce --- /dev/null +++ b/automation/terraform/testnets/test-labels/genesis_ledger.json @@ -0,0 +1,114 @@ +{ + "genesis": { + "genesis_state_timestamp": "2021-04-08 19:42:22-7:00" + }, + "ledger": { + "name": "test-labels", + "num_accounts": 16, + "accounts": [ + { + "pk": "B62qrMm1fSizfgGuFK7KsZZdxEvFK7etUt272wX5cQfWixZkoEy5Sgq", + "balance": "66000.000000000", + "delegate": "B62qrMm1fSizfgGuFK7KsZZdxEvFK7etUt272wX5cQfWixZkoEy5Sgq", + "sk": null, + "timing": { + "initial_minimum_balance": "60000", + "cliff_time": "150", + "cliff_amount": "12000", + "vesting_period": "6", + "vesting_increment": "150" + } + }, + { + "pk": "B62qmmyFhM51jEuSKsBp1VdPxxpuf1jvKvVQdzfqDqGofRwaB37tdgB", + "balance": "20000.000000000", + "delegate": "B62qmmyFhM51jEuSKsBp1VdPxxpuf1jvKvVQdzfqDqGofRwaB37tdgB", + "sk": null + }, + { + "pk": "B62qrY36cZbJDLmxXS6Gf3keryLLUEwRJJH1DJFU2Q4vhyoc1Adrw11", + "balance": "20000.000000000", + "delegate": "B62qrY36cZbJDLmxXS6Gf3keryLLUEwRJJH1DJFU2Q4vhyoc1Adrw11", + "sk": null + }, + { + "pk": "B62qoSVGbUvuaezbuUnqqai4mkMsgDckY367koR76Wysx6QVS5pQZhL", + "balance": "20000.000000000", + "delegate": "B62qoSVGbUvuaezbuUnqqai4mkMsgDckY367koR76Wysx6QVS5pQZhL", + "sk": null + }, + { + "pk": "B62qkhVC4jdRHWAJGaZuvvB555qXA8Ys2vVWTewMdNpg2jmT8ZqDJh3", + "balance": "20000.000000000", + "delegate": "B62qkhVC4jdRHWAJGaZuvvB555qXA8Ys2vVWTewMdNpg2jmT8ZqDJh3", + "sk": null + }, + { + "pk": "B62qpgAtQHb3JhzeBSYmNQUXWkrnZ6KVxDdDBFY6yKVVX6RjCWsB9Wj", + "balance": "20000.000000000", + "delegate": "B62qpgAtQHb3JhzeBSYmNQUXWkrnZ6KVxDdDBFY6yKVVX6RjCWsB9Wj", + "sk": null + }, + { + "pk": "B62qrTLLzysdpmKwDffpS4BTRoSE4yC3pot5F4D4ZwAn5oxNb9yCxhz", + "balance": "20000.000000000", + "delegate": "B62qmmyFhM51jEuSKsBp1VdPxxpuf1jvKvVQdzfqDqGofRwaB37tdgB", + "sk": null + }, + { + "pk": "B62qp1jrz9S5pU8MT6j5xMQawxFbNxHzkT1YnQspyDXxESb4Au8aeWL", + "balance": "20000.000000000", + "delegate": "B62qrY36cZbJDLmxXS6Gf3keryLLUEwRJJH1DJFU2Q4vhyoc1Adrw11", + "sk": null + }, + { + "pk": "B62qpBLWeBjAnnQGehYrHZ9vrh1HXwpm9Pp7qksT6AkMumswyJpGF4X", + "balance": "20000.000000000", + "delegate": "B62qoSVGbUvuaezbuUnqqai4mkMsgDckY367koR76Wysx6QVS5pQZhL", + "sk": null + }, + { + "pk": "B62qj2jSJhbUwLYXeoLndzw5cwmWGFeeSRSDxEwYQUmpdBeiMPFQ5jq", + "balance": "20000.000000000", + "delegate": "B62qkhVC4jdRHWAJGaZuvvB555qXA8Ys2vVWTewMdNpg2jmT8ZqDJh3", + "sk": null + }, + { + "pk": "B62qp7toDo2vTrNSVjsRSXkKBQCjvByLdwFcoGTqay6kuDSiU3pubeS", + "balance": "20000.000000000", + "delegate": "B62qpgAtQHb3JhzeBSYmNQUXWkrnZ6KVxDdDBFY6yKVVX6RjCWsB9Wj", + "sk": null + }, + { + "pk": "B62qrSYyANC6tD145U2rD6j2Pk22obbXridrLS4k2ATvAhJDhfDjD5N", + "balance": "2250000.000000000", + "delegate": "B62qjRyvPXehwFqoA2fgAKfK38edF8HYRhGMjjX76m6oPPKob9Tchzs", + "sk": null + }, + { + "pk": "B62qjEy1BAqGPJYw3B24uhPnhMJc19LgsmHCVvH5GFzB5SJzBy7hJ8y", + "balance": "2250000.000000000", + "delegate": "B62qnPzdCBJKCVgkoGQPXa7dMpxny8zGr76E8YMMdQo6e3CK1Zpwo9Y", + "sk": null + }, + { + "pk": "B62qqsQPNrNLGBTpsKyvtW6NKZERRPHaACMpkKGxmusV8MwaGjAtwRv", + "balance": "2250000.000000000", + "delegate": "B62qmEKWAURBnMHLojq9eW2wRKyvRtJQUG2tzGRJzTUVef3PyCFQ8th", + "sk": null + }, + { + "pk": "B62qr7ed4upRdRaNmvxVKgxmbutxsGWeQeXBMEZjJN83CUrXnD1sDgz", + "balance": "2250000.000000000", + "delegate": "B62qqQPw875obJSweVGPpj2hu455ncZZTeMz8rvgiNZM5bErspo4sPM", + "sk": null + }, + { + "pk": "B62qmf7k5jdBKRhnTo8tyfr978d7GvzgECUNGETdjWvjEi5VdsfNady", + "balance": "2250000.000000000", + "delegate": "B62qrMJjvLTz6XsE1Cge4yPAA9Y44SWeDtonH5LYN6ZYkwfsqukAf5D", + "sk": null + } + ] + } +} diff --git a/automation/terraform/testnets/test-labels/main.tf b/automation/terraform/testnets/test-labels/main.tf new file mode 100755 index 00000000000..33d56b40d24 --- /dev/null +++ b/automation/terraform/testnets/test-labels/main.tf @@ -0,0 +1,151 @@ +terraform { + required_version = ">= 0.14.0" + backend "s3" { + key = "terraform-test-labels.tfstate" + encrypt = true + region = "us-west-2" + bucket = "o1labs-terraform-state" + acl = "bucket-owner-full-control" + } +} + +provider "aws" { + region = "us-west-2" +} + +provider "google" { + alias = "google-us-east4" + project = "o1labs-192920" + region = "us-east4" + zone = "us-east4-b" +} + +provider "google" { + alias = "google-us-east1" + project = "o1labs-192920" + region = "us-east1" + zone = "us-east1-b" +} + +provider "google" { + alias = "google-us-central1" + project = "o1labs-192920" + region = "us-central1" + zone = "us-central1-c" +} + + +variable "whale_count" { + type = number + + description = "Number of online whales for the network to run" + default = 2 +} + +variable "fish_count" { + type = number + + description = "Number of online fish for the network to run" + default = 2 +} + +variable "seed_count" { + default = 3 +} + +locals { + testnet_name = "test-labels" + coda_image = "gcr.io/o1labs-192920/coda-daemon-baked:1.1.2-devnet-master-qa-devnet-0f2032c" + coda_archive_image = "gcr.io/o1labs-192920/coda-archive:1.0.4-8202b60" + seed_region = "us-central1" + seed_zone = "us-central1-b" + + # replace with `make_report_discord_webhook_url = ""` if not in use (will fail if file not present) + make_report_discord_webhook_url = "" + + # replace with `make_report_accounts = ""` if not in use (will fail if file not present) + # make_report_accounts = < Date: Mon, 12 Apr 2021 10:28:38 -0700 Subject: [PATCH 2/7] syncStatus label --- automation/bake/Dockerfile | 2 ++ automation/services/prometheus/prometheus.j2 | 8 ++++++++ dockerfiles/scripts/healthcheck-utilities.sh | 11 ++++++++++- helm/archive-node/Chart.yaml | 2 +- helm/archive-node/templates/archive.yaml | 6 +++++- helm/block-producer/Chart.yaml | 2 +- helm/block-producer/templates/_healthchecks.tpl | 2 +- helm/block-producer/templates/block-producer.yaml | 4 +++- helm/common/templates/_healthchecks.tpl | 2 +- helm/seed-node/Chart.yaml | 2 +- helm/seed-node/templates/_healthchecks.tpl | 2 +- helm/seed-node/templates/seed-node.yaml | 4 +++- helm/snark-worker/Chart.yaml | 2 +- helm/snark-worker/templates/_healthchecks.tpl | 2 +- helm/snark-worker/templates/snark-coordinator.yaml | 4 +++- 15 files changed, 42 insertions(+), 13 deletions(-) diff --git a/automation/bake/Dockerfile b/automation/bake/Dockerfile index 396571e3581..dde2c4cd9c1 100644 --- a/automation/bake/Dockerfile +++ b/automation/bake/Dockerfile @@ -10,6 +10,8 @@ RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyri RUN apt-get update && apt-get install -y google-cloud-sdk +RUN apt-get update && apt-get install -y kubectl + ARG COMMIT_HASH=master ARG TESTNET_NAME=testworld ARG CONFIG_FILE="/root/daemon.json" diff --git a/automation/services/prometheus/prometheus.j2 b/automation/services/prometheus/prometheus.j2 index 6aa0aa488db..e253ad45259 100644 --- a/automation/services/prometheus/prometheus.j2 +++ b/automation/services/prometheus/prometheus.j2 @@ -49,6 +49,8 @@ scrape_configs: target_label: testnet - source_labels: [__meta_ec2_tag_role] target_label: role + - source_labels: [__meta_ec2_tag_status] + target_label: status - job_name: 'coda-us-west-1' scrape_interval: "5s" @@ -70,6 +72,8 @@ scrape_configs: target_label: testnet - source_labels: [__meta_ec2_tag_role] target_label: role + - source_labels: [__meta_ec2_tag_status] + target_label: status - job_name: 'coda-us-east-1' scrape_interval: "5s" @@ -91,6 +95,8 @@ scrape_configs: target_label: testnet - source_labels: [__meta_ec2_tag_role] target_label: role + - source_labels: [__meta_ec2_tag_status] + target_label: status - job_name: 'coda-us-east-2' scrape_interval: "5s" @@ -112,6 +118,8 @@ scrape_configs: target_label: testnet - source_labels: [__meta_ec2_tag_role] target_label: role + - source_labels: [__meta_ec2_tag_status] + target_label: status {% if CODA_METRICS_URI is defined %} - job_name: "coda" diff --git a/dockerfiles/scripts/healthcheck-utilities.sh b/dockerfiles/scripts/healthcheck-utilities.sh index 0283860fb6f..335a5a48095 100644 --- a/dockerfiles/scripts/healthcheck-utilities.sh +++ b/dockerfiles/scripts/healthcheck-utilities.sh @@ -1,12 +1,21 @@ # # Determine whether a local daemon is SYNCed with its network # -function isDaemonSynced() { + +function updateSyncStatusLabel() { status=$( curl --silent --show-error --header "Content-Type:application/json" -d'{ "query": "query { syncStatus } " }' localhost:3085/graphql | \ jq '.data.syncStatus' ) + str=$(echo ${status} | sed 's/"//g' ) + kubectl label --overwrite=true pod -l app=$1 syncStatus=${str} +} +function isDaemonSynced() { + status=$( + curl --silent --show-error --header "Content-Type:application/json" -d'{ "query": "query { syncStatus } " }' localhost:3085/graphql | \ + jq '.data.syncStatus' + ) case ${status} in \"BOOTSTRAP\") ;& diff --git a/helm/archive-node/Chart.yaml b/helm/archive-node/Chart.yaml index 7b8f06b70de..b664b799866 100644 --- a/helm/archive-node/Chart.yaml +++ b/helm/archive-node/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: archive-node description: A Helm chart for Mina Protocol's archive node type: application -version: 1.0.2 +version: 1.0.3 appVersion: 1.16.0 annotations: artifacthub.io/changes: | diff --git a/helm/archive-node/templates/archive.yaml b/helm/archive-node/templates/archive.yaml index e8ec3868fed..b4f5314893d 100644 --- a/helm/archive-node/templates/archive.yaml +++ b/helm/archive-node/templates/archive.yaml @@ -16,6 +16,9 @@ spec: testnet: {{ .Values.testnetName }} role: archive-node version: {{ trunc 6 (split ":" .Values.coda.image)._1 | trimSuffix "-" }} + {{- if .Values.archive.enableLocalDaemon }} + syncStatus: init + {{- end }} annotations: prometheus.io/scrape: 'true' prometheus.io/port: {{ .Values.archive.ports.metrics | quote }} @@ -92,7 +95,8 @@ spec: protocol: TCP containerPort: {{ .Values.coda.ports.p2p }} hostPort: {{ .Values.coda.ports.p2p }} -{{- include "healthcheck.daemon.allChecks" .Values | indent 8 }} +{{$data := dict "config" $config "healthcheck" $.Values.healthcheck }} +{{- include "healthcheck.daemon.allChecks" $data | indent 8 }} imagePullPolicy: Always volumeMounts: - name: config-dir diff --git a/helm/block-producer/Chart.yaml b/helm/block-producer/Chart.yaml index 74195b88d3c..e045fb07407 100644 --- a/helm/block-producer/Chart.yaml +++ b/helm/block-producer/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: block-producer description: A Helm chart for Mina Protocol's block producing network nodes type: application -version: 1.0.2 +version: 1.0.3 appVersion: 1.16.0 annotations: artifacthub.io/changes: | diff --git a/helm/block-producer/templates/_healthchecks.tpl b/helm/block-producer/templates/_healthchecks.tpl index 532625ffaf9..9603ad2838e 100644 --- a/helm/block-producer/templates/_healthchecks.tpl +++ b/helm/block-producer/templates/_healthchecks.tpl @@ -23,7 +23,7 @@ readinessProbe: command: [ "/bin/bash", "-c", - "source /healthcheck/utilities.sh && isDaemonSynced && peerCountGreaterThan 0 && ownsFunds" + "source /healthcheck/utilities.sh && isDaemonSynced && peerCountGreaterThan 0 && ownsFunds && updateSyncStatusLabel {{ .config.name }}" ] {{- end }} diff --git a/helm/block-producer/templates/block-producer.yaml b/helm/block-producer/templates/block-producer.yaml index 2a0bfaff3c7..2abb0139c75 100644 --- a/helm/block-producer/templates/block-producer.yaml +++ b/helm/block-producer/templates/block-producer.yaml @@ -18,6 +18,7 @@ spec: role: block-producer class: {{ default "undefined" $config.class }} version: {{ trunc 6 (split ":" $.Values.coda.image)._1 | trimSuffix "-" }} + syncStatus: init annotations: prometheus.io/scrape: 'true' prometheus.io/port: {{ $.Values.coda.ports.metrics | quote }} @@ -257,7 +258,8 @@ spec: protocol: TCP containerPort: {{ default $.Values.coda.ports.p2p $config.externalPort }} hostPort: {{ default $.Values.coda.ports.external $config.externalPort }} -{{- include "healthcheck.daemon.allChecks" $.Values | indent 8 }} +{{$data := dict "config" $config "healthcheck" $.Values.healthcheck }} +{{- include "healthcheck.daemon.allChecks" $data | indent 8 }} imagePullPolicy: Always volumeMounts: - name: wallet-keys diff --git a/helm/common/templates/_healthchecks.tpl b/helm/common/templates/_healthchecks.tpl index e3057cb3449..ff36094e81f 100644 --- a/helm/common/templates/_healthchecks.tpl +++ b/helm/common/templates/_healthchecks.tpl @@ -39,7 +39,7 @@ readinessProbe: command: [ "/bin/bash", "-c", - "source /healthcheck/utilities.sh && isDaemonSynced" + "source /healthcheck/utilities.sh && isDaemonSynced && updateSyncStatusLabel {{ .config.name }}" ] {{- include "healthcheck.common.settings" . | indent 2 }} {{- end }} diff --git a/helm/seed-node/Chart.yaml b/helm/seed-node/Chart.yaml index d1cae3ce157..cba4b4b2b6a 100644 --- a/helm/seed-node/Chart.yaml +++ b/helm/seed-node/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: seed-node description: A Helm chart for Mina Protocol's seed nodes type: application -version: 1.0.3 +version: 1.0.4 appVersion: 1.16.0 annotations: artifacthub.io/changes: | diff --git a/helm/seed-node/templates/_healthchecks.tpl b/helm/seed-node/templates/_healthchecks.tpl index e6a80bbb277..8dfcb7b5c18 100644 --- a/helm/seed-node/templates/_healthchecks.tpl +++ b/helm/seed-node/templates/_healthchecks.tpl @@ -23,7 +23,7 @@ readinessProbe: command: [ "/bin/bash", "-c", - "source /healthcheck/utilities.sh && isDaemonSynced && peerCountGreaterThan 0" + "source /healthcheck/utilities.sh && isDaemonSynced && peerCountGreaterThan 0 && updateSyncStatusLabel {{ .config.name }}" ] {{- end }} diff --git a/helm/seed-node/templates/seed-node.yaml b/helm/seed-node/templates/seed-node.yaml index b1a04d56ada..fd89db81778 100644 --- a/helm/seed-node/templates/seed-node.yaml +++ b/helm/seed-node/templates/seed-node.yaml @@ -18,6 +18,7 @@ spec: role: seed class: {{ default "undefined" $config.class }} version: {{ trunc 6 (split ":" $.Values.coda.image)._1 | trimSuffix "-" }} + syncStatus: init annotations: prometheus.io/scrape: 'true' prometheus.io/port: {{ $.Values.coda.ports.metrics | quote }} @@ -121,7 +122,8 @@ spec: protocol: TCP containerPort: {{ default $.Values.coda.ports.p2p $config.externalPort }} hostPort: {{ default $.Values.coda.ports.external $config.externalPort }} -{{- include "healthcheck.seed.allChecks" $.Values | indent 8 }} +{{$data := dict "config" $config "healthcheck" $.Values.healthcheck }} +{{- include "healthcheck.seed.allChecks" $data | indent 8 }} imagePullPolicy: Always volumeMounts: {{- if $config.libp2pSecret }} diff --git a/helm/snark-worker/Chart.yaml b/helm/snark-worker/Chart.yaml index 14e894843ae..9d8758f8725 100644 --- a/helm/snark-worker/Chart.yaml +++ b/helm/snark-worker/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: snark-worker description: A Helm chart for Mina Protocol's SNARK worker nodes type: application -version: 1.0.1 +version: 1.0.2 appVersion: 1.16.0 annotations: artifacthub.io/changes: | diff --git a/helm/snark-worker/templates/_healthchecks.tpl b/helm/snark-worker/templates/_healthchecks.tpl index 7f67659cc94..a02e9e3e213 100644 --- a/helm/snark-worker/templates/_healthchecks.tpl +++ b/helm/snark-worker/templates/_healthchecks.tpl @@ -23,7 +23,7 @@ readinessProbe: command: [ "/bin/bash", "-c", - "source /healthcheck/utilities.sh && isDaemonSynced && hasSnarkWorker" + "source /healthcheck/utilities.sh && isDaemonSynced && hasSnarkWorker && updateSyncStatusLabel {{ .config.name }}" ] {{- end }} diff --git a/helm/snark-worker/templates/snark-coordinator.yaml b/helm/snark-worker/templates/snark-coordinator.yaml index ca859310302..4bf032d7564 100644 --- a/helm/snark-worker/templates/snark-coordinator.yaml +++ b/helm/snark-worker/templates/snark-coordinator.yaml @@ -17,6 +17,7 @@ spec: testnet: {{ .Values.testnetName }} role: snark-coordinator version: {{ trunc 6 (split ":" .Values.coda.image)._1 | trimSuffix "-" }} + syncStatus: init annotations: prometheus.io/scrape: 'true' prometheus.io/port: {{ .Values.coda.ports.metrics | quote }} @@ -92,7 +93,8 @@ spec: protocol: TCP containerPort: {{ .Values.coda.ports.p2p }} hostPort: {{ .Values.coda.ports.p2p }} -{{- include "healthcheck.snarkCoordinator.allChecks" .Values | indent 8 }} +{{$data := dict "config" $config "healthcheck" $.Values.healthcheck }} +{{- include "healthcheck.snarkCoordinator.allChecks" $data | indent 8 }} imagePullPolicy: Always {{- if .Values.coda.runtimeConfig }} volumeMounts: From f057e9e9128b00126a5f1433e31fd59cef025f5c Mon Sep 17 00:00:00 2001 From: Deepthi S Kumar Date: Mon, 12 Apr 2021 15:14:38 -0700 Subject: [PATCH 3/7] refactor, update common-utilities --- .../terraform/testnets/test-labels/main.tf | 8 ++++---- helm/archive-node/Chart.lock | 2 +- helm/archive-node/Chart.yaml | 2 +- .../charts/common-utilities-0.0.8.tgz | Bin 1951 -> 0 bytes .../charts/common-utilities-0.0.9.tgz | Bin 0 -> 1977 bytes helm/archive-node/templates/archive.yaml | 3 ++- helm/block-producer/Chart.yaml | 2 +- .../charts/common-utilities-0.0.8.tgz | Bin 1951 -> 0 bytes .../charts/common-utilities-0.0.9.tgz | Bin 0 -> 1977 bytes helm/block-producer/templates/_healthchecks.tpl | 2 +- .../block-producer/templates/block-producer.yaml | 2 +- helm/common/Chart.yaml | 2 +- helm/common/templates/_healthchecks.tpl | 2 +- helm/seed-node/Chart.yaml | 5 +++-- helm/seed-node/charts/common-utilities-0.0.8.tgz | Bin 1951 -> 0 bytes helm/seed-node/charts/common-utilities-0.0.9.tgz | Bin 0 -> 1977 bytes helm/seed-node/templates/_healthchecks.tpl | 2 +- helm/seed-node/templates/seed-node.yaml | 2 +- helm/snark-worker/Chart.yaml | 5 +++-- .../charts/common-utilities-0.0.8.tgz | Bin 1951 -> 0 bytes .../charts/common-utilities-0.0.9.tgz | Bin 0 -> 1977 bytes helm/snark-worker/templates/_healthchecks.tpl | 2 +- .../templates/snark-coordinator.yaml | 3 ++- helm/watchdog/Chart.yaml | 5 +++-- helm/watchdog/charts/common-utilities-0.0.7.tgz | Bin 1079 -> 0 bytes helm/watchdog/charts/common-utilities-0.0.9.tgz | Bin 0 -> 1977 bytes 26 files changed, 27 insertions(+), 22 deletions(-) delete mode 100644 helm/archive-node/charts/common-utilities-0.0.8.tgz create mode 100644 helm/archive-node/charts/common-utilities-0.0.9.tgz delete mode 100644 helm/block-producer/charts/common-utilities-0.0.8.tgz create mode 100644 helm/block-producer/charts/common-utilities-0.0.9.tgz delete mode 100644 helm/seed-node/charts/common-utilities-0.0.8.tgz create mode 100644 helm/seed-node/charts/common-utilities-0.0.9.tgz delete mode 100644 helm/snark-worker/charts/common-utilities-0.0.8.tgz create mode 100644 helm/snark-worker/charts/common-utilities-0.0.9.tgz delete mode 100644 helm/watchdog/charts/common-utilities-0.0.7.tgz create mode 100644 helm/watchdog/charts/common-utilities-0.0.9.tgz diff --git a/automation/terraform/testnets/test-labels/main.tf b/automation/terraform/testnets/test-labels/main.tf index 33d56b40d24..893a7ba5185 100755 --- a/automation/terraform/testnets/test-labels/main.tf +++ b/automation/terraform/testnets/test-labels/main.tf @@ -50,12 +50,12 @@ variable "fish_count" { } variable "seed_count" { - default = 3 + default = 1 } locals { testnet_name = "test-labels" - coda_image = "gcr.io/o1labs-192920/coda-daemon-baked:1.1.2-devnet-master-qa-devnet-0f2032c" + coda_image = "gcr.io/o1labs-192920/coda-daemon-baked:1.1.5-compatible-be67bed-test-labels-425db71" coda_archive_image = "gcr.io/o1labs-192920/coda-archive:1.0.4-8202b60" seed_region = "us-central1" seed_zone = "us-central1-b" @@ -70,7 +70,7 @@ locals { make_report_accounts = "" } -module "testnet_east" { +module "testlabels" { providers = { google.gke = google.google-us-central1 } source = "../../modules/o1-testnet" @@ -94,7 +94,7 @@ module "testnet_east" { archive_configs = [ { name = "archive-1" - enableLocalDaemon = false + enableLocalDaemon = true enablePostgresDB = true postgresHost = "archive-1-postgresql" }, diff --git a/helm/archive-node/Chart.lock b/helm/archive-node/Chart.lock index 84bf01d31df..a02fabfbdf3 100644 --- a/helm/archive-node/Chart.lock +++ b/helm/archive-node/Chart.lock @@ -4,6 +4,6 @@ dependencies: version: 10.2.5 - name: common-utilities repository: https://coda-charts.storage.googleapis.com - version: 0.0.8 + version: 0.0.9 digest: sha256:80b8998adedf79b0fe5252d5601ec0fa9dda31495b015f41c3cce0bdaccf9702 generated: "2021-01-27T18:03:33.233853887-05:00" diff --git a/helm/archive-node/Chart.yaml b/helm/archive-node/Chart.yaml index b664b799866..afc39bf1ca0 100644 --- a/helm/archive-node/Chart.yaml +++ b/helm/archive-node/Chart.yaml @@ -13,7 +13,7 @@ dependencies: repository: "https://charts.bitnami.com/bitnami" condition: archive.enablePostgresDB - name: common-utilities - version: 0.0.8 + version: 0.0.9 repository: "https://coda-charts.storage.googleapis.com" icon: https://storage.googleapis.com/coda-charts/Mina_Icon_Secondary_RGB_Black.png keywords: diff --git a/helm/archive-node/charts/common-utilities-0.0.8.tgz b/helm/archive-node/charts/common-utilities-0.0.8.tgz deleted file mode 100644 index efe156691de27f887411ebc3e2b3d6e84ec26d52..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1951 zcmV;Q2VnRgiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI?OZ`(K$@4w}z7&v_f)gyM29(33qvT4v3NOQqC*u!D32pDQ? z5ur#eNu@Qs`R)f&56h3n$tK8Nv7Ub{ac0PwA?HVOWTx_5$)L1caLds|hZ)s2oX}i6 zc_@nGINsmg^}lf(FaGYt`|*>V-8kMI?DzZodr#t>-QBl4Pau9U3vQs&SgN1I_a1A} zxgUh6l*&@el{5(fpxW{gWi~4>Lari~Q8`AF!0!YAAOMu~LLeN>#6V-A47W;8AXCP2 zIfm_8ZyP$@*FDfQg~N{rCm)WE|M?-zQy3`?%q=><$K`@Y6e}IuL3MR#SG#<(SZd z|56DgaMdTYDB9OJjKdw0qG6gB);Ar%M-+M8u^ZwumlRI5vWhA3(m=KFYk_w8lT789 zKxS=Wk|@f#q(!Y0GL=V!GuL~=H&$sn#&E3ESRgI9@ls5sH1Iu}$c=mci79zLM5bg) z_2m3tAAUanSx|Nv7II83aq?B^)FdPTHy{bXqOlS!32HM*&@oX`XX0Yw5~E7Z(D%}q zH|BmKok`A&#(VEpWHn-x;uQ*2L>UTawjaw*3QR!o3r+QeTy=x|H}Yq%*9|=^E#dza z6(yPn-2m3$f4mpJUBv&lgWV1OKL%w;h0R!o?9$SgP0JhQXHZ{W|ejp z6dExvEWZ$#z=#TignXrzWjU2I;~N&h7Vw;oF#*n~;8f5H6SeY!I*|2JS4xyQo_JVo z_(95bhxu8R(w4yt6h;Xp29L2W#@bzt>;L z|9%|rZ_a;@LepuqO^*2$N;D?YNK@{fz|VSfNHS>Mxz3R7==z#Wrvaom;u4|PSt4O2 z95%u|xV|PUb9*|4u&cO2$muRX#iG_6+sQ8@&Z5eq1k~Q3^p9j~YpXgZrWBpu9bGs( z`h0qPaCS6=t*tFWeB9nwVl_xYq16T6GFa6JVXb=VG=0Fj4Gz;RD~5_)qOBmfP}(Md z-z;iLMc`gnV(oP5Mx~{&5dKo_=-tulQI-QTh@BBjFn!DJ=BH#QUW{)yXrf+o^-8-_ z)EeDG*XYC6wA>|bZV)b+DARQdIfUPV%M_)B{!KnDrq7+6YL#bRwN0&C_zhX*QM>#6 z>R$nR(FK>$1vOdkP16*x*>iP2fT%Nc)WUvfGI;RV;)&f}jA>$j$x_J4Q&3QT#~lopNuat=vv;<0cf!3dwy1X>Wox@n))Dql1m+-FgGZi zD7#9hLY;1Nb&pTr*Pgq|^}Z})@xpwv(pZ(Zvj{mY3NFWMX0y`zT*=M>vwNPu!A+-N z)qiL%ZrUe)L=gRf=_dR)JjH;~`#`^^b@#vB{$Qd0^L7x&8~lF^YVrT9DmgA;k< zluKON47Ol<(pHNFg8Plr@P&NdCzqM)9=B~dh>%^mD2tZCwv|09-f@E zj^wk7)C#$_UiE!+y}`@b)C)esfK8a_PMQCnQYd2sfANb7je)VMsJAJ<3^Y0rNx>>$ zO1K?>%P|}(jgXdkvEszP6frmUp&R<6Qtqyy@qL*W>w@RByurR=sEi#t8>>Bjc6;jH zpL)nL)q4ZImumtUIUB;~S@;~o=k_JMgQ(DoMP_26OVkpDmpCt|b@$BPm#Sttw5qsq zd|`TTdV!#sGh&Sm^BehHr}IuLwpAMz$Zor48y114_&Vp1Z>ttC)nl{3tz%O0z36Ev z#HkXTO%gZ|U+KgU=$2$nGJk8kIqf#bjwM?D{@?jF`#@u?`~K74S^EAz*xS^9ABFr^ z-Gl_5$o)R>-{a%{Un}YUk7z0XKhsMbae)sw#=87}+h5B6e!RcQ|HmMIGOp=q@>BKj z?3Kw-2$=i^FGDBs5@vr3d)@pc!4;=s`Yaa zIG!meL;trOLc-yvT lIdORLqE%?x&Fe*}4UTSTLmRp^{VxCj|NkOikYfNW001}w(ry3% diff --git a/helm/archive-node/charts/common-utilities-0.0.9.tgz b/helm/archive-node/charts/common-utilities-0.0.9.tgz new file mode 100644 index 0000000000000000000000000000000000000000..46cefc1be29328fc9b347c9dcb61bfe4f0f49de3 GIT binary patch literal 1977 zcmV;q2S)fGiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI?OZyUK0&%fcP7|3}V*@tC2ZnwA;KF3G`IId9{R}|O4ptvI~ zVJ^8xa-9e|fA@mihgOeR_Sx{=wVHplOU`f}`QJE>7k_u+xABvmy?A$jXSaWFu=gb1+1oqVe**D?S#SfD#!~$xzPGML z=l&!_rBs$$uB1r_0M(X{D6?5P47rL}M&%ey0>2UffB;a^p+GpCv4O@y8E%!HK&Fi4 zatzzG+%|NEuScM13P&FgPd^-={NqEIr!Z0)m|Jvkh1zf>;fHrn4ItDQtfuUe%Q2w^ z|EXd~;Hpn(QM9jd7>7F~MZ+{NtZzDmk0|nbV5j0UmlV#lvWhA3(m=KFYle3DlT789 zKxS=Wk|@f#q(v-XEjNw?Ru|QgI}QBZan7II83aq?B^)FdPTr;r3-(O8L=1httY=$I&}GjTC-iBY9y=tpVH z8*@LA&Ln3>%kE=rB( znMRW-ktVPk`;G!NS80WBCV?H-y3G96H7~I4696u`!K__j;ZcK<&DGpE|vr0P) z3XPZ-mJbCcFrvaBAz!IwSx)85_@)bB3wTb)m;h%~a4P7~L@mFd4rD#ol@eu+ryf?D z{vhSL)A?DI(waPE08}zdN#U ze*F3D09#vIg!s69<{sA z&;Avl7Y(_LhSX%eH%(K(X3y3A0HTiSsD=H|Wbonza8r3Qm`H}HYblGAT6FINOKoXR z=n#cZEO!lo>uczF1z#RAoQEeTD^l=wVWdL%09N?pjT+6PKz+t(yI0w~dZC54ky)I_ zaKXjS8K$M+a{Os5Roi_0 z4O!{yJ~h~N6`rHcP16AoK<a(glK<9;> zyyrTB>Gxn~z4<||N@;(K6TXgg4^K{8NAg)kY6V|gulhc^-r(hI>IENRz$Q#|r_6s( zDU`8+zxYLk#=uxr)Z3I_1{xiRq+k^=CEO0czGvip7pF0;!Fw7CJ7vhuXJJvbW5@(nZJ+SoOYXI#}X}n z|L=U8eIOm{zW?-hmcIY*?r*;TKMKWR9R4LCfhTgm5B&G|xc~o^bblaP%Ky*w5=UI% z1L|0p{|Ei0{O|AdH~Ie<%P|Cjv6?eW zNUA4+E@e{lacL|S0-n8cL3kb1-IZwl90ab<6qKR=+YTY&;M2+R>3K4~4 zUbStn{|4^d2?0Xy*{eEWuap1C3W|I1?%f literal 0 HcmV?d00001 diff --git a/helm/archive-node/templates/archive.yaml b/helm/archive-node/templates/archive.yaml index b4f5314893d..0aa2e1856f8 100644 --- a/helm/archive-node/templates/archive.yaml +++ b/helm/archive-node/templates/archive.yaml @@ -95,7 +95,8 @@ spec: protocol: TCP containerPort: {{ .Values.coda.ports.p2p }} hostPort: {{ .Values.coda.ports.p2p }} -{{$data := dict "config" $config "healthcheck" $.Values.healthcheck }} +{{$name := include "archive-node.fullname" . }} +{{$data := dict "name" $name "healthcheck" $.Values.healthcheck }} {{- include "healthcheck.daemon.allChecks" $data | indent 8 }} imagePullPolicy: Always volumeMounts: diff --git a/helm/block-producer/Chart.yaml b/helm/block-producer/Chart.yaml index e045fb07407..198bf7e6848 100644 --- a/helm/block-producer/Chart.yaml +++ b/helm/block-producer/Chart.yaml @@ -10,7 +10,7 @@ annotations: - add flag to log precomputed blocks dependencies: - name: common-utilities - version: 0.0.8 + version: 0.0.9 repository: "https://coda-charts.storage.googleapis.com" icon: https://storage.googleapis.com/coda-charts/Mina_Icon_Secondary_RGB_Black.png keywords: diff --git a/helm/block-producer/charts/common-utilities-0.0.8.tgz b/helm/block-producer/charts/common-utilities-0.0.8.tgz deleted file mode 100644 index efe156691de27f887411ebc3e2b3d6e84ec26d52..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1951 zcmV;Q2VnRgiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI?OZ`(K$@4w}z7&v_f)gyM29(33qvT4v3NOQqC*u!D32pDQ? z5ur#eNu@Qs`R)f&56h3n$tK8Nv7Ub{ac0PwA?HVOWTx_5$)L1caLds|hZ)s2oX}i6 zc_@nGINsmg^}lf(FaGYt`|*>V-8kMI?DzZodr#t>-QBl4Pau9U3vQs&SgN1I_a1A} zxgUh6l*&@el{5(fpxW{gWi~4>Lari~Q8`AF!0!YAAOMu~LLeN>#6V-A47W;8AXCP2 zIfm_8ZyP$@*FDfQg~N{rCm)WE|M?-zQy3`?%q=><$K`@Y6e}IuL3MR#SG#<(SZd z|56DgaMdTYDB9OJjKdw0qG6gB);Ar%M-+M8u^ZwumlRI5vWhA3(m=KFYk_w8lT789 zKxS=Wk|@f#q(!Y0GL=V!GuL~=H&$sn#&E3ESRgI9@ls5sH1Iu}$c=mci79zLM5bg) z_2m3tAAUanSx|Nv7II83aq?B^)FdPTHy{bXqOlS!32HM*&@oX`XX0Yw5~E7Z(D%}q zH|BmKok`A&#(VEpWHn-x;uQ*2L>UTawjaw*3QR!o3r+QeTy=x|H}Yq%*9|=^E#dza z6(yPn-2m3$f4mpJUBv&lgWV1OKL%w;h0R!o?9$SgP0JhQXHZ{W|ejp z6dExvEWZ$#z=#TignXrzWjU2I;~N&h7Vw;oF#*n~;8f5H6SeY!I*|2JS4xyQo_JVo z_(95bhxu8R(w4yt6h;Xp29L2W#@bzt>;L z|9%|rZ_a;@LepuqO^*2$N;D?YNK@{fz|VSfNHS>Mxz3R7==z#Wrvaom;u4|PSt4O2 z95%u|xV|PUb9*|4u&cO2$muRX#iG_6+sQ8@&Z5eq1k~Q3^p9j~YpXgZrWBpu9bGs( z`h0qPaCS6=t*tFWeB9nwVl_xYq16T6GFa6JVXb=VG=0Fj4Gz;RD~5_)qOBmfP}(Md z-z;iLMc`gnV(oP5Mx~{&5dKo_=-tulQI-QTh@BBjFn!DJ=BH#QUW{)yXrf+o^-8-_ z)EeDG*XYC6wA>|bZV)b+DARQdIfUPV%M_)B{!KnDrq7+6YL#bRwN0&C_zhX*QM>#6 z>R$nR(FK>$1vOdkP16*x*>iP2fT%Nc)WUvfGI;RV;)&f}jA>$j$x_J4Q&3QT#~lopNuat=vv;<0cf!3dwy1X>Wox@n))Dql1m+-FgGZi zD7#9hLY;1Nb&pTr*Pgq|^}Z})@xpwv(pZ(Zvj{mY3NFWMX0y`zT*=M>vwNPu!A+-N z)qiL%ZrUe)L=gRf=_dR)JjH;~`#`^^b@#vB{$Qd0^L7x&8~lF^YVrT9DmgA;k< zluKON47Ol<(pHNFg8Plr@P&NdCzqM)9=B~dh>%^mD2tZCwv|09-f@E zj^wk7)C#$_UiE!+y}`@b)C)esfK8a_PMQCnQYd2sfANb7je)VMsJAJ<3^Y0rNx>>$ zO1K?>%P|}(jgXdkvEszP6frmUp&R<6Qtqyy@qL*W>w@RByurR=sEi#t8>>Bjc6;jH zpL)nL)q4ZImumtUIUB;~S@;~o=k_JMgQ(DoMP_26OVkpDmpCt|b@$BPm#Sttw5qsq zd|`TTdV!#sGh&Sm^BehHr}IuLwpAMz$Zor48y114_&Vp1Z>ttC)nl{3tz%O0z36Ev z#HkXTO%gZ|U+KgU=$2$nGJk8kIqf#bjwM?D{@?jF`#@u?`~K74S^EAz*xS^9ABFr^ z-Gl_5$o)R>-{a%{Un}YUk7z0XKhsMbae)sw#=87}+h5B6e!RcQ|HmMIGOp=q@>BKj z?3Kw-2$=i^FGDBs5@vr3d)@pc!4;=s`Yaa zIG!meL;trOLc-yvT lIdORLqE%?x&Fe*}4UTSTLmRp^{VxCj|NkOikYfNW001}w(ry3% diff --git a/helm/block-producer/charts/common-utilities-0.0.9.tgz b/helm/block-producer/charts/common-utilities-0.0.9.tgz new file mode 100644 index 0000000000000000000000000000000000000000..46cefc1be29328fc9b347c9dcb61bfe4f0f49de3 GIT binary patch literal 1977 zcmV;q2S)fGiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI?OZyUK0&%fcP7|3}V*@tC2ZnwA;KF3G`IId9{R}|O4ptvI~ zVJ^8xa-9e|fA@mihgOeR_Sx{=wVHplOU`f}`QJE>7k_u+xABvmy?A$jXSaWFu=gb1+1oqVe**D?S#SfD#!~$xzPGML z=l&!_rBs$$uB1r_0M(X{D6?5P47rL}M&%ey0>2UffB;a^p+GpCv4O@y8E%!HK&Fi4 zatzzG+%|NEuScM13P&FgPd^-={NqEIr!Z0)m|Jvkh1zf>;fHrn4ItDQtfuUe%Q2w^ z|EXd~;Hpn(QM9jd7>7F~MZ+{NtZzDmk0|nbV5j0UmlV#lvWhA3(m=KFYle3DlT789 zKxS=Wk|@f#q(v-XEjNw?Ru|QgI}QBZan7II83aq?B^)FdPTr;r3-(O8L=1httY=$I&}GjTC-iBY9y=tpVH z8*@LA&Ln3>%kE=rB( znMRW-ktVPk`;G!NS80WBCV?H-y3G96H7~I4696u`!K__j;ZcK<&DGpE|vr0P) z3XPZ-mJbCcFrvaBAz!IwSx)85_@)bB3wTb)m;h%~a4P7~L@mFd4rD#ol@eu+ryf?D z{vhSL)A?DI(waPE08}zdN#U ze*F3D09#vIg!s69<{sA z&;Avl7Y(_LhSX%eH%(K(X3y3A0HTiSsD=H|Wbonza8r3Qm`H}HYblGAT6FINOKoXR z=n#cZEO!lo>uczF1z#RAoQEeTD^l=wVWdL%09N?pjT+6PKz+t(yI0w~dZC54ky)I_ zaKXjS8K$M+a{Os5Roi_0 z4O!{yJ~h~N6`rHcP16AoK<a(glK<9;> zyyrTB>Gxn~z4<||N@;(K6TXgg4^K{8NAg)kY6V|gulhc^-r(hI>IENRz$Q#|r_6s( zDU`8+zxYLk#=uxr)Z3I_1{xiRq+k^=CEO0czGvip7pF0;!Fw7CJ7vhuXJJvbW5@(nZJ+SoOYXI#}X}n z|L=U8eIOm{zW?-hmcIY*?r*;TKMKWR9R4LCfhTgm5B&G|xc~o^bblaP%Ky*w5=UI% z1L|0p{|Ei0{O|AdH~Ie<%P|Cjv6?eW zNUA4+E@e{lacL|S0-n8cL3kb1-IZwl90ab<6qKR=+YTY&;M2+R>3K4~4 zUbStn{|4^d2?0Xy*{eEWuap1C3W|I1?%f literal 0 HcmV?d00001 diff --git a/helm/block-producer/templates/_healthchecks.tpl b/helm/block-producer/templates/_healthchecks.tpl index 9603ad2838e..77a944df27a 100644 --- a/helm/block-producer/templates/_healthchecks.tpl +++ b/helm/block-producer/templates/_healthchecks.tpl @@ -23,7 +23,7 @@ readinessProbe: command: [ "/bin/bash", "-c", - "source /healthcheck/utilities.sh && isDaemonSynced && peerCountGreaterThan 0 && ownsFunds && updateSyncStatusLabel {{ .config.name }}" + "source /healthcheck/utilities.sh && isDaemonSynced && peerCountGreaterThan 0 && ownsFunds && updateSyncStatusLabel {{ .name }}" ] {{- end }} diff --git a/helm/block-producer/templates/block-producer.yaml b/helm/block-producer/templates/block-producer.yaml index 2abb0139c75..ebb13e7795f 100644 --- a/helm/block-producer/templates/block-producer.yaml +++ b/helm/block-producer/templates/block-producer.yaml @@ -258,7 +258,7 @@ spec: protocol: TCP containerPort: {{ default $.Values.coda.ports.p2p $config.externalPort }} hostPort: {{ default $.Values.coda.ports.external $config.externalPort }} -{{$data := dict "config" $config "healthcheck" $.Values.healthcheck }} +{{$data := dict "name" $config.name "healthcheck" $.Values.healthcheck }} {{- include "healthcheck.daemon.allChecks" $data | indent 8 }} imagePullPolicy: Always volumeMounts: diff --git a/helm/common/Chart.yaml b/helm/common/Chart.yaml index c13bebdaa28..eb0cdd11d2a 100644 --- a/helm/common/Chart.yaml +++ b/helm/common/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: common-utilities description: A Helm chart for Mina Protocol's common chart utilities type: library -version: 0.0.8 +version: 0.0.9 appVersion: 0.0.1 annotations: artifacthub.io/changes: | diff --git a/helm/common/templates/_healthchecks.tpl b/helm/common/templates/_healthchecks.tpl index ff36094e81f..71c44948a0e 100644 --- a/helm/common/templates/_healthchecks.tpl +++ b/helm/common/templates/_healthchecks.tpl @@ -39,7 +39,7 @@ readinessProbe: command: [ "/bin/bash", "-c", - "source /healthcheck/utilities.sh && isDaemonSynced && updateSyncStatusLabel {{ .config.name }}" + "source /healthcheck/utilities.sh && isDaemonSynced && updateSyncStatusLabel {{ .name }} " ] {{- include "healthcheck.common.settings" . | indent 2 }} {{- end }} diff --git a/helm/seed-node/Chart.yaml b/helm/seed-node/Chart.yaml index cba4b4b2b6a..3d93b326ed0 100644 --- a/helm/seed-node/Chart.yaml +++ b/helm/seed-node/Chart.yaml @@ -10,8 +10,9 @@ annotations: - Add maxConnections value of 200 dependencies: - name: common-utilities - version: 0.0.8 - repository: "https://coda-charts.storage.googleapis.com" + version: 0.0.9 + repository: "file://../common/" +# repository: "https://coda-charts.storage.googleapis.com" icon: https://storage.googleapis.com/coda-charts/Mina_Icon_Secondary_RGB_Black.png keywords: - seed diff --git a/helm/seed-node/charts/common-utilities-0.0.8.tgz b/helm/seed-node/charts/common-utilities-0.0.8.tgz deleted file mode 100644 index efe156691de27f887411ebc3e2b3d6e84ec26d52..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1951 zcmV;Q2VnRgiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI?OZ`(K$@4w}z7&v_f)gyM29(33qvT4v3NOQqC*u!D32pDQ? z5ur#eNu@Qs`R)f&56h3n$tK8Nv7Ub{ac0PwA?HVOWTx_5$)L1caLds|hZ)s2oX}i6 zc_@nGINsmg^}lf(FaGYt`|*>V-8kMI?DzZodr#t>-QBl4Pau9U3vQs&SgN1I_a1A} zxgUh6l*&@el{5(fpxW{gWi~4>Lari~Q8`AF!0!YAAOMu~LLeN>#6V-A47W;8AXCP2 zIfm_8ZyP$@*FDfQg~N{rCm)WE|M?-zQy3`?%q=><$K`@Y6e}IuL3MR#SG#<(SZd z|56DgaMdTYDB9OJjKdw0qG6gB);Ar%M-+M8u^ZwumlRI5vWhA3(m=KFYk_w8lT789 zKxS=Wk|@f#q(!Y0GL=V!GuL~=H&$sn#&E3ESRgI9@ls5sH1Iu}$c=mci79zLM5bg) z_2m3tAAUanSx|Nv7II83aq?B^)FdPTHy{bXqOlS!32HM*&@oX`XX0Yw5~E7Z(D%}q zH|BmKok`A&#(VEpWHn-x;uQ*2L>UTawjaw*3QR!o3r+QeTy=x|H}Yq%*9|=^E#dza z6(yPn-2m3$f4mpJUBv&lgWV1OKL%w;h0R!o?9$SgP0JhQXHZ{W|ejp z6dExvEWZ$#z=#TignXrzWjU2I;~N&h7Vw;oF#*n~;8f5H6SeY!I*|2JS4xyQo_JVo z_(95bhxu8R(w4yt6h;Xp29L2W#@bzt>;L z|9%|rZ_a;@LepuqO^*2$N;D?YNK@{fz|VSfNHS>Mxz3R7==z#Wrvaom;u4|PSt4O2 z95%u|xV|PUb9*|4u&cO2$muRX#iG_6+sQ8@&Z5eq1k~Q3^p9j~YpXgZrWBpu9bGs( z`h0qPaCS6=t*tFWeB9nwVl_xYq16T6GFa6JVXb=VG=0Fj4Gz;RD~5_)qOBmfP}(Md z-z;iLMc`gnV(oP5Mx~{&5dKo_=-tulQI-QTh@BBjFn!DJ=BH#QUW{)yXrf+o^-8-_ z)EeDG*XYC6wA>|bZV)b+DARQdIfUPV%M_)B{!KnDrq7+6YL#bRwN0&C_zhX*QM>#6 z>R$nR(FK>$1vOdkP16*x*>iP2fT%Nc)WUvfGI;RV;)&f}jA>$j$x_J4Q&3QT#~lopNuat=vv;<0cf!3dwy1X>Wox@n))Dql1m+-FgGZi zD7#9hLY;1Nb&pTr*Pgq|^}Z})@xpwv(pZ(Zvj{mY3NFWMX0y`zT*=M>vwNPu!A+-N z)qiL%ZrUe)L=gRf=_dR)JjH;~`#`^^b@#vB{$Qd0^L7x&8~lF^YVrT9DmgA;k< zluKON47Ol<(pHNFg8Plr@P&NdCzqM)9=B~dh>%^mD2tZCwv|09-f@E zj^wk7)C#$_UiE!+y}`@b)C)esfK8a_PMQCnQYd2sfANb7je)VMsJAJ<3^Y0rNx>>$ zO1K?>%P|}(jgXdkvEszP6frmUp&R<6Qtqyy@qL*W>w@RByurR=sEi#t8>>Bjc6;jH zpL)nL)q4ZImumtUIUB;~S@;~o=k_JMgQ(DoMP_26OVkpDmpCt|b@$BPm#Sttw5qsq zd|`TTdV!#sGh&Sm^BehHr}IuLwpAMz$Zor48y114_&Vp1Z>ttC)nl{3tz%O0z36Ev z#HkXTO%gZ|U+KgU=$2$nGJk8kIqf#bjwM?D{@?jF`#@u?`~K74S^EAz*xS^9ABFr^ z-Gl_5$o)R>-{a%{Un}YUk7z0XKhsMbae)sw#=87}+h5B6e!RcQ|HmMIGOp=q@>BKj z?3Kw-2$=i^FGDBs5@vr3d)@pc!4;=s`Yaa zIG!meL;trOLc-yvT lIdORLqE%?x&Fe*}4UTSTLmRp^{VxCj|NkOikYfNW001}w(ry3% diff --git a/helm/seed-node/charts/common-utilities-0.0.9.tgz b/helm/seed-node/charts/common-utilities-0.0.9.tgz new file mode 100644 index 0000000000000000000000000000000000000000..46cefc1be29328fc9b347c9dcb61bfe4f0f49de3 GIT binary patch literal 1977 zcmV;q2S)fGiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI?OZyUK0&%fcP7|3}V*@tC2ZnwA;KF3G`IId9{R}|O4ptvI~ zVJ^8xa-9e|fA@mihgOeR_Sx{=wVHplOU`f}`QJE>7k_u+xABvmy?A$jXSaWFu=gb1+1oqVe**D?S#SfD#!~$xzPGML z=l&!_rBs$$uB1r_0M(X{D6?5P47rL}M&%ey0>2UffB;a^p+GpCv4O@y8E%!HK&Fi4 zatzzG+%|NEuScM13P&FgPd^-={NqEIr!Z0)m|Jvkh1zf>;fHrn4ItDQtfuUe%Q2w^ z|EXd~;Hpn(QM9jd7>7F~MZ+{NtZzDmk0|nbV5j0UmlV#lvWhA3(m=KFYle3DlT789 zKxS=Wk|@f#q(v-XEjNw?Ru|QgI}QBZan7II83aq?B^)FdPTr;r3-(O8L=1httY=$I&}GjTC-iBY9y=tpVH z8*@LA&Ln3>%kE=rB( znMRW-ktVPk`;G!NS80WBCV?H-y3G96H7~I4696u`!K__j;ZcK<&DGpE|vr0P) z3XPZ-mJbCcFrvaBAz!IwSx)85_@)bB3wTb)m;h%~a4P7~L@mFd4rD#ol@eu+ryf?D z{vhSL)A?DI(waPE08}zdN#U ze*F3D09#vIg!s69<{sA z&;Avl7Y(_LhSX%eH%(K(X3y3A0HTiSsD=H|Wbonza8r3Qm`H}HYblGAT6FINOKoXR z=n#cZEO!lo>uczF1z#RAoQEeTD^l=wVWdL%09N?pjT+6PKz+t(yI0w~dZC54ky)I_ zaKXjS8K$M+a{Os5Roi_0 z4O!{yJ~h~N6`rHcP16AoK<a(glK<9;> zyyrTB>Gxn~z4<||N@;(K6TXgg4^K{8NAg)kY6V|gulhc^-r(hI>IENRz$Q#|r_6s( zDU`8+zxYLk#=uxr)Z3I_1{xiRq+k^=CEO0czGvip7pF0;!Fw7CJ7vhuXJJvbW5@(nZJ+SoOYXI#}X}n z|L=U8eIOm{zW?-hmcIY*?r*;TKMKWR9R4LCfhTgm5B&G|xc~o^bblaP%Ky*w5=UI% z1L|0p{|Ei0{O|AdH~Ie<%P|Cjv6?eW zNUA4+E@e{lacL|S0-n8cL3kb1-IZwl90ab<6qKR=+YTY&;M2+R>3K4~4 zUbStn{|4^d2?0Xy*{eEWuap1C3W|I1?%f literal 0 HcmV?d00001 diff --git a/helm/seed-node/templates/_healthchecks.tpl b/helm/seed-node/templates/_healthchecks.tpl index 8dfcb7b5c18..44c49429a53 100644 --- a/helm/seed-node/templates/_healthchecks.tpl +++ b/helm/seed-node/templates/_healthchecks.tpl @@ -23,7 +23,7 @@ readinessProbe: command: [ "/bin/bash", "-c", - "source /healthcheck/utilities.sh && isDaemonSynced && peerCountGreaterThan 0 && updateSyncStatusLabel {{ .config.name }}" + "source /healthcheck/utilities.sh && isDaemonSynced && peerCountGreaterThan 0 && updateSyncStatusLabel {{ .name }}" ] {{- end }} diff --git a/helm/seed-node/templates/seed-node.yaml b/helm/seed-node/templates/seed-node.yaml index fd89db81778..7fa160e672f 100644 --- a/helm/seed-node/templates/seed-node.yaml +++ b/helm/seed-node/templates/seed-node.yaml @@ -122,7 +122,7 @@ spec: protocol: TCP containerPort: {{ default $.Values.coda.ports.p2p $config.externalPort }} hostPort: {{ default $.Values.coda.ports.external $config.externalPort }} -{{$data := dict "config" $config "healthcheck" $.Values.healthcheck }} +{{$data := dict "name" $config.name "healthcheck" $.Values.healthcheck }} {{- include "healthcheck.seed.allChecks" $data | indent 8 }} imagePullPolicy: Always volumeMounts: diff --git a/helm/snark-worker/Chart.yaml b/helm/snark-worker/Chart.yaml index 9d8758f8725..40427f39024 100644 --- a/helm/snark-worker/Chart.yaml +++ b/helm/snark-worker/Chart.yaml @@ -9,8 +9,9 @@ annotations: - enable daemon blockchain archival capability dependencies: - name: common-utilities - version: 0.0.8 - repository: "https://coda-charts.storage.googleapis.com" + version: 0.0.9 + repository: "file://../common/" +# repository: "https://coda-charts.storage.googleapis.com" icon: https://storage.googleapis.com/coda-charts/Mina_Icon_Secondary_RGB_Black.png keywords: - snarks diff --git a/helm/snark-worker/charts/common-utilities-0.0.8.tgz b/helm/snark-worker/charts/common-utilities-0.0.8.tgz deleted file mode 100644 index efe156691de27f887411ebc3e2b3d6e84ec26d52..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1951 zcmV;Q2VnRgiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI?OZ`(K$@4w}z7&v_f)gyM29(33qvT4v3NOQqC*u!D32pDQ? z5ur#eNu@Qs`R)f&56h3n$tK8Nv7Ub{ac0PwA?HVOWTx_5$)L1caLds|hZ)s2oX}i6 zc_@nGINsmg^}lf(FaGYt`|*>V-8kMI?DzZodr#t>-QBl4Pau9U3vQs&SgN1I_a1A} zxgUh6l*&@el{5(fpxW{gWi~4>Lari~Q8`AF!0!YAAOMu~LLeN>#6V-A47W;8AXCP2 zIfm_8ZyP$@*FDfQg~N{rCm)WE|M?-zQy3`?%q=><$K`@Y6e}IuL3MR#SG#<(SZd z|56DgaMdTYDB9OJjKdw0qG6gB);Ar%M-+M8u^ZwumlRI5vWhA3(m=KFYk_w8lT789 zKxS=Wk|@f#q(!Y0GL=V!GuL~=H&$sn#&E3ESRgI9@ls5sH1Iu}$c=mci79zLM5bg) z_2m3tAAUanSx|Nv7II83aq?B^)FdPTHy{bXqOlS!32HM*&@oX`XX0Yw5~E7Z(D%}q zH|BmKok`A&#(VEpWHn-x;uQ*2L>UTawjaw*3QR!o3r+QeTy=x|H}Yq%*9|=^E#dza z6(yPn-2m3$f4mpJUBv&lgWV1OKL%w;h0R!o?9$SgP0JhQXHZ{W|ejp z6dExvEWZ$#z=#TignXrzWjU2I;~N&h7Vw;oF#*n~;8f5H6SeY!I*|2JS4xyQo_JVo z_(95bhxu8R(w4yt6h;Xp29L2W#@bzt>;L z|9%|rZ_a;@LepuqO^*2$N;D?YNK@{fz|VSfNHS>Mxz3R7==z#Wrvaom;u4|PSt4O2 z95%u|xV|PUb9*|4u&cO2$muRX#iG_6+sQ8@&Z5eq1k~Q3^p9j~YpXgZrWBpu9bGs( z`h0qPaCS6=t*tFWeB9nwVl_xYq16T6GFa6JVXb=VG=0Fj4Gz;RD~5_)qOBmfP}(Md z-z;iLMc`gnV(oP5Mx~{&5dKo_=-tulQI-QTh@BBjFn!DJ=BH#QUW{)yXrf+o^-8-_ z)EeDG*XYC6wA>|bZV)b+DARQdIfUPV%M_)B{!KnDrq7+6YL#bRwN0&C_zhX*QM>#6 z>R$nR(FK>$1vOdkP16*x*>iP2fT%Nc)WUvfGI;RV;)&f}jA>$j$x_J4Q&3QT#~lopNuat=vv;<0cf!3dwy1X>Wox@n))Dql1m+-FgGZi zD7#9hLY;1Nb&pTr*Pgq|^}Z})@xpwv(pZ(Zvj{mY3NFWMX0y`zT*=M>vwNPu!A+-N z)qiL%ZrUe)L=gRf=_dR)JjH;~`#`^^b@#vB{$Qd0^L7x&8~lF^YVrT9DmgA;k< zluKON47Ol<(pHNFg8Plr@P&NdCzqM)9=B~dh>%^mD2tZCwv|09-f@E zj^wk7)C#$_UiE!+y}`@b)C)esfK8a_PMQCnQYd2sfANb7je)VMsJAJ<3^Y0rNx>>$ zO1K?>%P|}(jgXdkvEszP6frmUp&R<6Qtqyy@qL*W>w@RByurR=sEi#t8>>Bjc6;jH zpL)nL)q4ZImumtUIUB;~S@;~o=k_JMgQ(DoMP_26OVkpDmpCt|b@$BPm#Sttw5qsq zd|`TTdV!#sGh&Sm^BehHr}IuLwpAMz$Zor48y114_&Vp1Z>ttC)nl{3tz%O0z36Ev z#HkXTO%gZ|U+KgU=$2$nGJk8kIqf#bjwM?D{@?jF`#@u?`~K74S^EAz*xS^9ABFr^ z-Gl_5$o)R>-{a%{Un}YUk7z0XKhsMbae)sw#=87}+h5B6e!RcQ|HmMIGOp=q@>BKj z?3Kw-2$=i^FGDBs5@vr3d)@pc!4;=s`Yaa zIG!meL;trOLc-yvT lIdORLqE%?x&Fe*}4UTSTLmRp^{VxCj|NkOikYfNW001}w(ry3% diff --git a/helm/snark-worker/charts/common-utilities-0.0.9.tgz b/helm/snark-worker/charts/common-utilities-0.0.9.tgz new file mode 100644 index 0000000000000000000000000000000000000000..46cefc1be29328fc9b347c9dcb61bfe4f0f49de3 GIT binary patch literal 1977 zcmV;q2S)fGiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI?OZyUK0&%fcP7|3}V*@tC2ZnwA;KF3G`IId9{R}|O4ptvI~ zVJ^8xa-9e|fA@mihgOeR_Sx{=wVHplOU`f}`QJE>7k_u+xABvmy?A$jXSaWFu=gb1+1oqVe**D?S#SfD#!~$xzPGML z=l&!_rBs$$uB1r_0M(X{D6?5P47rL}M&%ey0>2UffB;a^p+GpCv4O@y8E%!HK&Fi4 zatzzG+%|NEuScM13P&FgPd^-={NqEIr!Z0)m|Jvkh1zf>;fHrn4ItDQtfuUe%Q2w^ z|EXd~;Hpn(QM9jd7>7F~MZ+{NtZzDmk0|nbV5j0UmlV#lvWhA3(m=KFYle3DlT789 zKxS=Wk|@f#q(v-XEjNw?Ru|QgI}QBZan7II83aq?B^)FdPTr;r3-(O8L=1httY=$I&}GjTC-iBY9y=tpVH z8*@LA&Ln3>%kE=rB( znMRW-ktVPk`;G!NS80WBCV?H-y3G96H7~I4696u`!K__j;ZcK<&DGpE|vr0P) z3XPZ-mJbCcFrvaBAz!IwSx)85_@)bB3wTb)m;h%~a4P7~L@mFd4rD#ol@eu+ryf?D z{vhSL)A?DI(waPE08}zdN#U ze*F3D09#vIg!s69<{sA z&;Avl7Y(_LhSX%eH%(K(X3y3A0HTiSsD=H|Wbonza8r3Qm`H}HYblGAT6FINOKoXR z=n#cZEO!lo>uczF1z#RAoQEeTD^l=wVWdL%09N?pjT+6PKz+t(yI0w~dZC54ky)I_ zaKXjS8K$M+a{Os5Roi_0 z4O!{yJ~h~N6`rHcP16AoK<a(glK<9;> zyyrTB>Gxn~z4<||N@;(K6TXgg4^K{8NAg)kY6V|gulhc^-r(hI>IENRz$Q#|r_6s( zDU`8+zxYLk#=uxr)Z3I_1{xiRq+k^=CEO0czGvip7pF0;!Fw7CJ7vhuXJJvbW5@(nZJ+SoOYXI#}X}n z|L=U8eIOm{zW?-hmcIY*?r*;TKMKWR9R4LCfhTgm5B&G|xc~o^bblaP%Ky*w5=UI% z1L|0p{|Ei0{O|AdH~Ie<%P|Cjv6?eW zNUA4+E@e{lacL|S0-n8cL3kb1-IZwl90ab<6qKR=+YTY&;M2+R>3K4~4 zUbStn{|4^d2?0Xy*{eEWuap1C3W|I1?%f literal 0 HcmV?d00001 diff --git a/helm/snark-worker/templates/_healthchecks.tpl b/helm/snark-worker/templates/_healthchecks.tpl index a02e9e3e213..23e9c9b7c18 100644 --- a/helm/snark-worker/templates/_healthchecks.tpl +++ b/helm/snark-worker/templates/_healthchecks.tpl @@ -23,7 +23,7 @@ readinessProbe: command: [ "/bin/bash", "-c", - "source /healthcheck/utilities.sh && isDaemonSynced && hasSnarkWorker && updateSyncStatusLabel {{ .config.name }}" + "source /healthcheck/utilities.sh && isDaemonSynced && hasSnarkWorker && updateSyncStatusLabel {{ .name }}" ] {{- end }} diff --git a/helm/snark-worker/templates/snark-coordinator.yaml b/helm/snark-worker/templates/snark-coordinator.yaml index 4bf032d7564..0ff33edcd7d 100644 --- a/helm/snark-worker/templates/snark-coordinator.yaml +++ b/helm/snark-worker/templates/snark-coordinator.yaml @@ -93,7 +93,8 @@ spec: protocol: TCP containerPort: {{ .Values.coda.ports.p2p }} hostPort: {{ .Values.coda.ports.p2p }} -{{$data := dict "config" $config "healthcheck" $.Values.healthcheck }} +{{$name := tpl .Values.coordinator.fullname . }} +{{$data := dict "name" $name "healthcheck" $.Values.healthcheck }} {{- include "healthcheck.snarkCoordinator.allChecks" $data | indent 8 }} imagePullPolicy: Always {{- if .Values.coda.runtimeConfig }} diff --git a/helm/watchdog/Chart.yaml b/helm/watchdog/Chart.yaml index 8bfa806d4e9..39c4e4c90ec 100644 --- a/helm/watchdog/Chart.yaml +++ b/helm/watchdog/Chart.yaml @@ -10,8 +10,9 @@ annotations: - add CHANGELOG.md for chart version => changelog tracking dependencies: - name: common-utilities - version: 0.0.7 - repository: "https://coda-charts.storage.googleapis.com" + version: 0.0.9 + repository: "file://../common/" +# repository: "https://coda-charts.storage.googleapis.com" icon: https://storage.googleapis.com/coda-charts/Mina_Icon_Secondary_RGB_Black.png keywords: - watchdog diff --git a/helm/watchdog/charts/common-utilities-0.0.7.tgz b/helm/watchdog/charts/common-utilities-0.0.7.tgz deleted file mode 100644 index 592b7b8850157ded7f42de2f0dde52ba6366ad21..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1079 zcmV-71jzdziwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI-nYa=%h&u9G=gAG?Wx(`3jhW!@q0zF8MfJ31iN0GH-uZULK zO4>BW&HrAsuPAF@9z8eLhv$p6()=XNXy!MPnaXn|gVJ)rEk_f*QHhUVhrP!h*+ zJey9d-#Cu@zwvZ3J{e8s^LQGMXQSCkJep4D^Am^xrDj;o z(yq1UHY=CaDsHdsR;xV_yD2aM!Izrq4Y~0RpOf!>GOr^$`F}%2iRPdL@KpYf=d*tP z&!>}P{=bG~NQKQ)lnJx$d6oI|9HZx15R(DCnjen8ZY?6c;FvS*6_u3XPZ-mM;Y+u%g1? z|0GBMPT9$Si+LfaMHBt%#fAxO@t67FiToc=XOoBdKX&@Z{C^GEZlky4oZp~CV1#k^4a%xXhQncfqe&?`yFDyion2g>pI)6UU^pBSQu*yet=5nv6k09u zna-+L2pj07Lsky+I~?g*RxA{|Mq5*Gp|ni^Z!Ky`Mc_X7a&6!8X4<_T*dgVwfpr6%%*;7yvV2yd~a3P z)tQC2$ZCt+CaFvl_*{Jg45B5M(UO{M@MGH*u={p>@rB4+I_fArG#R{k1KiY>EH;v1 zI;fyu4(X`V^YcB4^E?MpAu89@tWj-h^)LvVn@KmkZ_oQfD0~j4e?no;M6db1Df^)E zSp9bwu)s7ouy42lJW>Bg4?SF!>@CbupHn>bz5z7;R&tH$hf;I7Ua$<)QgFHcxR$ExKD$L$R{u~mgy=7L zg*rFw06+jawJbZkEi@YU-uK4b=rwK<7%-vAG+ZmS7Fhjxu)fB?-?@hYX!+`EcGgw) zUQ~gaR!;mVcP2t%9szt(b{|HjeMtR|PvG;wJ>>>pcKNz@o~$%h<=rVlPK$!e^%JLA xqb_RQ2juPA51(+`Em-vn&BbH2)z-j`9zaKLY>&|NpV-KnnmG004RE4?X|@ diff --git a/helm/watchdog/charts/common-utilities-0.0.9.tgz b/helm/watchdog/charts/common-utilities-0.0.9.tgz new file mode 100644 index 0000000000000000000000000000000000000000..46cefc1be29328fc9b347c9dcb61bfe4f0f49de3 GIT binary patch literal 1977 zcmV;q2S)fGiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI?OZyUK0&%fcP7|3}V*@tC2ZnwA;KF3G`IId9{R}|O4ptvI~ zVJ^8xa-9e|fA@mihgOeR_Sx{=wVHplOU`f}`QJE>7k_u+xABvmy?A$jXSaWFu=gb1+1oqVe**D?S#SfD#!~$xzPGML z=l&!_rBs$$uB1r_0M(X{D6?5P47rL}M&%ey0>2UffB;a^p+GpCv4O@y8E%!HK&Fi4 zatzzG+%|NEuScM13P&FgPd^-={NqEIr!Z0)m|Jvkh1zf>;fHrn4ItDQtfuUe%Q2w^ z|EXd~;Hpn(QM9jd7>7F~MZ+{NtZzDmk0|nbV5j0UmlV#lvWhA3(m=KFYle3DlT789 zKxS=Wk|@f#q(v-XEjNw?Ru|QgI}QBZan7II83aq?B^)FdPTr;r3-(O8L=1httY=$I&}GjTC-iBY9y=tpVH z8*@LA&Ln3>%kE=rB( znMRW-ktVPk`;G!NS80WBCV?H-y3G96H7~I4696u`!K__j;ZcK<&DGpE|vr0P) z3XPZ-mJbCcFrvaBAz!IwSx)85_@)bB3wTb)m;h%~a4P7~L@mFd4rD#ol@eu+ryf?D z{vhSL)A?DI(waPE08}zdN#U ze*F3D09#vIg!s69<{sA z&;Avl7Y(_LhSX%eH%(K(X3y3A0HTiSsD=H|Wbonza8r3Qm`H}HYblGAT6FINOKoXR z=n#cZEO!lo>uczF1z#RAoQEeTD^l=wVWdL%09N?pjT+6PKz+t(yI0w~dZC54ky)I_ zaKXjS8K$M+a{Os5Roi_0 z4O!{yJ~h~N6`rHcP16AoK<a(glK<9;> zyyrTB>Gxn~z4<||N@;(K6TXgg4^K{8NAg)kY6V|gulhc^-r(hI>IENRz$Q#|r_6s( zDU`8+zxYLk#=uxr)Z3I_1{xiRq+k^=CEO0czGvip7pF0;!Fw7CJ7vhuXJJvbW5@(nZJ+SoOYXI#}X}n z|L=U8eIOm{zW?-hmcIY*?r*;TKMKWR9R4LCfhTgm5B&G|xc~o^bblaP%Ky*w5=UI% z1L|0p{|Ei0{O|AdH~Ie<%P|Cjv6?eW zNUA4+E@e{lacL|S0-n8cL3kb1-IZwl90ab<6qKR=+YTY&;M2+R>3K4~4 zUbStn{|4^d2?0Xy*{eEWuap1C3W|I1?%f literal 0 HcmV?d00001 From cfcf40f6abd736222bb344fc9ce450ed3abbfaaf Mon Sep 17 00:00:00 2001 From: Deepthi S Kumar Date: Mon, 12 Apr 2021 15:16:21 -0700 Subject: [PATCH 4/7] rm prometheus changes --- automation/services/prometheus/prometheus.j2 | 8 -------- 1 file changed, 8 deletions(-) diff --git a/automation/services/prometheus/prometheus.j2 b/automation/services/prometheus/prometheus.j2 index e253ad45259..6aa0aa488db 100644 --- a/automation/services/prometheus/prometheus.j2 +++ b/automation/services/prometheus/prometheus.j2 @@ -49,8 +49,6 @@ scrape_configs: target_label: testnet - source_labels: [__meta_ec2_tag_role] target_label: role - - source_labels: [__meta_ec2_tag_status] - target_label: status - job_name: 'coda-us-west-1' scrape_interval: "5s" @@ -72,8 +70,6 @@ scrape_configs: target_label: testnet - source_labels: [__meta_ec2_tag_role] target_label: role - - source_labels: [__meta_ec2_tag_status] - target_label: status - job_name: 'coda-us-east-1' scrape_interval: "5s" @@ -95,8 +91,6 @@ scrape_configs: target_label: testnet - source_labels: [__meta_ec2_tag_role] target_label: role - - source_labels: [__meta_ec2_tag_status] - target_label: status - job_name: 'coda-us-east-2' scrape_interval: "5s" @@ -118,8 +112,6 @@ scrape_configs: target_label: testnet - source_labels: [__meta_ec2_tag_role] target_label: role - - source_labels: [__meta_ec2_tag_status] - target_label: status {% if CODA_METRICS_URI is defined %} - job_name: "coda" From 3aa9b888024d311b795f2e1d3834b26d707b9dfb Mon Sep 17 00:00:00 2001 From: Deepthi S Kumar Date: Mon, 12 Apr 2021 15:28:57 -0700 Subject: [PATCH 5/7] update helm chart version to be used --- automation/terraform/modules/kubernetes/testnet/helm.tf | 8 ++++---- helm/archive-node/templates/archive.yaml | 4 ++-- helm/block-producer/templates/block-producer.yaml | 2 +- helm/seed-node/Chart.yaml | 3 +-- helm/seed-node/templates/seed-node.yaml | 2 +- helm/snark-worker/Chart.yaml | 3 +-- helm/snark-worker/templates/snark-coordinator.yaml | 2 +- helm/watchdog/Chart.yaml | 3 +-- 8 files changed, 12 insertions(+), 15 deletions(-) diff --git a/automation/terraform/modules/kubernetes/testnet/helm.tf b/automation/terraform/modules/kubernetes/testnet/helm.tf index dbe7feaa489..debefab4303 100644 --- a/automation/terraform/modules/kubernetes/testnet/helm.tf +++ b/automation/terraform/modules/kubernetes/testnet/helm.tf @@ -26,7 +26,7 @@ resource "helm_release" "seeds" { name = "${var.testnet_name}-seeds" repository = var.use_local_charts ? "" : local.mina_helm_repo chart = var.use_local_charts ? "../../../../helm/seed-node" : "seed-node" - version = "1.0.3" + version = "1.0.4" namespace = kubernetes_namespace.testnet_namespace.metadata[0].name values = [ yamlencode(local.seed_vars) @@ -47,7 +47,7 @@ resource "helm_release" "block_producers" { name = "${var.testnet_name}-block-producers" repository = var.use_local_charts ? "" : local.mina_helm_repo chart = var.use_local_charts ? "../../../../helm/block-producer" : "block-producer" - version = "1.0.1" + version = "1.0.3" namespace = kubernetes_namespace.testnet_namespace.metadata[0].name values = [ yamlencode(local.block_producer_vars) @@ -66,7 +66,7 @@ resource "helm_release" "snark_workers" { name = "${var.testnet_name}-snark-worker" repository = var.use_local_charts ? "" : local.mina_helm_repo chart = var.use_local_charts ? "../../../../helm/snark-worker" : "snark-worker" - version = "1.0.1" + version = "1.0.2" namespace = kubernetes_namespace.testnet_namespace.metadata[0].name values = [ yamlencode(local.snark_worker_vars) @@ -85,7 +85,7 @@ resource "helm_release" "archive_node" { name = "archive-${count.index + 1}" repository = var.use_local_charts ? "" : local.mina_helm_repo chart = var.use_local_charts ? "../../../../helm/archive-node" : "archive-node" - version = "1.0.1" + version = "1.0.3" namespace = kubernetes_namespace.testnet_namespace.metadata[0].name values = [ yamlencode(local.archive_vars[count.index]) diff --git a/helm/archive-node/templates/archive.yaml b/helm/archive-node/templates/archive.yaml index 0aa2e1856f8..1cddf399046 100644 --- a/helm/archive-node/templates/archive.yaml +++ b/helm/archive-node/templates/archive.yaml @@ -17,7 +17,7 @@ spec: role: archive-node version: {{ trunc 6 (split ":" .Values.coda.image)._1 | trimSuffix "-" }} {{- if .Values.archive.enableLocalDaemon }} - syncStatus: init + syncStatus: INIT {{- end }} annotations: prometheus.io/scrape: 'true' @@ -95,7 +95,7 @@ spec: protocol: TCP containerPort: {{ .Values.coda.ports.p2p }} hostPort: {{ .Values.coda.ports.p2p }} -{{$name := include "archive-node.fullname" . }} +{{$name := include "archive-node.fullname" . }} {{$data := dict "name" $name "healthcheck" $.Values.healthcheck }} {{- include "healthcheck.daemon.allChecks" $data | indent 8 }} imagePullPolicy: Always diff --git a/helm/block-producer/templates/block-producer.yaml b/helm/block-producer/templates/block-producer.yaml index ebb13e7795f..2057abdbabf 100644 --- a/helm/block-producer/templates/block-producer.yaml +++ b/helm/block-producer/templates/block-producer.yaml @@ -18,7 +18,7 @@ spec: role: block-producer class: {{ default "undefined" $config.class }} version: {{ trunc 6 (split ":" $.Values.coda.image)._1 | trimSuffix "-" }} - syncStatus: init + syncStatus: INIT annotations: prometheus.io/scrape: 'true' prometheus.io/port: {{ $.Values.coda.ports.metrics | quote }} diff --git a/helm/seed-node/Chart.yaml b/helm/seed-node/Chart.yaml index 3d93b326ed0..0f249d956cc 100644 --- a/helm/seed-node/Chart.yaml +++ b/helm/seed-node/Chart.yaml @@ -11,8 +11,7 @@ annotations: dependencies: - name: common-utilities version: 0.0.9 - repository: "file://../common/" -# repository: "https://coda-charts.storage.googleapis.com" + repository: "https://coda-charts.storage.googleapis.com" icon: https://storage.googleapis.com/coda-charts/Mina_Icon_Secondary_RGB_Black.png keywords: - seed diff --git a/helm/seed-node/templates/seed-node.yaml b/helm/seed-node/templates/seed-node.yaml index 7fa160e672f..02ff1f7b6ba 100644 --- a/helm/seed-node/templates/seed-node.yaml +++ b/helm/seed-node/templates/seed-node.yaml @@ -18,7 +18,7 @@ spec: role: seed class: {{ default "undefined" $config.class }} version: {{ trunc 6 (split ":" $.Values.coda.image)._1 | trimSuffix "-" }} - syncStatus: init + syncStatus: INIT annotations: prometheus.io/scrape: 'true' prometheus.io/port: {{ $.Values.coda.ports.metrics | quote }} diff --git a/helm/snark-worker/Chart.yaml b/helm/snark-worker/Chart.yaml index 40427f39024..92dc5ea56ea 100644 --- a/helm/snark-worker/Chart.yaml +++ b/helm/snark-worker/Chart.yaml @@ -10,8 +10,7 @@ annotations: dependencies: - name: common-utilities version: 0.0.9 - repository: "file://../common/" -# repository: "https://coda-charts.storage.googleapis.com" + repository: "https://coda-charts.storage.googleapis.com" icon: https://storage.googleapis.com/coda-charts/Mina_Icon_Secondary_RGB_Black.png keywords: - snarks diff --git a/helm/snark-worker/templates/snark-coordinator.yaml b/helm/snark-worker/templates/snark-coordinator.yaml index 0ff33edcd7d..23ec86e37b6 100644 --- a/helm/snark-worker/templates/snark-coordinator.yaml +++ b/helm/snark-worker/templates/snark-coordinator.yaml @@ -17,7 +17,7 @@ spec: testnet: {{ .Values.testnetName }} role: snark-coordinator version: {{ trunc 6 (split ":" .Values.coda.image)._1 | trimSuffix "-" }} - syncStatus: init + syncStatus: INIT annotations: prometheus.io/scrape: 'true' prometheus.io/port: {{ .Values.coda.ports.metrics | quote }} diff --git a/helm/watchdog/Chart.yaml b/helm/watchdog/Chart.yaml index 39c4e4c90ec..7ab94b52dba 100644 --- a/helm/watchdog/Chart.yaml +++ b/helm/watchdog/Chart.yaml @@ -11,8 +11,7 @@ annotations: dependencies: - name: common-utilities version: 0.0.9 - repository: "file://../common/" -# repository: "https://coda-charts.storage.googleapis.com" + repository: "https://coda-charts.storage.googleapis.com" icon: https://storage.googleapis.com/coda-charts/Mina_Icon_Secondary_RGB_Black.png keywords: - watchdog From c6256cfd8d6dbeccd1d8b17deb8f0fc011523e09 Mon Sep 17 00:00:00 2001 From: Deepthi S Kumar Date: Wed, 14 Apr 2021 15:31:35 -0700 Subject: [PATCH 6/7] move kubectl installation to Dockerfile-coda-daemon --- automation/bake/Dockerfile | 4 ---- dockerfiles/Dockerfile-coda-daemon | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/automation/bake/Dockerfile b/automation/bake/Dockerfile index dde2c4cd9c1..a9cc255bb0e 100644 --- a/automation/bake/Dockerfile +++ b/automation/bake/Dockerfile @@ -8,10 +8,6 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages. RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - -RUN apt-get update && apt-get install -y google-cloud-sdk - -RUN apt-get update && apt-get install -y kubectl - ARG COMMIT_HASH=master ARG TESTNET_NAME=testworld ARG CONFIG_FILE="/root/daemon.json" diff --git a/dockerfiles/Dockerfile-coda-daemon b/dockerfiles/Dockerfile-coda-daemon index 662dfea6a86..6b48ffb8430 100644 --- a/dockerfiles/Dockerfile-coda-daemon +++ b/dockerfiles/Dockerfile-coda-daemon @@ -24,6 +24,8 @@ RUN apt-get -y update && \ apt-transport-https \ ca-certificates \ dnsutils \ + google-cloud-sdk \ + kubectl \ tzdata && \ rm -rf /var/lib/apt/lists/* From d9bcf77eca011a98fd178c47ebc24b52d994ced1 Mon Sep 17 00:00:00 2001 From: Deepthi S Kumar Date: Wed, 14 Apr 2021 17:41:52 -0700 Subject: [PATCH 7/7] update source list --- automation/bake/Dockerfile | 6 ------ dockerfiles/Dockerfile-coda-daemon | 9 +++++++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/automation/bake/Dockerfile b/automation/bake/Dockerfile index a9cc255bb0e..10af594a571 100644 --- a/automation/bake/Dockerfile +++ b/automation/bake/Dockerfile @@ -2,12 +2,6 @@ ARG BAKE_VERSION FROM codaprotocol/coda-daemon:${BAKE_VERSION} -RUN apt-get update && apt-get install -y gnupg2 - -RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list - -RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - - ARG COMMIT_HASH=master ARG TESTNET_NAME=testworld ARG CONFIG_FILE="/root/daemon.json" diff --git a/dockerfiles/Dockerfile-coda-daemon b/dockerfiles/Dockerfile-coda-daemon index 6b48ffb8430..a841a04c6e2 100644 --- a/dockerfiles/Dockerfile-coda-daemon +++ b/dockerfiles/Dockerfile-coda-daemon @@ -24,11 +24,16 @@ RUN apt-get -y update && \ apt-transport-https \ ca-certificates \ dnsutils \ - google-cloud-sdk \ - kubectl \ + gnupg2 \ tzdata && \ rm -rf /var/lib/apt/lists/* +RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list + +RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - + +RUN apt-get update && apt-get install -y google-cloud-sdk kubectl + # coda package RUN echo "deb [trusted=yes] http://packages.o1test.net $deb_repo main" > /etc/apt/sources.list.d/o1.list \ && apt-get update \