From 23344d951166ff50aaa6d66f0b49d9ca5e85eaf6 Mon Sep 17 00:00:00 2001 From: Nate W <4453979+nate-double-u@users.noreply.github.com> Date: Fri, 21 May 2021 21:38:17 +0000 Subject: [PATCH] Adding a Support & Training page. (#1076) - Removing enterprise page and replacing it with the new Support & Training page - Adding Introduction to K8s course - Adding redirect from enterprise -> support-training Signed-off-by: Nate W <4453979+nate-double-u@users.noreply.github.com> --- linkerd.io/content/enterprise.md | 25 ----- linkerd.io/content/support-training.md | 36 +++++++ .../layouts/partials/enterprise/support.html | 4 +- .../static/uploads/linux-foundation-logo.svg | 102 ++++++++++++++++++ netlify.toml | 5 + 5 files changed, 146 insertions(+), 26 deletions(-) delete mode 100644 linkerd.io/content/enterprise.md create mode 100644 linkerd.io/content/support-training.md create mode 100644 linkerd.io/static/uploads/linux-foundation-logo.svg diff --git a/linkerd.io/content/enterprise.md b/linkerd.io/content/enterprise.md deleted file mode 100644 index cfea1e1641..0000000000 --- a/linkerd.io/content/enterprise.md +++ /dev/null @@ -1,25 +0,0 @@ ---- -description: Lists companies that provide commercial support for Linkerd. -title: Enterprise -layout: enterprise -type: enterprise -weight: "1" -support: - bottom_description: Offering Linkerd support? Add your company! - description: '' - title: 'Companies offering commercial support and other enterprise offerings for - Linkerd:' - buttons: - - caption: Create Pull Request - url: https://github.com/linkerd/website/pulls - companies: - - description: Buoyant is the original creator of Linkerd and provides support, - training, and enterprise products. - thumbnail: "/uploads/buoyant_logo_icon-only_primary.svg" - title: Buoyant - url: https://buoyant.io/linkerd-support/ -menu: - top: - weight: 4 - ---- diff --git a/linkerd.io/content/support-training.md b/linkerd.io/content/support-training.md new file mode 100644 index 0000000000..0530a06d39 --- /dev/null +++ b/linkerd.io/content/support-training.md @@ -0,0 +1,36 @@ +--- +description: Lists of educational resources and companies that provide commercial support for Linkerd. +title: Support & Training +layout: enterprise +type: enterprise +weight: "1" +menu: + top: + weight: 4 + +support: + kinds: + - title: 'Courses' + entries: + - description: Introduction to Service Mesh with Linkerd | edx + thumbnail: "/uploads/linux-foundation-logo.svg" + title: The Linux Foundation + url: https://www.edx.org/course/introduction-to-service-mesh-with-linkerd + - description: Introduction to Kubernetes | edx + thumbnail: "/uploads/linux-foundation-logo.svg" + title: The Linux Foundation + url: https://www.edx.org/course/introduction-to-kubernetes + - title: 'Commercial support' + entries: + - description: Buoyant is the original creator of Linkerd and provides support, training, and enterprise products. + thumbnail: "/uploads/buoyant_logo_icon-only_primary.svg" + title: Buoyant + url: https://buoyant.io/linkerd-support/ + + bottom_description: Offering Linkerd support? Add your company! + description: '' + buttons: + - caption: Edit this page + url: https://github.com/linkerd/website/edit/main/linkerd.io/content/support-training.md +--- + diff --git a/linkerd.io/layouts/partials/enterprise/support.html b/linkerd.io/layouts/partials/enterprise/support.html index 6688fa6991..9fdf8029a0 100644 --- a/linkerd.io/layouts/partials/enterprise/support.html +++ b/linkerd.io/layouts/partials/enterprise/support.html @@ -1,9 +1,10 @@
+ {{ range .kinds }}

{{.title}}

{{.description | markdownify}}
- {{ range .companies }} + {{ range .entries }}
@@ -29,6 +30,7 @@
{{.description | markdownify}}
{{ end }}
+ {{ end }}
{{.bottom_description | markdownify}}
{{ range .buttons }} diff --git a/linkerd.io/static/uploads/linux-foundation-logo.svg b/linkerd.io/static/uploads/linux-foundation-logo.svg new file mode 100644 index 0000000000..d407b8b335 --- /dev/null +++ b/linkerd.io/static/uploads/linux-foundation-logo.svg @@ -0,0 +1,102 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/netlify.toml b/netlify.toml index 5aa98611ee..cb79fc1282 100644 --- a/netlify.toml +++ b/netlify.toml @@ -11,3 +11,8 @@ command = "make preview-build" [context.branch-deploy] command = "make preview-build" + +[[redirects]] + from = "/enterprise" + to = "/support-training/" + status = 301