Merge branch 'main' into wmorgan-patch-1

linkerd.io/assets/scss/styles.scss

@@ -289,6 +289,27 @@
 
 .community-card {
   height: 100%;
+  position: relative;
+  &.highlight {
+    background-color: #EAF3FA;
+  }
+}
+.emeritus{
+  position: absolute;
+  right: 1rem;
+  padding: 0 0.8rem;
+  top: 1rem;
+  width: auto;
+  background-color: #64f9bf;
+  border-radius: 25px;
+  font-size: 0.9rem;
+  @media (max-width: 912px) {
+    right: 0;
+    top: 0;
+    padding: 0 0.7rem;
+    font-size: 0.7rem;
+    border-radius: 0px;
+  }
 }
 
 .adopters-case-studies__quote {

linkerd.io/content/blog/2024/0701-edge-release-roundup.md

@@ -0,0 +1,122 @@
+---
+author: 'flynn'
+date: 2024-07-01T00:00:00Z
+title: |-
+  Linkerd Edge Release Roundup: July 2024
+url:
+  /2024/07/01/linkerd-edge-release-roundup/
+description: |-
+  What you need to know about the most recent Linkerd edge releases, July 2024 edition!
+thumbnail: '/uploads/2023/06/roundup-clocks-square.png'
+featuredImage: '/uploads/2024/07/roundup-07-featured.png'
+tags: [Linkerd, linkerd, edge, release, roundup]
+featured: false
+---
+
+{{< fig
+  alt="July 2024 Linkerd Edge Release Roundup"
+  src="/uploads/2023/06/roundup-clocks-rect.png" >}}
+
+Welcome to the July 2024 Edge Release Roundup post, where we dive into the
+most recent edge releases to help keep everyone up to date on the latest and
+greatest!
+
+## How to give feedback
+
+Remember, edge releases are a snapshot of our current development work on
+`main`; by definition, they always have the most recent features but they may
+have incomplete features, features that end up getting rolled back later, or
+(like all software) even bugs. That said, edge releases *are* intended for
+production use, and go through a rigorous set of automated and manual tests
+before being released.
+
+We would be delighted to hear how these releases work out for you! You can
+open [a GitHub issue](https://github.com/linkerd/linkerd2/issues/) or
+[discussion](https://github.com/linkerd/linkerd2/discussions/), join us on
+[Slack](https://slack.linkerd.io), or visit the [Buoyant Linkerd
+Forum](https://linkerd.buoyant.io) -- all are great ways to reach us.
+
+## Community contributions
+
+We couldn't do what we do without the Linkerd community, and this batch of
+releases is definitely no exception. Huge thanks to [Adrian Callejas] and
+[John Howard] for their contributions! You'll find more information about all
+of these contributions in the release-by-release details below.
+
+[Adrian Callejas]: https://github.com/acallejaszu
+[John Howard]: https://github.com/howardjohn
+
+## Recommendations and breaking changes
+
+All these releases are recommended for general use, but there are two breaking
+changes:
+
+- First, as of `edge-24.6.2`, we change the proxy's `/shutdown` endpoint to
+  disabled by default. If you want to reenable it, you'll need to set
+  `proxy.enableShutdownEndpoint` to `true` on installation or upgrade.
+
+- Second, as of `edge-24.6.4`, it's no longer possible - or necessary! - to
+  explicitly set the resource requests for `proxy-init`. There's more
+  information on this in the section for `edge-24.6.4`.
+
+## The releases
+
+We've mostly been fixing bugs in these edge releases. Of course, each edge
+release has _many_ dependency updates; we won't list them all here, but you
+can find them in the release notes for each release.
+
+### [`edge-24.6.4`](https://github.com/linkerd/linkerd2/releases/tag/edge-24.6.4) (June 27, 2024)
+
+This release changes the proxy-init container to always request the same
+amount of memory and CPU as the proxy itself, and removes the ability to
+explicitly set proxy-init's requests because there's now no need to do so.
+(This doesn't increase the resources required for the pod as a
+whole, because the proxy-init container completes before the proxy
+starts, letting the proxy reuse resources requested by the proxy-init
+container. For full details, check out [issue #11320][comment]).
+
+[comment]: https://github.com/linkerd/linkerd2/issues/11320#issuecomment-2186383081
+
+It also continues work on upcoming GRPCRoute support. Finally, if
+`proxy.logHTTPHeaders` is somehow empty, it correctly defaults to "off".
+
+### [`edge-24.6.3`](https://github.com/linkerd/linkerd2/releases/tag/edge-24.6.3) (June 20, 2024)
+
+`edge-24.6.3` adds the `linkerd.io/control-plane-ns` label to the
+`ext-namespace-metadata-linkerd-config` Role, for parity with the other
+resources created when installing Linkerd.
+
+### [`edge-24.6.2`](https://github.com/linkerd/linkerd2/releases/tag/edge-24.6.2) (June 14, 2024)
+
+Starting in this release, the proxy's `/shutdown` endpoint is disabled by default. It can be reenabled by setting `proxy.enableShutdownEndpoint` to `true` when installing or upgrading. Beyond that, `edge-24.6.2` fixes several bugs: EndpointSlices with no `hostname` field are supported (thanks, [Adrian Callejas]!), DNS resolution errors are correctly logged (and the resolver's log level can be configured), the proxy's administration endpoints function correctly on systems using IPv4-mapped IPv6, and the init container and CNI plugin will not attempt to start on systems that configure IPv6 but don't support `ip6tables`. Finally, it supports controlling whether or not HTTP headers are logged in debug output (with the default being "not"), JSON output for the link, unlink, allow, and allow-scrapes CLI commands, and fixes a typo in the output of  `linkerd diagnostics` (thanks, [John Howard]!)
+
+### [`edge-24.6.1`](https://github.com/linkerd/linkerd2/releases/tag/edge-24.6.1) (June 10, 2024)
+
+This release adds support for JSON output to `linkerd install` and related commands.
+
+## Installing the latest edge release
+
+Installing the latest edge release needs just a single command.
+
+```bash
+curl --proto '=https' --tlsv1.2 -sSfL https://run.linkerd.io/install-edge | sh
+```
+
+You can also [install edge releases with Helm](https://linkerd.io/2.15/tasks/install-helm/).
+
+## Linkerd is for everyone
+
+Linkerd is a graduated project of the [Cloud Native Computing
+Foundation](https://cncf.io/). Linkerd is [committed to open
+governance.](/2019/10/03/linkerds-commitment-to-open-governance/) If you have
+feature requests, questions, or comments, we'd love to have you join our
+rapidly-growing community! Linkerd is hosted on
+[GitHub](https://github.com/linkerd/), and we have a thriving community on
+[Slack](https://slack.linkerd.io/), [Twitter](https://twitter.com/linkerd), and
+in [mailing lists](/community/get-involved/). Come and join the fun!
+
+----
+
+_Linkerd generally does new edge releases weekly; watch this space to keep
+up-to-date. Feedback on this blog series is welcome! Just ping `@flynn` on the
+[Linkerd Slack](https://slack.linkerd.io)._

linkerd.io/content/community/ambassadors/_index.md

@@ -17,65 +17,75 @@ ambassadors:
     job_title: Field Engineer
     image: /images/ambassadors/profile/charles-pretzer.png
     flag: 🇺🇸
+    highlight: false
     github: https://github.com/cpretzer
     linkedin: https://www.linkedin.com/in/charlespretzer/
   - name: Chris Campbell
     job_title: Cloud Software Engineer
     image: /images/ambassadors/profile/chris-campbell.png
     flag: 🇺🇸
+    highlight: false
     github: https://github.com/campbel
     twitter: https://twitter.com/ChrsCmpbl
     linkedin: https://www.linkedin.com/in/chris-campbell-28410839/
   - name: Christian Hüning
     job_title: Director of Cloud Technologies
     image: /images/ambassadors/profile/christian-huning.png
     flag: 🇩🇪
+    highlight: false
     github: https://github.com/christianhuening
     twitter: https://twitter.com/chrishuen
     linkedin: https://www.linkedin.com/in/christian-h%C3%BCning-964191a3/
   - name: Dominik Táskai
     job_title: Junior DevOps Engineer
     image: /images/ambassadors/profile/dominik-taskai.jpg
     flag: 🇭🇺
+    highlight: false
     github: https://github.com/dtaskai
     linkedin: https://www.linkedin.com/in/dtaskai/
   - name: Eli Goldberg
     job_title: Platform Team Lead
     image: /images/ambassadors/profile/eli-goldberg.jpeg
     flag: 🇮🇱
+    highlight: false
     github: https://github.com/Eli-Goldberg
     twitter: https://twitter.com/EliG0ldberg
     linkedin: https://www.linkedin.com/in/eli-go/
   - name: Fredrik Klingenberg
     job_title: Developer
     image: /images/ambassadors/profile/fredrik-klingenberg.png
     flag: 🇳🇴
+    highlight: false
     github: https://github.com/fredrkl
     twitter: https://twitter.com/fredrkl
     linkedin: https://www.linkedin.com/in/fredrikklingenberg/
-  - name: Kasper Nissen
-    job_title: Lead Platform Architect
-    image: /images/ambassadors/profile/kasper-nissen.png
-    flag: 🇩🇰
-    github: https://github.com/kaspernissen
-    twitter: https://twitter.com/phennex
-    linkedin: https://www.linkedin.com/in/kaspernissen/
   - name: María Teresa Rojas
     job_title: SRE
     image: /images/ambassadors/profile/maria-rojas.png
     flag: 🇵🇹
+    highlight: false
     github: https://github.com/mtrojas
     linkedin: https://www.linkedin.com/in/mtrojas/
   - name: Sergio Méndez
     job_title: DevOps Engineer
     image: /images/ambassadors/profile/sergio-mendez.png
     flag: 🇬🇹
+    highlight: false
     github: https://github.com/sergioarmgpl
     twitter: https://twitter.com/sergioarmgpl
     linkedin: https://www.linkedin.com/in/sergioarmgpl/
   - name: Steve Gray
     job_title: Founder & CEO
     image: '/images/ambassadors/profile/steve-gray.png'
     flag: 🇦🇺
+    highlight: false
     linkedin: https://www.linkedin.com/in/eventualconsistency/
+  - name: Kasper Nissen
+    job_title: Lead Platform Architect
+    image: /images/ambassadors/profile/kasper-nissen.png
+    flag: 🇩🇰
+    highlight: true
+    github: https://github.com/kaspernissen
+    twitter: https://twitter.com/phennex
+    linkedin: https://www.linkedin.com/in/kaspernissen/
 ---

linkerd.io/layouts/partials/community/ambassadors/ambassadors.html

@@ -3,32 +3,67 @@
     <div class="columns column is-multiline">
         {{ range . }}
         <div class="column is-6">
+
+          {{ if .highlight }}
+          <div class="box is-flex is-justify-content-flex-start is-align-items-center px-5 py-5 community-card highlight">
+            <figure class="image is-128x128 mr-4 is-flex-shrink-0">
+              <img class="is-rounded" src="{{ .image }}" alt="{{ .name }}" />
+            </figure>
+            <div>
+              <h3 class="is-size-5 has-text-weight-bold">{{ .name }} {{ .flag }}</h3>
+              <p class="has-text-weight-light mb-2">{{ .job_title }}</p>
+
+                  <div class="is-flex">
+                    {{ with .github }}
+                      <a class="is-block mr-2" href="{{ . }}" target="_blank" rel="noopener noreferrer">       
+                          <img class="image is-32x32" src="/images/ambassadors/github-icon-navy.svg" alt="github icon">
+                      </a>
+                    {{ end }}
+                    {{ with .twitter }}
+                      <a class="is-block mr-2" href="{{ . }}" target="_blank" rel="noopener noreferrer">
+                          <img class="image is-32x32" src="/images/ambassadors/twitter-icon-navy.svg" alt="twitter icon">
+                      </a>
+                    {{ end }}
+                    {{ with .linkedin }}
+                      <a class="is-block mr-2" href="{{ . }}" target="_blank" rel="noopener noreferrer">
+                          <img class="image is-32x32" src="/images/ambassadors/linkedin-icon-navy.svg" alt="linkedin icon">
+                      </a>
+                    {{ end }}
+                  </div>
+            </div>
+
+            <div class="emeritus">Emeritus</div>
+
+          </div>
+          {{ else }}
           <div class="box is-flex is-justify-content-flex-start is-align-items-center px-5 py-5 community-card">
             <figure class="image is-128x128 mr-4 is-flex-shrink-0">
               <img class="is-rounded" src="{{ .image }}" alt="{{ .name }}" />
             </figure>
             <div>
               <h3 class="is-size-5 has-text-weight-bold">{{ .name }} {{ .flag }}</h3>
               <p class="has-text-weight-light mb-2">{{ .job_title }}</p>
-              <div class="is-flex">
-                {{ with .github }}
-                  <a class="is-block mr-2" href="{{ . }}" target="_blank" rel="noopener noreferrer">
-                    <img class="image is-32x32" src="/images/ambassadors/github-icon.svg" alt="github icon">
-                  </a>
-                {{ end }}
-                {{ with .twitter }}
-                  <a class="is-block mr-2" href="{{ . }}" target="_blank" rel="noopener noreferrer">
-                    <img class="image is-32x32" src="/images/ambassadors/twitter-icon.svg" alt="twitter icon">
-                  </a>
-                {{ end }}
-                {{ with .linkedin }}
-                  <a class="is-block mr-2" href="{{ . }}" target="_blank" rel="noopener noreferrer">
-                    <img class="image is-32x32" src="/images/ambassadors/linkedin-icon.svg" alt="linkedin icon">
-                  </a>
-                {{ end }}
-              </div>
+
+                  <div class="is-flex">
+                    {{ with .github }}
+                      <a class="is-block mr-2" href="{{ . }}" target="_blank" rel="noopener noreferrer">       
+                          <img class="image is-32x32" src="/images/ambassadors/github-icon.svg" alt="github icon">
+                      </a>
+                    {{ end }}
+                    {{ with .twitter }}
+                      <a class="is-block mr-2" href="{{ . }}" target="_blank" rel="noopener noreferrer">
+                          <img class="image is-32x32" src="/images/ambassadors/twitter-icon.svg" alt="twitter icon">
+                      </a>
+                    {{ end }}
+                    {{ with .linkedin }}
+                      <a class="is-block mr-2" href="{{ . }}" target="_blank" rel="noopener noreferrer">
+                          <img class="image is-32x32" src="/images/ambassadors/linkedin-icon.svg" alt="linkedin icon">
+                      </a>
+                    {{ end }}
+                  </div>           
             </div>
           </div>
+          {{ end }}
         </div>
         {{ end }}
     </div>

linkerd.io/layouts/partials/docs.html

@@ -1,7 +1,7 @@
 {{ $latestVersion := site.Params.latest_linkerd2_stable_version }}
-{{ $pathParts := split .page.File.Path "/" }}
-{{ $docsVersion := index $pathParts 0 }}
-{{ $latestDocsPath := delimit (append (after 1 $pathParts) (slice "" $latestVersion)) "/" }}
+{{ $pathParts := split .page.Path "/" }}
+{{ $docsVersion := index $pathParts 1 }}
+{{ $latestDocsPath := delimit (append (after 2 $pathParts) (slice "" $latestVersion)) "/" }}
 
 <div class="wrapper docs">
   <div class="columns is-fullwidth is-gapless is-tablet">