Skip to content

Commit

Permalink
Merge pull request #379 from fluxcd/fix-script
Browse files Browse the repository at this point in the history
Allow three paragraphs here
  • Loading branch information
kingdonb authored Mar 7, 2024
2 parents 2007fd9 + c9de416 commit 19b9778
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 11 deletions.
7 changes: 1 addition & 6 deletions KUBECON.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,8 @@ KubeCon Paris 2024 Press release (coming soon!)
{{< figure src="/img/flux-cuttlefish-stickers.jpeg" alt="Custom printed stickers with cuttlefish mascot and Flux logos" >}}
</div>

# Flux Booth fun!

Want a bespoke unique all-your-own cuttlefish sticker?

Complete the challenge and pick up a human-intelligence or artificial-intelligence Flux sticker!

Challenge = Deploy <a href="https://github.com/stefanprodan/podinfo">the podinfo sample app</a> and change the text to something like "Cuttlefish playing tennis" and then come by the Flux booth at KubeCon for your bespoke sticker! 😸👩🏻‍🎨🎨
<div class="float-booth-fun"><h1>Flux Booth fun!</h1><p>Want a bespoke unique all-your-own cuttlefish sticker?</p><p>Complete the challenge and pick up a human-intelligence or artificial-intelligence Flux sticker!</p><p>Challenge = Deploy <a href="https://github.com/stefanprodan/podinfo">the podinfo sample app</a> and change the text to something like "Cuttlefish playing tennis" and then come by the Flux booth at KubeCon for your bespoke sticker! 😸👩🏻‍🎨🎨</p></div></div>

# Flux talks @ KubeCon Paris!

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ All meetings can be found on our calendar: <https://lists.cncf.io/g/cncf-flux-de

| Which | Times | Agenda & Minutes | Recordings |
| ----- | ----- | ---------------- | ---------- |
| Flux Dev Meetings | "early" meeting: Uneven weeks: Wed, 12:00 UTC, "late" meeting: Even weeks: Thu, 15:00 UTC | [Document](https://docs.google.com/document/d/1l_M0om0qUEN_NNiGgpqJ2tvsF2iioHkaARDeh6b70B0/edit) | [YouTube](https://www.youtube.com/playlist?list=PLwjBY07V76p5mWNgdINjIiuUiItIeLhIN) |
| Flux Dev Meetings | "early" meeting: Uneven weeks: Wed, 12:00 UTC, "late" meeting: Even weeks: Thu, 15:00 UTC | [Document](https://docs.google.com/document/d/167SKpaDUrpiBqNR2lXnQjXyb5Gxq6uB-Fujz7eBQxyw/edit) | [YouTube](https://www.youtube.com/playlist?list=PLwjBY07V76p5mWNgdINjIiuUiItIeLhIN) |

We are looking forward to seeing you there.

Expand Down
8 changes: 4 additions & 4 deletions script/update-kubecon.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ fi
# sed 3: remove empty image alt ref with no significance (branding logo)
# sed 4-6: detect the images from their alt tags, then replace with figure refs
# sed 7: the header which is meant to float between images must also have float
# sed 8: flux booth fun (a caption with a heading h1 followed by two paragraphs!)
# sed 8: flux booth fun (a caption with a heading h1 followed by three paragraphs!)
# sed 9: the podinfo sample app link is in an HTML block so :( turn it manually into a link
wget ${SOURCE_SITE} -O ${TEMP_FILE} \
&& ${HTML2MD_BIN} -i ${TEMP_FILE} |$sed '1,6d'|$head -n -13 \
&& ${HTML2MD_BIN} -i ${TEMP_FILE} |$sed '1,6d'|$head -n -19 \
| $sed 's_# \[Copy heading link\](\\#h\.[a-z0-9]*)[[:space:]]*_# _' \
| $sed 's_/view/flux-kubecon-paris-2024/home_/kubecon_' \
| $sed -E 's_\[!\[\]\([^)]+\)_[_g' \
Expand All @@ -52,8 +52,8 @@ wget ${SOURCE_SITE} -O ${TEMP_FILE} \
{{< figure src="/img/flux-cuttlefish-stickers.jpeg" alt="Custom printed stickers with cuttlefish mascot and Flux logos" >}}\
</div>_g' \
| $sed -z 's_# KubeCon Paris 2024\n\nMarch 19-22, 2024_<div class="float-header-kubecon"><h1>KubeCon Paris 2024</h1><p>March 19-22, 2024</p></div>_' \
| $sed -Ez 's_# Flux Booth fun!\n\n([^\n]+)\n\n([^\n]+)\n\n#_\
<div class="float-booth-fun"><h1>Flux Booth fun!</h1><p>\1</p><p>\2</p></div></div>\n\n#_' \
| $sed -Ez 's_# Flux Booth fun!\n\n([^\n]+)\n\n([^\n]+)\n\n([^\n]+)\n\n#_\
<div class="float-booth-fun"><h1>Flux Booth fun!</h1><p>\1</p><p>\2</p><p>\3</p></div></div>\n\n#_' \
| $sed -E 's_\[the podinfo sample app\]\(https://github.com/stefanprodan/podinfo\)_<a href="https://github.com/stefanprodan/podinfo">the podinfo sample app</a>_' \
> ${OUT_FILE}

Expand Down

0 comments on commit 19b9778

Please sign in to comment.