Merge remote-tracking branch 'origin/main' into fix/localnet-path-tilt

pokt-network · Nov 1, 2024 · 274d8e1 · 274d8e1
2 parents 0fa4aa1 + bae452a
commit 274d8e1
Show file tree

Hide file tree

Showing 113 changed files with 5,636 additions and 479 deletions.
diff --git a/.github/workflows/label-actions.yml b/.github/workflows/label-actions.yml
@@ -18,5 +18,5 @@ jobs:
   action:
     runs-on: ubuntu-latest
     steps:
-      # TODO: switch to `dessant/label-actions@v3` when https://github.com/dessant/label-actions/pull/29 is merged.
+      # TODO_TECHDEBT: switch to `dessant/label-actions@v3` when https://github.com/dessant/label-actions/pull/29 is merged.
       - uses: okdas/label-actions@patch-1
diff --git a/Tiltfile b/Tiltfile
@@ -6,7 +6,7 @@ load("ext://deployment", "deployment_create")
 load("ext://execute_in_pod", "execute_in_pod")
 
 # A list of directories where changes trigger a hot-reload of the validator
-hot_reload_dirs = ["app", "cmd", "tools", "x", "pkg"]
+hot_reload_dirs = ["app", "cmd", "tools", "x", "pkg", "telemetry"]
 
 
 def merge_dicts(base, updates):
@@ -38,16 +38,27 @@ localnet_config_defaults = {
         "enabled": True,
         "grafana": {"defaultDashboardsEnabled": False},
     },
-    "relayminers": {"count": 1, "delve": {"enabled": False}},
+    "relayminers": {
+        "count": 1,
+        "delve": {"enabled": False},
+        "logs": {
+            "level": "debug",
+        },
+    },
     "gateways": {
         "count": 1,
         "delve": {"enabled": False},
+        "logs": {
+            "level": "debug",
+        },
     },
     "appgateservers": {
         "count": 1,
         "delve": {"enabled": False},
+        "logs": {
+            "level": "debug",
+        },
     },
-    # TODO_BLOCKER(@red-0ne, #511): Add support for `REST` and enabled this.
     "ollama": {
         "enabled": False,
         "model": "qwen:0.5b",
@@ -116,8 +127,10 @@ if localnet_config["observability"]["enabled"]:
     helm_repo("prometheus-community", "https://prometheus-community.github.io/helm-charts")
     helm_repo("grafana-helm-repo", "https://grafana.github.io/helm-charts")
 
-    # Increase timeout for building the image
-    update_settings(k8s_upsert_timeout_secs=60)
+    # Timeout is increased to 120 seconds (default is 30) because a slow internet connection
+    # could timeout pulling the image.
+    # container images.
+    update_settings(k8s_upsert_timeout_secs=120)
 
     helm_resource(
         "observability",
@@ -242,6 +255,7 @@ helm_resource(
         "--set=logs.format=" + str(localnet_config["validator"]["logs"]["format"]),
         "--set=serviceMonitor.enabled=" + str(localnet_config["observability"]["enabled"]),
         "--set=development.delve.enabled=" + str(localnet_config["validator"]["delve"]["enabled"]),
+        "--set=image.repository=poktrolld",
     ],
     image_deps=["poktrolld"],
     image_keys=[("image.repository", "image.tag")],
@@ -260,6 +274,8 @@ for x in range(localnet_config["relayminers"]["count"]):
             "--values=./localnet/kubernetes/values-relayminer-" + str(actor_number) + ".yaml",
             "--set=metrics.serviceMonitor.enabled=" + str(localnet_config["observability"]["enabled"]),
             "--set=development.delve.enabled=" + str(localnet_config["relayminers"]["delve"]["enabled"]),
+            "--set=logLevel=" + str(localnet_config["relayminers"]["logs"]["level"]),
+            "--set=image.repository=poktrolld",
         ],
         image_deps=["poktrolld"],
         image_keys=[("image.repository", "image.tag")],
@@ -300,6 +316,8 @@ for x in range(localnet_config["appgateservers"]["count"]):
             "--set=config.signing_key=app" + str(actor_number),
             "--set=metrics.serviceMonitor.enabled=" + str(localnet_config["observability"]["enabled"]),
             "--set=development.delve.enabled=" + str(localnet_config["appgateservers"]["delve"]["enabled"]),
+            "--set=logLevel=" + str(localnet_config["appgateservers"]["logs"]["level"]),
+            "--set=image.repository=poktrolld",
         ],
         image_deps=["poktrolld"],
         image_keys=[("image.repository", "image.tag")],
@@ -341,6 +359,8 @@ for x in range(localnet_config["gateways"]["count"]):
             "--set=config.signing_key=gateway" + str(actor_number),
             "--set=metrics.serviceMonitor.enabled=" + str(localnet_config["observability"]["enabled"]),
             "--set=development.delve.enabled=" + str(localnet_config["gateways"]["delve"]["enabled"]),
+            "--set=logLevel=" + str(localnet_config["gateways"]["logs"]["level"]),
+            "--set=image.repository=poktrolld",
         ],
         image_deps=["poktrolld"],
         image_keys=[("image.repository", "image.tag")],