Cherry-pick 03af0cd with conflicts

vitessio · Sep 13, 2024 · 6d0c1ff · 6d0c1ff
1 parent 53ba5c0
commit 6d0c1ff
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/examples/common/scripts/vtadmin-up.sh b/examples/common/scripts/vtadmin-up.sh
@@ -43,7 +43,7 @@ vtadmin \
   --alsologtostderr \
   --rbac \
   --rbac-config="${script_dir}/../vtadmin/rbac.yaml" \
-  --cluster "id=${cluster_name},name=${cluster_name},discovery=staticfile,discovery-staticfile-path=${script_dir}/../vtadmin/discovery.json,tablet-fqdn-tmpl=http://{{ .Tablet.Hostname }}:15{{ .Tablet.Alias.Uid }}" \
+  --cluster "id=${cluster_name},name=${cluster_name},discovery=staticfile,discovery-staticfile-path=${script_dir}/../vtadmin/discovery.json,tablet-fqdn-tmpl=http://{{ .Tablet.Hostname }}:15{{ .Tablet.Alias.Uid }},schema-cache-default-expiration=1m" \
   > "${log_dir}/vtadmin-api.out" 2>&1 &
 
 vtadmin_api_pid=$!

diff --git a/web/vtadmin/package-lock.json b/web/vtadmin/package-lock.json
diff --git a/web/vtadmin/package.json b/web/vtadmin/package.json
@@ -19,6 +19,7 @@
     "highcharts-react-official": "^3.1.0",
     "history": "^5.3.0",
     "lodash-es": "^4.17.21",
+    "path-to-regexp": "^8.1.0",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-preset-env": "^8.0.1",
     "query-string": "^7.1.3",