Merge branch 'main' into alpeb/prune-allowlist

linkerd · May 7, 2024 · 8c77a32 · 8c77a32
2 parents c3bb73e + 2cc7563
commit 8c77a32
Show file tree

Hide file tree

Showing 14 changed files with 393 additions and 135 deletions.
diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml
@@ -36,7 +36,7 @@ jobs:
       run: |
         make build-run.linkerd.io
 
-    - uses: actions/[email protected].1
+    - uses: actions/[email protected].3
       with:
         name: run.linkerd.io
         path: tmp/run.linkerd.io/public
@@ -50,7 +50,7 @@ jobs:
     needs: [build]
 
     steps:
-    - uses: actions/[email protected].2
+    - uses: actions/[email protected].7
       with:
         name: run.linkerd.io
 

diff --git a/linkerd.io/content/2-edge/getting-started/_index.md b/linkerd.io/content/2-edge/getting-started/_index.md
@@ -42,7 +42,7 @@ more](https://kubernetes.io/docs/setup/).)
 Validate your Kubernetes setup by running:
 
 ```bash
-kubectl version --short
+kubectl version
 ```
 
 You should see output with both a `Client Version` and `Server Version`

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>

diff --git a/linkerd.io/content/2.15/getting-started/_index.md b/linkerd.io/content/2.15/getting-started/_index.md
@@ -38,7 +38,7 @@ more](https://kubernetes.io/docs/setup/).)
 Validate your Kubernetes setup by running:
 
 ```bash
-kubectl version --short
+kubectl version
 ```
 
 You should see output with both a `Client Version` and `Server Version`