Merge branch 'main' into wh/link-tap-single-rotation

linkerd · Oct 11, 2023 · 1df70f7 · 1df70f7
2 parents 4318b70 + 00f9366
commit 1df70f7
Show file tree

Hide file tree

Showing 314 changed files with 24,109 additions and 1,204 deletions.
diff --git a/.devcontainer/on-create.sh b/.devcontainer/on-create.sh
@@ -5,7 +5,7 @@ set -euo pipefail
 cd $(mktemp -d)
 
 # hugo
-scurl -O https://github.com/gohugoio/hugo/releases/download/v0.61.0/hugo_extended_0.61.0_Linux-64bit.deb
+scurl -O https://github.com/gohugoio/hugo/releases/download/v0.119.0/hugo_extended_0.119.0_linux-amd64.deb
 sudo dpkg -i hugo*.deb
 rm hugo*.deb
 

diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml
@@ -3,18 +3,23 @@ name: install
 on:
   pull_request:
     paths:
-      - Makefile
-      - run.linkerd.io/public/install*
+    - Makefile
+    - run.linkerd.io/public/install*
 
 jobs:
   lint:
     name: Lint install script
     runs-on: ubuntu-latest
     container:
-      image: buoyantio/website-builder:v1.3.3
+      image: ghcr.io/linkerd/dev:v39
+      options: --user root
     steps:
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
+
+    - name: On create
+      run: |
+        .devcontainer/on-create.sh
 
     - name: Lint install script
       run: |

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -12,11 +12,15 @@ jobs:
     name: Publish
     runs-on: ubuntu-latest
     container:
-      image: buoyantio/website-builder:v1.3.3
-
+      image: ghcr.io/linkerd/dev:v39
+      options: --user root
     steps:
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
+
+    - name: On create
+      run: |
+        .devcontainer/on-create.sh
 
     - name: Setup gcloud
       env:
@@ -28,3 +32,5 @@ jobs:
     - name: Publish
       run: |-
         make publish
+        gsutil -m setmeta -r -h "Cache-Control: no-cache, no-store, must-revalidate" gs://linkerd.io/
+        gsutil -m setmeta -r -h "Cache-Control:" gs://linkerd.io/
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -3,22 +3,27 @@ name: validate
 on:
   pull_request:
     paths:
-      - linkerd.io/**
+    - linkerd.io/**
 
 jobs:
   linkerd_io:
     name: Validate generated HTML
     runs-on: ubuntu-latest
     container:
-      image: buoyantio/website-builder:v1.3.3
+      image: ghcr.io/linkerd/dev:v39
+      options: --user root
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
+    - name: Checkout code
+      uses: actions/checkout@v4
 
-      - name: Lint markdown
-        run: |
-          make lint
+    - name: On create
+      run: |
+        .devcontainer/on-create.sh
 
-      - name: Lint html and check for dead links
-        run: |
-          make check
+    - name: Lint markdown
+      run: |
+        make lint
+
+    - name: Lint html and check for dead links
+      run: |
+        make check
diff --git a/Makefile b/Makefile
@@ -6,8 +6,6 @@ RELEASE_URL = https://github.com/linkerd/linkerd2/releases
 export L5D2_STABLE_VERSION ?= "stable-X.X.X"
 export L5D2_EDGE_VERSION ?= "edge-X.X.X"
 
-export BUILD_IMAGE ?= buoyantio/website-builder:v1.3.3
-
 GIT_BRANCH = $(shell git rev-parse --abbrev-ref HEAD)
 GIT_HASH = $(shell git log --pretty=format:'%h' -n 1)
 
@@ -149,17 +147,3 @@ has-env-%:
 .PHONY: clean
 clean:
 	rm -rf tmp
-
-.PHONY: update-build-image
-update-build-image: docker-build docker-push
-	@# Build and push the build image
-
-.PHONY: docker-build
-docker-build:
-	@# Build the build image
-	docker build -t $(BUILD_IMAGE) .
-
-.PHONY: docker-push
-docker-push:
-	@# Push the build image
-	docker push $(BUILD_IMAGE)
diff --git a/README.md b/README.md
@@ -10,10 +10,10 @@ Source code for the linkerd.io website.
    ```bash
    docker run \
       --mount type=bind,source="$(pwd)",target=/website --workdir=/website \
-      buoyantio/website-builder:v1.3.3 sh -c "make lint check"
+      ghcr.io/linkerd/dev:v39 sh -c ".devcontainer/on-create.sh && make lint check"
    ```
 
-1. Install Hugo 0.74.3 to run the site locally:
+1. Install Hugo 0.119.0 to run the site locally:
 
    For Mac users:
 

diff --git a/linkerd.io/.gitignore b/linkerd.io/.gitignore
@@ -1,2 +1,3 @@
 public/
 resources/
+.hugo_build.lock
diff --git a/linkerd.io/assets/scss/_navbar.scss b/linkerd.io/assets/scss/_navbar.scss
@@ -1,51 +1,39 @@
 .navbar-menu {
 	position: relative;
-  &.is-active {
-    // text-align: center;
-  }
 }
 
 .navbar-item-helper {
+  font-size: 16px;
+  font-weight: 600;
   svg {
     margin-right: 5px;
   }
-  .button-spacer {
-    display: inline-block;
-    padding: 19px 21px;
-    height: 56px;
-    line-height: 16px;
-    border: 1px solid $white;
-    border-radius: 8px;
-
-    .navbar-item:hover & {
-      border: 1px solid $primary-bright-blue;
-    }
-  }
 }
 
 .navbar.is-fixed-top {
   z-index: 100000;
 }
 
 .navbar {
-  transition: box-shadow 0.4s;
+  box-shadow: 0 4px 4px 0 rgba(0, 0, 0, 0.05);
   img {
-    width: 210px;
+    width: 160px;
     max-height: none;
   }
 
   .dropdown {
   	position: static;
   	@include desktop {
   		position: relative;
+      align-items: center;
   	}
   }
 
   .dropdown-menu {
   	top: 0;
   	width: 100%;
   	height: 100%;
-  	background-color: $navy-black;
+  	background-color: white;
   	@include desktop {
   		top: 100%;
   		width: auto;
@@ -55,25 +43,24 @@
   }
 
   .dropdown-item {
-  	color: white;
-  	@include desktop {
-  		color: $navy-black;
-  	}
+    background-color: transparent;
+  	color: $deep-blue;
   }
+
   .dropdown-item:hover {
-  	background-color: $navy-black;
+  	background-color: transparent;
   	color: $primary-bright-blue;
   	@include desktop {
-	    background-color: white;
 	    color: $primary-bright-blue;
   	}
   }
-  .dropdown button:not(.back),
-  .dropdown button:focus {
+
+  .dropdown .dropdown-trigger button,
+  .dropdown .dropdown-trigger button:focus {
     outline: none;
     background: transparent;
     border: none;
-    font-size: 18px;
+    font-size: 16px;
     cursor: pointer;
     padding-right: 28px;
 
@@ -86,39 +73,45 @@
       top: 50%;
       right: 0;
       transform: translateY(-50%);
-      background: url("/images/icon-chevron-down.svg");
+      background: url("/images/icon-chevron-down-blue.svg");
     }
   }
 
-  button.back {
+  .dropdown.is-active .dropdown-trigger button:after {
+    transform: translateY(-50%) rotate(180deg);
+  }
+
+  .dropdown-menu button.back {
   	color: $primary-bright-blue;
   	background-color: transparent;
   	border: none;
+    font-size: 16px;
+    font-weight: 600;
+    cursor: pointer;
   	@include desktop {
   		display: none;
   	}
   }
 
-  .dropdown.is-active button:after {
-    transform: translateY(-50%) rotate(180deg);
-  }
-
   .dropdown-content {
-  	background-color: $navy-black;
+    box-shadow: none;
+  	background-color: white;
   	@include desktop {
-	    border-radius: 16px;
-	    border: 2px solid $primary-bright-blue;
-	    background-color: white;
+      box-shadow: $dropdown-shadow;
   	}
   }
-  .navbar-menu {
+
+  .navbar-start {
     box-shadow: none;
-    .navbar-item {
+    .navbar-item,
+    .dropdown-item {
       line-height: 1.5!important;
+      padding-left: 1rem;
+      padding-right: 1rem;
+      color: $deep-blue;
       &.is-active,
       &:hover {
         background: none;
-        color: $deep-blue;
       }
       &:hover {
         .navbar-item-helper {
@@ -127,10 +120,16 @@
       }
       &.is-active {
         .navbar-item-helper {
-          border-color: $primary-bright-blue;
+          color: $primary-bright-blue;
         }
       }
     }
   }
 }
 
+.github-stars {
+  span {
+    display: block;
+    height: 28px;
+  }     
+}