Merge branch 'main' into wm/update-getting-started

linkerd · May 7, 2024 · 3f978c3 · 3f978c3
2 parents 501464a + 7b4826a
commit 3f978c3
Show file tree

Hide file tree

Showing 11 changed files with 373 additions and 127 deletions.
diff --git a/.devcontainer/on-create.sh b/.devcontainer/on-create.sh
@@ -22,4 +22,4 @@ echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.clou
 scurl https://packages.cloud.google.com/apt/doc/apt-key.gpg \
     | sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add -
 sudo apt-get update
-sudo apt-get install google-cloud-cli
+sudo apt-get install -y google-cloud-cli
diff --git a/linkerd.io/content/2.10/checks/index.html b/linkerd.io/content/2.10/checks/index.html
@@ -6,7 +6,7 @@
     <script type="text/javascript">
     window.onload = function() {
       var hash = window.location.hash;
-      window.location.href = window.location.origin + "/2.10/tasks/troubleshooting/" + hash;
+      window.location.href = window.location.origin + "/2/tasks/troubleshooting/" + hash;
     }
     </script>
     <title>Linkerd Check Redirection</title>

diff --git a/linkerd.io/content/2.11/checks/index.html b/linkerd.io/content/2.11/checks/index.html
@@ -6,7 +6,7 @@
     <script type="text/javascript">
     window.onload = function() {
       var hash = window.location.hash;
-      window.location.href = window.location.origin + "/2.11/tasks/troubleshooting/" + hash;
+      window.location.href = window.location.origin + "/2/tasks/troubleshooting/" + hash;
     }
     </script>
     <title>Linkerd Check Redirection</title>

diff --git a/linkerd.io/content/2.12/checks/index.html b/linkerd.io/content/2.12/checks/index.html
@@ -6,7 +6,7 @@
     <script type="text/javascript">
     window.onload = function() {
       var hash = window.location.hash;
-      window.location.href = window.location.origin + "/2.12/tasks/troubleshooting/" + hash;
+      window.location.href = window.location.origin + "/2/tasks/troubleshooting/" + hash;
     }
     </script>
     <title>Linkerd Check Redirection</title>

diff --git a/linkerd.io/content/2.13/checks/index.html b/linkerd.io/content/2.13/checks/index.html
@@ -6,7 +6,7 @@
     <script type="text/javascript">
     window.onload = function() {
       var hash = window.location.hash;
-      window.location.href = window.location.origin + "/2.13/tasks/troubleshooting/" + hash;
+      window.location.href = window.location.origin + "/2/tasks/troubleshooting/" + hash;
     }
     </script>
     <title>Linkerd Check Redirection</title>

diff --git a/linkerd.io/content/2.14/checks/index.html b/linkerd.io/content/2.14/checks/index.html
@@ -6,7 +6,7 @@
     <script type="text/javascript">
     window.onload = function() {
       var hash = window.location.hash;
-      window.location.href = window.location.origin + "/2.15/tasks/troubleshooting/" + hash;
+      window.location.href = window.location.origin + "/2/tasks/troubleshooting/" + hash;
     }
     </script>
     <title>Linkerd Check Redirection</title>

diff --git a/linkerd.io/content/2.15/checks/index.html b/linkerd.io/content/2.15/checks/index.html
@@ -6,7 +6,7 @@
     <script type="text/javascript">
     window.onload = function() {
       var hash = window.location.hash;
-      window.location.href = window.location.origin + "/2.14/tasks/troubleshooting/" + hash;
+      window.location.href = window.location.origin + "/2/tasks/troubleshooting/" + hash;
     }
     </script>
     <title>Linkerd Check Redirection</title>