diff --git a/.devcontainer/on-create.sh b/.devcontainer/on-create.sh index 157e336e78..18fe321c5f 100755 --- 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 index 91a82eb875..9670278174 100644 --- 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 index 8a277832f7..a5f06db028 100644 --- 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: diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 32d827a2d1..6b99afa8b5 100644 --- 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 index 5122fe0368..2b368ce26f 100644 --- 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 index 9f741c0870..1879530b46 100644 --- 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 index 73ab8769f9..e4b8c67d3d 100644 --- a/linkerd.io/.gitignore +++ b/linkerd.io/.gitignore @@ -1,2 +1,3 @@ public/ resources/ +.hugo_build.lock \ No newline at end of file diff --git a/linkerd.io/assets/scss/_navbar.scss b/linkerd.io/assets/scss/_navbar.scss index f2e132eb12..6e0b818c97 100644 --- a/linkerd.io/assets/scss/_navbar.scss +++ b/linkerd.io/assets/scss/_navbar.scss @@ -103,7 +103,8 @@ .navbar-start { box-shadow: none; - .navbar-item { + .navbar-item, + .dropdown-item { line-height: 1.5!important; padding-left: 1rem; padding-right: 1rem; diff --git a/linkerd.io/config.toml b/linkerd.io/config.toml deleted file mode 100644 index 2f30b9d5eb..0000000000 --- a/linkerd.io/config.toml +++ /dev/null @@ -1,120 +0,0 @@ -ignoreErrors = ["error-remote-getjson"] -paginate = 10 -baseurl = "https://linkerd.io/" -disableKinds = ["taxonomy", "taxonomyTerm"] -enableRobotsTXT = true -languageCode = "en-US" -sectionPagesMenu = "main" -theme = "buoyant" -title = "Linkerd" -[markup] - defaultMarkdownHandler = "blackfriday" - [markup.blackFriday] - angledQuotes = false - footnoteAnchorPrefix = "" - footnoteReturnLinkContents = "" - fractions = true - hrefTargetBlank = true - latexDashes = true - nofollowLinks = false - noreferrerLinks = false - plainIDAnchors = true - skipHTML = false - smartDashes = true - smartypants = true - smartypantsQuotesNBSP = false - taskLists = true -[mediaTypes."text/netlify"] -delimiter = "" -[[menu.community]] -name = "Slack" -url = "https://slack.linkerd.io/" -weight = 2 -[[menu.community]] -name = "GitHub" -url = "https://github.com/linkerd/linkerd2" -weight = 1 -[[menu.follow]] -name = "Twitter" -url = "https://twitter.com/linkerd" -weight = 3 -[[menu.follow]] -name = "YouTube" -url = "https://www.youtube.com/buoyantio" -weight = 1 -[[menu.top]] -identifier = "documentation" -name = "Docs" -url = "/docs/" -weight = 1 -[[menu.top]] -identifier = "community" -name = "Community" -url = "/community/" -weight = 2 -[[menu.top]] -identifier = "get-involved" -name = "Get Involved" -url = "/community/get-involved/" -weight = 2 -parent = "community" -[[menu.top]] -identifier = "community-adopters" -name = "Adopters" -url = "/community/adopters/" -weight = 3 -parent = "community" -[[menu.top]] -identifier = "linkerd-ambassadors" -url = "/community/ambassadors/" -name = "Linkerd Ambassadors" -weight = 4 -parent = "community" -[[menu.top]] -identifier = "community-heroes" -name = "Linkerd Heroes" -url = "/community/heroes/" -weight = 5 -parent = "community" -[[menu.top]] -identifier = "buoyants-linkerd-forum" -name = "Buoyant's Linkerd Forum" -url = "https://linkerd.buoyant.io" -weight = 6 -parent = "community" -[[menu.top]] -identifier = "blog" -name = "Blog" -url = "/blog/" -weight = 3 -[[menu.top]] -identifier = "faq" -name = "FAQ" -url = "/faq/" -weight = 4 -[[menu.cta]] -identifier = "join-forum" -name = "Join Forum" -url = "https://linkerd.buoyant.io" -[outputFormats.REDIRECTS] -baseName = "_redirects" -mediaType = "text/netlify" -[outputFormats.RSS] -mediatype = "application/RSS" -baseName = "feed" -[outputs] -home = ["HTML", "RSS", "REDIRECTS"] -section = ["HTML", "RSS", "JSON"] -[params] -description = "Linkerd is an ultralight service mesh for Kubernetes. It gives you observability, reliability, and security without requiring any code changes." -images = [""] -latest_release_date = "2022-05-31" -latest_release_version = "1.7.5" -latest_linkerd2_stable_version = "2.14" -logo = "/images/identity/png/transparent_background/1x/linkerd_primary_color_black_transparent.png" -[permalinks] -blog = "/:year/:month/:day/:slug/" -[privacy.twitter] -disable = false -enableDNT = false -simple = false diff --git a/linkerd.io/content/_index.md b/linkerd.io/content/_index.md index f1f629e99f..3ba66a4d36 100644 --- a/linkerd.io/content/_index.md +++ b/linkerd.io/content/_index.md @@ -8,7 +8,7 @@ keywords: outputs: - html announcement_banner: - description: "2023-08-23 **[Announcing Linkerd 2.14 with enterprise multi-cluster and Gateway API conformance! ![Read now](/uploads/announcement-banner-learn-more.svg)](/2023/08/23/announcing-linkerd-2.14/)**" + description: "2023-08-23 [Announcing Linkerd 2.14 with enterprise multi-cluster and Gateway API conformance! ![Read now](/uploads/announcement-banner-learn-more.svg)](/2023/08/23/announcing-linkerd-2.14/)" top_hero: title: The world's most advanced service mesh description: Enterprise power *without* enterprise complexity. Linkerd adds diff --git a/linkerd.io/content/blog/announcing-linkerd-2-6.md b/linkerd.io/content/blog/announcing-linkerd-2-6.md index 120fd9bacb..bcf0513e1f 100644 --- a/linkerd.io/content/blog/announcing-linkerd-2-6.md +++ b/linkerd.io/content/blog/announcing-linkerd-2-6.md @@ -41,7 +41,7 @@ load even on small ones. Second, the dashboard now includes a visualization of the [traffic split feature for canary deployments](/2.10/features/traffic-split/), which is already causing some excitement in the community: -{{< tweet 1177911622981083139 >}} +{{< tweet user="stefanprodan" id="1177911622981083139" >}} Finally, following up on our Helm work from the previous release, we're happy to announce that **Linkerd now has a public Helm repo**! We've published a diff --git a/linkerd.io/content/blog/announcing-linkerd-2-7.md b/linkerd.io/content/blog/announcing-linkerd-2-7.md index 189c5319af..b42c73015f 100644 --- a/linkerd.io/content/blog/announcing-linkerd-2-7.md +++ b/linkerd.io/content/blog/announcing-linkerd-2-7.md @@ -52,7 +52,7 @@ automatically rotated.) This new set of capabilities is already generating excitement in the community: -{{< tweet 1225709372594061322 >}} +{{< tweet user="zoltanreegn" id="1225709372594061322" >}} ## Improved dashboard diff --git a/linkerd.io/content/blog/design-principles.md b/linkerd.io/content/blog/design-principles.md index 235491587b..cd5bd22c9d 100644 --- a/linkerd.io/content/blog/design-principles.md +++ b/linkerd.io/content/blog/design-principles.md @@ -17,7 +17,7 @@ When we launched Linkerd 2.0 last September, it marked a substantial departure f A little over 6 months in and [already at Linkerd 2.3](https://linkerd.io/2019/04/16/announcing-linkerd-2.3/), the reception to these changes has been resoundingly positive: -{{< tweet 1091591745870139392 >}} +{{< tweet user="coleca" id="1091591745870139392" >}} While [the move from the JVM to Rust](https://www.infoq.com/articles/linkerd-v2-production-adoption) was a huge part of this success for Linkerd 2.0, just as important was our decision to codifying a set of core _product design principles_ for 2.0. These principles were based on a lesson we learned in our years of helping companies around the world get Linkerd 1.x into production: _while our users were getting tremendous value from Linkerd, they were paying a heavy price to get there_. This price was the time spent configuring, understanding, tuning, and operating Linkerd 1.x. diff --git a/linkerd.io/content/blog/happy-birthday-linkerd.md b/linkerd.io/content/blog/happy-birthday-linkerd.md index 54fd1ce587..0990e86902 100644 --- a/linkerd.io/content/blog/happy-birthday-linkerd.md +++ b/linkerd.io/content/blog/happy-birthday-linkerd.md @@ -87,16 +87,16 @@ project growing, and above all, Linkerd is your project. Here's to another incredible year together with you. 💪 -{{}} -{{}} -{{}} -{{}} -{{}} -{{}} -{{}} -{{}} -{{}} -{{}} +{{}} +{{}} +{{}} +{{}} +{{}} +{{}} +{{}} +{{}} +{{}} +{{}} ## Ready to try Linkerd? diff --git a/linkerd.io/content/blog/kubecon-eu-2019-linkerd-roundup.md b/linkerd.io/content/blog/kubecon-eu-2019-linkerd-roundup.md index 067c4705a7..ae89b82dee 100644 --- a/linkerd.io/content/blog/kubecon-eu-2019-linkerd-roundup.md +++ b/linkerd.io/content/blog/kubecon-eu-2019-linkerd-roundup.md @@ -56,7 +56,7 @@ users to automatically encrypt communication between functions! (You can read [the full guide here](https://github.com/openfaas-incubator/openfaas-linkerd2).) -{{< tweet 1129105603354333184 >}} +{{< tweet user="alexellisuk" id="1129105603354333184" >}} ## And, of course, lots and lots of talks! @@ -96,11 +96,11 @@ This was another great Kubecon for Linkerd. It was incredible to meet so many enthusiastic and friendly people, and we can't wait to do it all again this November in San Diego! -{{< tweet 1130789969293991936 >}} +{{< tweet user="wm" id="1130789969293991936" >}} -{{< tweet 1131493061916319744 >}} +{{< tweet user="bwplotka" id="1131493061916319744" >}} -{{< tweet 1130810652862373889 >}} +{{< tweet user="danielbryantuk" id="1130810652862373889" >}} --- diff --git a/linkerd.io/content/blog/kubecon-na-2019-linkerd-roundup.md b/linkerd.io/content/blog/kubecon-na-2019-linkerd-roundup.md index 0597273efb..e35e13d34d 100644 --- a/linkerd.io/content/blog/kubecon-na-2019-linkerd-roundup.md +++ b/linkerd.io/content/blog/kubecon-na-2019-linkerd-roundup.md @@ -85,11 +85,11 @@ This was another great Kubecon for Linkerd. As usual, the best part for me is the chance to meet other members of our enthusiastic and friendly community in person. I'm looking forward to doing more of the same next March in Amsterdam! -{{< tweet 1197335694856687616 >}} +{{< tweet user="LiliCosic" id="1197335694856687616" >}} -{{< tweet 1197953404154216448 >}} +{{< tweet user="DC_Corbin3" id="1197953404154216448" >}} -{{< tweet 1197348236198965249 >}} +{{< tweet user="eamonb" id="1197348236198965249" >}} ## Join us! diff --git a/linkerd.io/content/blog/linkerd-210-and-extensions.md b/linkerd.io/content/blog/linkerd-210-and-extensions.md index cfb1151b29..d462afe025 100644 --- a/linkerd.io/content/blog/linkerd-210-and-extensions.md +++ b/linkerd.io/content/blog/linkerd-210-and-extensions.md @@ -8,7 +8,7 @@ title = "Linkerd 2.10 and Extensions" featured = false +++ -![Zen garden](/uploads/kari-shea-B8JFJWzAC9s-unsplash.jpg") +![Zen garden](/uploads/kari-shea-B8JFJWzAC9s-unsplash.jpg) Linkerd is the smallest, simplest service mesh in the world. Since Linkerd 2.0, we've followed a philosophy of minimalism, composability, and building on top diff --git a/linkerd.io/content/blog/linkerd-and-open-governance.md b/linkerd.io/content/blog/linkerd-and-open-governance.md index 73b69821c8..8e45b27207 100644 --- a/linkerd.io/content/blog/linkerd-and-open-governance.md +++ b/linkerd.io/content/blog/linkerd-and-open-governance.md @@ -57,7 +57,7 @@ contributions are sponsored by Buoyant, that's an artifact of how Buoyant operates, not a statement of control. (We donated it to the CNCF for a reason!) As I said on Twitter: -{{< tweet 1179202957369323520 >}} +{{< tweet user="timpark" id="1179202957369323520" >}} We want your input, your help, and your guidance. Let's keep building this amazing project together. diff --git a/linkerd.io/content/blog/linkerd-istio-adoption.md b/linkerd.io/content/blog/linkerd-istio-adoption.md index bb877e5901..a1da184c44 100644 --- a/linkerd.io/content/blog/linkerd-istio-adoption.md +++ b/linkerd.io/content/blog/linkerd-istio-adoption.md @@ -67,8 +67,8 @@ learned about open source along the way: Focus on what's doing what's right for the user; build with empathy; and don't get distracted by the hype. The results, as they say, will speak for themselves. -{{< tweet 1384463767459844097 >}} -{{< tweet 1448333246366945281 >}} +{{< tweet user="urlichsanais" id="1384463767459844097" >}} +{{< tweet user="phennex" id="1448333246366945281" >}} ## Linkerd is for everyone diff --git a/linkerd.io/content/blog/linkerd-service-account-tokens.md b/linkerd.io/content/blog/linkerd-service-account-tokens.md index 71270ca78e..6a7d756b56 100644 --- a/linkerd.io/content/blog/linkerd-service-account-tokens.md +++ b/linkerd.io/content/blog/linkerd-service-account-tokens.md @@ -11,7 +11,7 @@ description: 'Linkerd recently moved to using bound service account tokens to fu keywords: [identity service-accounts] --- -![Locker](/uploads/jason-dent-3wPJxh-piRw-unsplash.jpg") +![Locker](/uploads/jason-dent-3wPJxh-piRw-unsplash.jpg) Security is a first-class concern for Linkerd. It plays a critical role in enhancing the overall security of the system, and this is only possible if Linkerd diff --git a/linkerd.io/content/blog/service-mesh-2022-recap-ebpf-gateway-api.md b/linkerd.io/content/blog/service-mesh-2022-recap-ebpf-gateway-api.md index b342378fc3..02236a3bad 100644 --- a/linkerd.io/content/blog/service-mesh-2022-recap-ebpf-gateway-api.md +++ b/linkerd.io/content/blog/service-mesh-2022-recap-ebpf-gateway-api.md @@ -148,7 +148,7 @@ dodo, however, we may have to suffer through a bit longer. Although, rumors swirl about another KEP... -{{< tweet 1591198130049257473 >}} +{{< tweet user="La_Rainette" id="1591198130049257473" >}} Further reading: [What really happens at startup: Linkerd, init containers, the CNI, and diff --git a/linkerd.io/content/blog/under-the-hood-of-linkerd-s-state-of-the-art-rust-proxy-linkerd2-proxy.md b/linkerd.io/content/blog/under-the-hood-of-linkerd-s-state-of-the-art-rust-proxy-linkerd2-proxy.md index eb1ec6e535..20ea270dd7 100644 --- a/linkerd.io/content/blog/under-the-hood-of-linkerd-s-state-of-the-art-rust-proxy-linkerd2-proxy.md +++ b/linkerd.io/content/blog/under-the-hood-of-linkerd-s-state-of-the-art-rust-proxy-linkerd2-proxy.md @@ -324,8 +324,8 @@ service mesh's unique requirements and making full use of Rust's impressive performance, security guarantees, and cutting-edge asynchronous networking stack, we believe Linkerd2-proxy is the secret sauce to Linkerd's success. -{{< tweet 1091591745870139392 >}} -{{< tweet 1274302614231044096 >}} +{{< tweet user="coleca" id="1091591745870139392" >}} +{{< tweet user="_dnjp" id="1274302614231044096" >}} So, do _you_ want to get involved in a cutting edge open source Rust project that's used in critical systems around the world? Great news, Linkerd is open diff --git a/linkerd.io/content/community/_index.md b/linkerd.io/content/community/_index.md new file mode 100644 index 0000000000..da79124867 --- /dev/null +++ b/linkerd.io/content/community/_index.md @@ -0,0 +1,6 @@ +--- +title: Community +--- + + + \ No newline at end of file diff --git a/linkerd.io/content/adopters/_index.md b/linkerd.io/content/community/adopters/_index.md similarity index 99% rename from linkerd.io/content/adopters/_index.md rename to linkerd.io/content/community/adopters/_index.md index 783c957112..3b8d14d0ef 100644 --- a/linkerd.io/content/adopters/_index.md +++ b/linkerd.io/content/community/adopters/_index.md @@ -1,6 +1,7 @@ --- title: Linkerd 2.x Adopters description: Here are some of the organizations we know are using Linkerd 2.x. If you're using Linkerd 2.x and aren't on this list, [please submit a pull request!](https://github.com/linkerd/linkerd2/edit/main/ADOPTERS.md) +layout: adopters case_studies: - image: /images/adopters/xbox.png alt: Xbox @@ -136,5 +137,4 @@ adopters: alt: Youmail - image: /images/adopters/Zimpler.png alt: Zimpler -url: /community/adopters/ --- diff --git a/linkerd.io/content/ambassadors/_index.md b/linkerd.io/content/community/ambassadors/_index.md similarity index 98% rename from linkerd.io/content/ambassadors/_index.md rename to linkerd.io/content/community/ambassadors/_index.md index 1588159d77..031b493702 100644 --- a/linkerd.io/content/ambassadors/_index.md +++ b/linkerd.io/content/community/ambassadors/_index.md @@ -4,9 +4,8 @@ description: "The Linkerd Ambassador badge is a distinction awarded to those community members who are experts in their field and who demonstrate expertise, passion, engagement, and a commitment to sharing their Linkerd experience." +layout: ambassadors thumbnail: "/uploads/ambassadors-emblem.png" -url: /community/ambassadors/ -layout: "ambassadors" top_hero: title: Linkerd Ambassadors image: diff --git a/linkerd.io/content/anchor/_index.md b/linkerd.io/content/community/anchor/_index.md similarity index 98% rename from linkerd.io/content/anchor/_index.md rename to linkerd.io/content/community/anchor/_index.md index 507d3aced9..a70c28817c 100644 --- a/linkerd.io/content/anchor/_index.md +++ b/linkerd.io/content/community/anchor/_index.md @@ -1,6 +1,7 @@ --- title: Becoming a Linkerd Community Anchor description: Are you passionate about Linkerd and sharing your experience with the broader community? We want to help you tell your story! +layout: anchor benefits: items: - '**Become a recognized expert** in the service mesh, cloud native, and @@ -14,7 +15,6 @@ benefits: confident about your writing skills? No worries. Bring the story and we'll help you tell it in an engaging way." title: Benefits -layout: anchor autopilot: true mid_message: |- If you are running Linkerd on a cool project, mission-critical application, or an interesting or complex use case — we’d love to hear from you. @@ -35,6 +35,4 @@ top_hero: image_alt: 'Become a linkerd Community Anchor' image_on_the_right: true title: 'Become a Linkerd Community Anchor' -type: community -url: community/anchor --- diff --git a/linkerd.io/content/get-involved/_index.md b/linkerd.io/content/community/get-involved/_index.md similarity index 97% rename from linkerd.io/content/get-involved/_index.md rename to linkerd.io/content/community/get-involved/_index.md index fb992d194d..59a7db4237 100644 --- a/linkerd.io/content/get-involved/_index.md +++ b/linkerd.io/content/community/get-involved/_index.md @@ -1,8 +1,8 @@ --- title: Get Involved -layout: get-involved.html description: Linkerd isn’t just the software, it’s the community around it—and that community begins with you. Join us! +layout: get-involved links: - image: "/images/get-involved/slack.svg" alt: Slack @@ -43,6 +43,4 @@ links: alt: Mailing list description: Finally, don’t forget to sign up to receive announcements and critical security updates on the [CNCF Linkerd mailing list.](https://lists.cncf.io/g/cncf-linkerd-users) -url: "/community/get-involved/" - --- diff --git a/linkerd.io/content/heroes/_index.md b/linkerd.io/content/community/heroes/_index.md similarity index 99% rename from linkerd.io/content/heroes/_index.md rename to linkerd.io/content/community/heroes/_index.md index ba51c4383c..c994ff5d34 100644 --- a/linkerd.io/content/heroes/_index.md +++ b/linkerd.io/content/community/heroes/_index.md @@ -1,12 +1,11 @@ --- title: Heroes -layout: heroes -url: /community/heroes/ aliases: ["/heroes/"] description: Open source is all about community, and Linkerd wouldn’t be what it is today without our heroes. Linkerd Heroes contribute to the codebase, help each other out on Slack and social media, and share their successes and failures at conferences or through blogs. +layout: heroes top_hero: title: Linkerd Heroes description: Open source is all about community, and Linkerd wouldn't be what it diff --git a/linkerd.io/content/enterprise.md b/linkerd.io/content/enterprise/_index.md similarity index 98% rename from linkerd.io/content/enterprise.md rename to linkerd.io/content/enterprise/_index.md index 193f46ff7c..2e1c8ecb95 100644 --- a/linkerd.io/content/enterprise.md +++ b/linkerd.io/content/enterprise/_index.md @@ -6,9 +6,6 @@ aliases: layout: enterprise type: enterprise weight: 1 -menu: - top: - weight: 5 top_hero: title: Linkerd Enterprise Support and Training description: "Linkerd was created by Buoyant and contributed to the Cloud Native Computing Foundation in 2017. It was the first service mesh to achieve graduated status, and today powers the critical production systems of enterprises around the world.\n\nHere, you'll find commercial products, support, and training for Linkerd." diff --git a/linkerd.io/hugo.toml b/linkerd.io/hugo.toml new file mode 100644 index 0000000000..e068b9739c --- /dev/null +++ b/linkerd.io/hugo.toml @@ -0,0 +1,113 @@ +ignoreErrors = ["error-remote-getjson"] +paginate = 10 +baseurl = "https://linkerd.io/" +disableKinds = ["taxonomy", "term"] +enableRobotsTXT = true +languageCode = "en-US" +sectionPagesMenu = "main" +theme = "buoyant" +title = "Linkerd" +[mediaTypes."text/netlify"] + delimiter = "" +[menu] +[[menu.community]] + name = "Slack" + url = "https://slack.linkerd.io/" + weight = 2 +[[menu.community]] + name = "GitHub" + url = "https://github.com/linkerd/linkerd2" + weight = 1 +[[menu.follow]] + name = "Twitter" + url = "https://twitter.com/linkerd" + weight = 3 +[[menu.follow]] + name = "YouTube" + url = "https://www.youtube.com/buoyantio" + weight = 1 +[[menu.top]] + identifier = "documentation" + name = "Docs" + url = "/docs/" + weight = 1 +[[menu.top]] + identifier = "community" + name = "Community" + pageRef = "/community/" + weight = 2 +[[menu.top]] + identifier = "get-involved" + name = "Get Involved" + pageRef = "/community/get-involved/" + weight = 2 + parent = "community" +[[menu.top]] + identifier = "community-adopters" + name = "Adopters" + pageRef = "/community/adopters/" + weight = 3 + parent = "community" +[[menu.top]] + identifier = "linkerd-ambassadors" + pageRef = "/community/ambassadors/" + name = "Linkerd Ambassadors" + weight = 4 + parent = "community" +[[menu.top]] + identifier = "community-heroes" + name = "Linkerd Heroes" + pageRef = "/community/heroes/" + weight = 5 + parent = "community" +[[menu.top]] + identifier = "buoyants-linkerd-forum" + name = "Buoyant's Linkerd Forum" + url = "https://linkerd.buoyant.io" + weight = 6 + parent = "community" +[[menu.top]] + identifier = "blog" + name = "Blog" + pageRef = "/blog/" + weight = 3 +[[menu.top]] + identifier = "faq" + name = "FAQ" + pageRef = "/faq/" + weight = 4 +[[menu.top]] + identifier = "enterprise" + name = "Enterprise" + pageRef = "/enterprise/" + weight = 5 +[[menu.cta]] + identifier = "join-forum" + name = "Join Forum" + url = "https://linkerd.buoyant.io" +[outputFormats.REDIRECTS] + baseName = "_redirects" + mediaType = "text/netlify" +[outputFormats.RSS] + mediatype = "application/RSS" + baseName = "feed" +[outputs] + home = ["HTML", "RSS", "REDIRECTS"] + section = ["HTML", "RSS", "JSON"] +[params] + description = "Linkerd is an ultralight service mesh for Kubernetes. It gives you observability, reliability, and security without requiring any code changes." + images = [""] + latest_release_date = "2022-05-31" + latest_release_version = "1.7.5" + latest_linkerd2_stable_version = "2.14" + logo = "/images/identity/png/transparent_background/1x/linkerd_primary_color_black_transparent.png" +[permalinks] + blog = "/:year/:month/:day/:slug/" +[privacy.twitter] + disable = false + enableDNT = false + simple = false +[markup] + [markup.goldmark] + [markup.goldmark.renderer] + unsafe = true # Allow HTML in md files \ No newline at end of file diff --git a/linkerd.io/layouts/_default/_markup/render-link.html b/linkerd.io/layouts/_default/_markup/render-link.html new file mode 100644 index 0000000000..7a4a14e0e9 --- /dev/null +++ b/linkerd.io/layouts/_default/_markup/render-link.html @@ -0,0 +1 @@ +{{ .Text | safeHTML }}{{ "" -}} diff --git a/linkerd.io/layouts/adopters/adopters.html b/linkerd.io/layouts/community/adopters.html similarity index 100% rename from linkerd.io/layouts/adopters/adopters.html rename to linkerd.io/layouts/community/adopters.html diff --git a/linkerd.io/layouts/ambassadors/ambassadors.html b/linkerd.io/layouts/community/ambassadors.html similarity index 100% rename from linkerd.io/layouts/ambassadors/ambassadors.html rename to linkerd.io/layouts/community/ambassadors.html diff --git a/linkerd.io/layouts/anchor/anchor.html b/linkerd.io/layouts/community/anchor.html similarity index 100% rename from linkerd.io/layouts/anchor/anchor.html rename to linkerd.io/layouts/community/anchor.html diff --git a/linkerd.io/layouts/get-involved/get-involved.html b/linkerd.io/layouts/community/get-involved.html similarity index 100% rename from linkerd.io/layouts/get-involved/get-involved.html rename to linkerd.io/layouts/community/get-involved.html diff --git a/linkerd.io/layouts/heroes/heroes.html b/linkerd.io/layouts/community/heroes.html similarity index 100% rename from linkerd.io/layouts/heroes/heroes.html rename to linkerd.io/layouts/community/heroes.html diff --git a/linkerd.io/layouts/partials/1/sidebar.html b/linkerd.io/layouts/partials/1/sidebar.html index 3b5f0f09e9..6045d267d5 100644 --- a/linkerd.io/layouts/partials/1/sidebar.html +++ b/linkerd.io/layouts/partials/1/sidebar.html @@ -39,7 +39,7 @@