Replace l5d version site params with the release version variable (ku…

…bernetes#354) * remove l5d2_version from config.toml Signed-off-by: Dennis Adjei-Baah <dennis@buoyant.io>
mikutas · Jul 15, 2019 · 11e1480 · 11e1480
1 parent a86babd
commit 11e1480
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 14 deletions.
diff --git a/linkerd.io/config.toml b/linkerd.io/config.toml
@@ -62,8 +62,6 @@ section = ["HTML", "JSON"]
 [params]
 description = "Linkerd is an ultralight service mesh for Kubernetes. It gives you observability, reliability, and security without requiring any code changes."
 images = [""]
-l5d2_edge_version = "L5D2_EDGE_VERSION"
-l5d2_release_version = "L5D2_STABLE_VERSION"
 latest_release_date = "2019-05-10"
 latest_release_version = "1.6.3"
 logo = "/images/identity/svg/linkerd_primary_color_white.svg"

diff --git a/linkerd.io/content/_index.md b/linkerd.io/content/_index.md
@@ -14,7 +14,7 @@ top_hero:
     url: /community/
   image_on_the_right: false
 announcement_banner:
-  description: Linkerd 2.4 has been released! [Read the announcement >](2019/07/11/announcing-linkerd-2.4/)
+  description: L5D2_STABLE_VERSION has been released! [Read the announcement >](2019/07/11/announcing-linkerd-2.4/)
 description: Linkerd is a service mesh for Kubernetes and beyond. It gives you
   observability, reliability, and security without requiring any changes to your
   code.

diff --git a/linkerd.io/content/dashboard/20190606.md b/linkerd.io/content/dashboard/20190606.md
@@ -7,4 +7,4 @@ draft: true
 We are pleased to announce that
 [Linkerd2 stable-2.3.2](https://github.com/linkerd/linkerd2/releases/tag/stable-2.3.2)
 has been released! This stable release fixes a memory leak in the proxy. Full
-release notes are available [here.](https://lists.cncf.io/g/cncf-linkerd-dev/message/129)
+release notes are available [here.](https://lists.cncf.io/g/cncf-linkerd-dev/message/129)
diff --git a/linkerd.io/content/dashboard/20190619.md b/linkerd.io/content/dashboard/20190619.md
@@ -9,4 +9,4 @@ Hansen (Microsoft) for this month’s Linkerd community meeting. We’ll chat ab
 Linkerd 2.4, Kinvolk's Linkerd and Istio benchmarks, Microsoft's Service Mesh
 Interface, and Linkerd 2.5 and beyond.
 
-Sign up: [https://www.meetup.com/Linkerd-Online-Community-Meetup/events/262208328/](https://www.meetup.com/Linkerd-Online-Community-Meetup/events/262208328/)
+Sign up: [https://www.meetup.com/Linkerd-Online-Community-Meetup/events/262208328/](https://www.meetup.com/Linkerd-Online-Community-Meetup/events/262208328/)
diff --git a/linkerd.io/content/dashboard/announcing-linkerd2-stable-2-3-2.md b/linkerd.io/content/dashboard/announcing-linkerd2-stable-2-3-2.md
@@ -3,4 +3,10 @@ date = "2019-07-11T15:29:04-07:00"
 title = "Announcing Linkerd 2.4 stable"
 
 +++
-We are pleased to announce that [Linkerd 2.4 stable](https://github.com/linkerd/linkerd2/releases/tag/stable-2.4.0) has been released! This release adds traffic splitting functionality, support for the Kubernetes Service Mesh Interface (SMI), graduates high-availability support out of experimental status, and adds a tremendous list of other improvements, performance enhancements, and bug fixes. Full release notes are available [here.](https://lists.cncf.io/g/cncf-linkerd-dev/topic/announcing_linkerd2/32431552?p=,,,20,0,0,0::recentpostdate%2Fsticky,,,20,2,0,32431552)
+We are pleased to announce that
+[Linkerd 2.4 stable](https://github.com/linkerd/linkerd2/releases/tag/stable-2.4.0)
+has been released! This release adds traffic splitting functionality, support
+for the Kubernetes Service Mesh Interface (SMI), graduates high-availability
+support out of experimental status, and adds a tremendous list of other improvements,
+performance enhancements, and bug fixes. Full release notes are available
+[here.](https://lists.cncf.io/g/cncf-linkerd-dev/topic/announcing_linkerd2/32431552?p=,,,20,0,0,0::recentpostdate%2Fsticky,,,20,2,0,32431552)
diff --git a/...erd.io/content/dashboard/join-us-linkerd-community-meeting-on-june-27-9-am-1.md b/...erd.io/content/dashboard/join-us-linkerd-community-meeting-on-june-27-9-am-1.md
@@ -3,6 +3,8 @@ date = "2019-07-12T11:22:10-07:00"
 title = "Join us: Linkerd community meeting on July 31, 9 am"
 
 +++
-On Wed, July 31 @ 9 am (PT), Join Oliver, Thomas, and special guests (to be announced) for this month’s Linkerd community meeting. We’ll chat about Linkerd 2.4, Linkerd security audit, Flagger + Linkerd, and Linkerd 2.5.
+On Wed, July 31 @ 9 am (PT), Join Oliver, Thomas, and special guests
+(to be announced) for this month’s Linkerd community meeting. We’ll chat about
+Linkerd 2.4, Linkerd security audit, Flagger + Linkerd, and Linkerd 2.5.
 
-Sign up: [https://www.meetup.com/Linkerd-Online-Community-Meetup/events/262624182/](https://www.meetup.com/Linkerd-Online-Community-Meetup/events/262624182/ "https://www.meetup.com/Linkerd-Online-Community-Meetup/events/262624182/")
+Sign up: [https://www.meetup.com/Linkerd-Online-Community-Meetup/events/262624182/](https://www.meetup.com/Linkerd-Online-Community-Meetup/events/262624182/)
diff --git a/linkerd.io/layouts/partials/1/sidebar.html b/linkerd.io/layouts/partials/1/sidebar.html
@@ -19,7 +19,7 @@
           Linkerd 2.x
         </div>
         <a class="navbar-item" href="/2/overview/">
-          {{ site.Params.l5d2_release_version }}
+          L5D2_STABLE_VERSION
         </a>
       </div>
     </div>
@@ -67,4 +67,4 @@
       </a>
     </div>
   </div>
-</div>
+</div>
diff --git a/linkerd.io/layouts/partials/2/sidebar.html b/linkerd.io/layouts/partials/2/sidebar.html
@@ -19,7 +19,7 @@
           Linkerd 2.x
         </div>
         <a class="navbar-item" href="/2/overview/">
-          {{ site.Params.l5d2_release_version }}
+          L5D2_STABLE_VERSION
         </a>
       </div>
     </div>
@@ -63,4 +63,4 @@
       </a>
     </div>
   </div>
-</div>
+</div>
diff --git a/linkerd.io/layouts/shortcodes/latestedge.html b/linkerd.io/layouts/shortcodes/latestedge.html
@@ -1 +1 @@
-{{ site.Params.l5d2_edge_version }}
+L5D2_EDGE_VERSION
diff --git a/linkerd.io/layouts/shortcodes/latestversion.html b/linkerd.io/layouts/shortcodes/latestversion.html
@@ -1 +1 @@
-{{ if eq .Page.Section "1" }}{{ site.Params.latest_release_version }}{{ else }}{{ site.Params.l5d2_release_version }}{{ end }}{{- "" -}}
+{{ if eq .Page.Section "1" }}{{ site.Params.latest_release_version }}{{ else }}L5D2_STABLE_VERSION{{ end }}{{- "" -}}