Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgraded to latest Hugo version #1689

Merged
merged 12 commits into from
Oct 2, 2023
2 changes: 1 addition & 1 deletion .devcontainer/on-create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
13 changes: 9 additions & 4 deletions .github/workflows/install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
25 changes: 15 additions & 10 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
16 changes: 0 additions & 16 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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)
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
1 change: 1 addition & 0 deletions linkerd.io/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
public/
resources/
.hugo_build.lock
3 changes: 2 additions & 1 deletion linkerd.io/assets/scss/_navbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
120 changes: 0 additions & 120 deletions linkerd.io/config.toml

This file was deleted.

2 changes: 1 addition & 1 deletion linkerd.io/content/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion linkerd.io/content/blog/announcing-linkerd-2-6.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion linkerd.io/content/blog/announcing-linkerd-2-7.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion linkerd.io/content/blog/design-principles.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
20 changes: 10 additions & 10 deletions linkerd.io/content/blog/happy-birthday-linkerd.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,16 @@ project growing, and above all, Linkerd is your project. Here's to another
incredible year together with you. 💪

<!-- markdownlint-disable MD033 -->
{{<tweet 1172922222941560832 >}}
{{<tweet 1172081948107239426 >}}
{{<tweet 1166399513923211265 >}}
{{<tweet 1165042461812477953 >}}
{{<tweet 1164162817131520002 >}}
{{<tweet 1174402199549464576 >}}
{{<tweet 1158416216546873345 >}}
{{<tweet 1133853318424485889 >}}
{{<tweet 1130973416775983104 >}}
{{<tweet 1091591745870139392 >}}
{{<tweet user="markrendle" id="1172922222941560832" >}}
{{<tweet user="CamiloFromHN" id="1172081948107239426" >}}
{{<tweet user="ibuildthecloud" id="1166399513923211265" >}}
{{<tweet user="wm" id="1165042461812477953" >}}
{{<tweet user="macintoshPrime" id="1164162817131520002" >}}
{{<tweet user="Linekrd" id="1174402199549464576" >}}
{{<tweet user="wm" id="1158416216546873345" >}}
{{<tweet user="dexterchief" id="1133853318424485889" >}}
{{<tweet user="StevenNatera" id="1130973416775983104" >}}
{{<tweet user="coleca" id="1091591745870139392" >}}
<!-- markdownlint-enable MD033 -->

## Ready to try Linkerd?
Expand Down
8 changes: 4 additions & 4 deletions linkerd.io/content/blog/kubecon-eu-2019-linkerd-roundup.md
Original file line number Diff line number Diff line change
Expand Up @@ -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!

Expand Down Expand Up @@ -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" >}}

---

Expand Down
6 changes: 3 additions & 3 deletions linkerd.io/content/blog/kubecon-na-2019-linkerd-roundup.md
Original file line number Diff line number Diff line change
Expand Up @@ -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!

Expand Down
2 changes: 1 addition & 1 deletion linkerd.io/content/blog/linkerd-210-and-extensions.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion linkerd.io/content/blog/linkerd-and-open-governance.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading
Loading