From 63bec1a2f5e6fa9f95eb27ac31d294c8b1b93913 Mon Sep 17 00:00:00 2001
From: Oliver Gould <ver@buoyant.io>
Date: Fri, 6 Dec 2024 10:20:45 -0800
Subject: [PATCH] build(deps): update linkerd/dev from v30 to v44 (#1895)

Co-authored-by: Flynn <kflynn@users.noreply.github.com>
---
 .devcontainer/devcontainer.json    | 2 +-
 .github/workflows/install.yml      | 9 ++-------
 .github/workflows/publish.yml      | 4 +---
 .github/workflows/validate.yml     | 8 +++-----
 README.md                          | 8 ++++----
 run.linkerd.io/public/install      | 2 +-
 run.linkerd.io/public/install-edge | 2 +-
 7 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 89ef2d11..f5e4dad1 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
     "name": "linkerd-website",
-    "image": "ghcr.io/linkerd/dev:v30",
+    "image": "ghcr.io/linkerd/dev:v44",
     "onCreateCommand": ".devcontainer/on-create.sh",
     "extensions": [
         "DavidAnson.vscode-markdownlint",
diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml
index 85dd6e60..7eb1217d 100644
--- a/.github/workflows/install.yml
+++ b/.github/workflows/install.yml
@@ -3,6 +3,7 @@ name: install
 on:
   pull_request:
     paths:
+    - .github/workflows/install.yml
     - Makefile
     - run.linkerd.io/public/install*
 
@@ -10,17 +11,11 @@ jobs:
   lint:
     name: Lint install script
     runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/linkerd/dev:v39
-      options: --user root
     steps:
+    - uses: linkerd/dev/actions/setup-tools@v44
     - name: Checkout code
       uses: actions/checkout@v4
 
-    - name: On create
-      run: |
-        .devcontainer/on-create.sh
-
     - name: Lint install script
       run: |
         make shellcheck
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 1d896d32..f332e165 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -11,10 +11,8 @@ jobs:
   publish:
     name: Publish
     runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/linkerd/dev:v39
-      options: --user root
     steps:
+    - uses: linkerd/dev/actions/setup-tools@v44
     - name: Checkout code
       uses: actions/checkout@v4
 
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 6b99afa8..d88d05b3 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -3,22 +3,20 @@ name: validate
 on:
   pull_request:
     paths:
+    - .github/workflows/validate.yml
     - linkerd.io/**
 
 jobs:
   linkerd_io:
     name: Validate generated HTML
     runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/linkerd/dev:v39
-      options: --user root
     steps:
+    - uses: linkerd/dev/actions/setup-tools@v44
     - name: Checkout code
       uses: actions/checkout@v4
 
     - name: On create
-      run: |
-        .devcontainer/on-create.sh
+      run: .devcontainer/on-create.sh
 
     - name: Lint markdown
       run: |
diff --git a/README.md b/README.md
index 0dec535d..acd71200 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Source code for the linkerd.io website.
    ```bash
    docker run \
       --mount type=bind,source="$(pwd)",target=/website --workdir=/website \
-      ghcr.io/linkerd/dev:v39 sh -c ".devcontainer/on-create.sh && make lint check"
+      ghcr.io/linkerd/dev:v44 sh -c ".devcontainer/on-create.sh && make lint check"
    ```
 
 1. Install Hugo to run the site locally:
@@ -109,13 +109,13 @@ main from slate-linkerd and add it to the public dir.
 
 ### Notes
 
-- This does not update api.linkerd.io, see the section for that specifically to
+* This does not update api.linkerd.io, see the section for that specifically to
   update it.
 
-- There is no caching in front of run.linkerd.io and versioncheck.linkerd.io.
+* There is no caching in front of run.linkerd.io and versioncheck.linkerd.io.
   You should see updates there immediately.
 
-- There is caching for non-html pages in front of linkerd.io. If you're updating
+* There is caching for non-html pages in front of linkerd.io. If you're updating
   a non-html page for linkerd.io, it might be worth flushing the cache
   (cloudflare) and waiting awhile.
 
diff --git a/run.linkerd.io/public/install b/run.linkerd.io/public/install
index 9bd565d2..1acb20f9 100755
--- a/run.linkerd.io/public/install
+++ b/run.linkerd.io/public/install
@@ -114,7 +114,7 @@ case $OS in
     exit 1
     ;;
 esac
-OS=$(echo $OS | tr '[:upper:]' '[:lower:]')
+OS=$(echo "$OS" | tr '[:upper:]' '[:lower:]')
 
 checksumbin=$(command -v openssl) || checksumbin=$(command -v shasum) || {
   echo "Failed to find checksum binary. Please install openssl or shasum."
diff --git a/run.linkerd.io/public/install-edge b/run.linkerd.io/public/install-edge
index b78b8421..dc8ad8bc 100755
--- a/run.linkerd.io/public/install-edge
+++ b/run.linkerd.io/public/install-edge
@@ -101,7 +101,7 @@ case $OS in
     exit 1
     ;;
 esac
-OS=$(echo $OS | tr '[:upper:]' '[:lower:]')
+OS=$(echo "$OS" | tr '[:upper:]' '[:lower:]')
 
 checksumbin=$(command -v openssl) || checksumbin=$(command -v shasum) || {
   echo "Failed to find checksum binary. Please install openssl or shasum."