From 4ef4e3f0a089863c9ae656efd3231f9642e5cd47 Mon Sep 17 00:00:00 2001 From: Kingdon P Barrett Date: Thu, 8 Feb 2024 19:15:40 -0500 Subject: [PATCH 1/5] Add KUBECON.md This is associated with fluxcd/website#1804 It will not be published on the website before we merge fluxcd/website#1804 We can see that it works in the preview build, (but we will need to merge this one first before we can see it working in the preview.) I don't see why we would publish this page any earlier than ~1-2 weeks before KubeCon at earliest. But there may be no reason to hold it up, either! update KUBECON.md to match scraped with minor edits via: https://sites.google.com/view/flux-kubecon-paris-2024/home https://codebeautify.org/html-to-markdown remove weird pointless whitespace links Formatting differences from wget https://sites.google.com/view/flux-kubecon-paris-2024/home -O kubecon.html && html2md -i kubecon.html |sed '1,6d'|ghead -n -13 > KUBECON.md && rm kubecon.html Add "Update Kubecon.md" workflow * fixup: kingdonb * add contents: write, pull-requests: write do not pass GITHUB_TOKEN explicitly (it is the default value) * permissions: contents, pull-requests * don't try building go inline in the action there is a release binary we can download and use, it's faster improve filter (remove Copy heading link) effect of script update Make this script easier to test Signed-off-by: Kingdon P Barrett Signed-off-by: Kingdon B --- .github/workflows/update-kubecon.yaml | 39 +++++++++++++ KUBECON.md | 79 +++++++++++++++++++++++++++ 2 files changed, 118 insertions(+) create mode 100644 .github/workflows/update-kubecon.yaml create mode 100644 KUBECON.md diff --git a/.github/workflows/update-kubecon.yaml b/.github/workflows/update-kubecon.yaml new file mode 100644 index 00000000..717e45ca --- /dev/null +++ b/.github/workflows/update-kubecon.yaml @@ -0,0 +1,39 @@ +name: Update Kubecon.md +on: + schedule: + - cron: '0 */6 * * *' + workflow_dispatch: +jobs: + update-kubecon: + permissions: + contents: write + pull-requests: write + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Pull html from site and convert to markdown + run: | + # go install github.com/suntong/html2md@latest + HTML2MD=html2md_1.5.0_linux_amd64 + wget https://github.com/suntong/html2md/releases/download/v1.5.0/${HTML2MD}.tar.gz + tar xvf ${HTML2MD}.tar.gz + HTML2MD_BIN="./${HTML2MD}/html2md" + + wget https://sites.google.com/view/flux-kubecon-paris-2024/home -O kubecon.html \ + && ${HTML2MD_BIN} -i kubecon.html |sed '1,6d'|head -n -13 \ + | sed 's_# \[Copy heading link\](\\#h\.[a-z0-9]*)[[:space:]]*_# _' \ + | sed 's_/view/flux-kubecon-paris-2024/home_/kubecon' \ + > KUBECON.md \ + && rm kubecon.html && rm -rf ${HTML2MD}* + - name: Create Pull Request + uses: peter-evans/create-pull-request@v6 + with: + commit-message: Update KUBECON.md + title: Update from source URL + body: | + - Detected changes from https://sites.google.com/view/flux-kubecon-paris-2024/home + + Auto-generated by [create-pull-request][1] + + [1]: https://github.com/peter-evans/create-pull-request + branch: update-kubecon diff --git a/KUBECON.md b/KUBECON.md new file mode 100644 index 00000000..2bc27fe4 --- /dev/null +++ b/KUBECON.md @@ -0,0 +1,79 @@ +[![](https://lh3.googleusercontent.com/YyFFZKmhaF_tupq893gXB9QlI0sTIB_kKIWRQRKYkM4DM57NiWsA8-a3fdAsNfVSENMpmB8woL7ZoMxvz60QJ9E=w16383)Flux and Flagger @ KubeCon Paris 2024](/kubecon) + +# KubeCon activities! + +![](https://lh4.googleusercontent.com/Zs2nLOcdZduejxNPG1ggl7LC7LGW4e9ICzWj6PVeOvb3U4BA4VxylXIJbNIDUGB9K8lKVQrRhtJ8K7zc69cvVqggfFYepEqpA1c6-QQwZKfzzW6UT3P42uB9M6XpLk7eyA=w1280) + +# KubeCon Paris 2024 + +March 19-22, 2024 + +![](https://lh5.googleusercontent.com/QSY9peqmDRMHJ48d6C39-WFTsXZmWchXFWGo-sLsPqQjWiYlwgifgBTnpYmmQKmQxAmHcgvCSNvYX4Hy8OY21OHqd7S-05iWaULoskrqSdmspuH4lj31FFOBmIcwQH02kw=w1280) + +# Flux news! + +[Flux General Availability announced in December 2024!](https://fluxcd.io/blog/2023/12/flux-v2.2.0/) + +[Second Security audit: No CVEs!](https://fluxcd.io/blog/2023/11/flux-security-audit/) + +![](https://lh6.googleusercontent.com/kN2ZY5XrU7NJ6OLB6NIZn7m6eXLvhLKieXpvQ4jYhSoffmNMb4civCKYSQGhZ6MNewO2L0RJxhiiGFkmzIsUgzFYEQ4uao2zxwJV07qZ6XQ15m06KkRFdyp09sN1-dbuMg=w1280) + +# 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! Deploy [the podinfo sample app](https://github.com/stefanprodan/podinfo) and change the text to something like "Cuttlefish playing tennis" and then come by the Flux booth at KubeCon. πŸ˜ΈπŸ‘©πŸ»β€πŸŽ¨πŸŽ¨ + +Visit the Flux booth in the KubeCon Project Pavilion to meet the Flux maintainers and contributors for demos and fun! + +# Flux talks @ KubeCon Paris! + +Tuesday, March 19, 2024 + +- 9:00 CET: " [CNCF Projects Lightning Talks](https://sched.co/1ZOFb)" + +- 10:30 - 20:00 CET: Flux booth hours in the Project Pavilion + +- 14:45 CET: " [⚑ Lightning Talk: My Database Runs on Kubernetes. What's Next? Data Platforms!](https://sched.co/1YFiG)" \- Robert Hodges, Altinity @ Data on Kubernetes Day colo event + +- 15:15 CET: " [Unlocking Innovation: How NatWest Bank Uses Cloud Native Tools to Deliver Platform as a Product](https://sched.co/1YFif)" \- Chris Plank, Natwest Group & Derik Evangelista, Syntasso @ Platform Engineering Day colo event + +- 17:00 CET: " [Panel: Argo Vs Flagger: Progressive Delivery with Linkerd](https://sched.co/1YFjm)" \- Scott Rigby; Jason Morgan, Buoyant; Ishita Sequeira, Red Hat @ ArgoCon colo event + + +Wednesday, March 20, 2024 + +- 10:30 - 17:00 CET: Flux booth hours in the Project Pavilion + +- 14:30 CET: " [Tackling Configuration Management at Scale with Flux, CUE and OCI at Cisco](https://sched.co/1YeMe)" \- Alec Hothan, Cisco & Stefan Prodan + +- 15:25 CET: " [How We Are Moving from GitOps to Kubernetes Resource Model in 5G Core](https://sched.co/1YeN2)" \- Joel Studler & Ashan Senevirathne, Swisscom + +- 16:30 CET: " [The Art of Kubernetes Add-on Validation: Secure Strategies for the Modern Developer Platform](https://sched.co/1YeN8)" \- Joaquin Rodriguez, Microsoft & Thiebaud Ernstberger, Independent + + +Thursday, March 21, 2024 + +- 10:30 - 14:30 CET: Flux booth hours in the Project Pavilion + +- 14:30 CET: " [GitOps Continuous Delivery at Scale with Flux](https://sched.co/1YhhG)" (Project maintainer talk) - Stefan Prodan + +- 15:25 CET: " [Lessons Learned from Let's Profile](https://sched.co/1YePX)" \- Frederic Branczyk, Polar Signals + +- 17:25 CET: " [Make Your Cluster Fly: Embed a Multi-Node Kubernetes Cluster Inside an Aircraft Using Puppet & Flux](https://sched.co/1YeQA)" \- Alexis Bonnin & Guillaume Maquinay, Thales Aerospace + + +Friday, March 22, 2024 + +- 14:00 CET: " [KubeDDR! a Dance of Predictive Scoring with MLOps, Step by Step](https://sched.co/1YeRR)" \- Leigh Capili, Broadcom & Annie Talvasto, VSHN + + +# Flux Resources + +Flux (and Flagger) is a set of continuous and progressive delivery solutions for Kubernetes that are open and extensible. It is the GitOps engine for Microsoft's Arc Kubernetes, AWS's EKS-Anywhere, GitLab, as well as enterprise companies such as telcos, financial institutions, and more. + +Flux is a CNCF graduated project and is General Availability. + +Get started: [https://fluxcd.io](https://fluxcd.io) + +Get help: [https://fluxcd.io/support/](https://fluxcd.io/support/) + +Add yourself! [https://fluxcd.io/adopters/](https://fluxcd.io/adopters/) From 2eaa951d8a5f16f8fdabacacc5f9fa8f55a420cd Mon Sep 17 00:00:00 2001 From: Kingdon Barrett Date: Tue, 27 Feb 2024 11:30:00 -0500 Subject: [PATCH 2/5] fix: unterminated 's' command https://github.com/kingdonb/community/actions/runs/8068067412/job/22039967712 * Update KUBECON.md * break out update-kubecon into script * Strip image links to replace with shortcodes Add a debug flag and test the script several more times * try figure shortcode (x2) * update KUBECON.md from script Signed-off-by: Kingdon Barrett Signed-off-by: Kingdon Barrett --- .github/workflows/update-kubecon.yaml | 13 ++++----- KUBECON.md | 11 ++++--- script/update-kubecon.sh | 41 +++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 12 deletions(-) create mode 100755 script/update-kubecon.sh diff --git a/.github/workflows/update-kubecon.yaml b/.github/workflows/update-kubecon.yaml index 717e45ca..5c1d7961 100644 --- a/.github/workflows/update-kubecon.yaml +++ b/.github/workflows/update-kubecon.yaml @@ -15,16 +15,13 @@ jobs: run: | # go install github.com/suntong/html2md@latest HTML2MD=html2md_1.5.0_linux_amd64 - wget https://github.com/suntong/html2md/releases/download/v1.5.0/${HTML2MD}.tar.gz - tar xvf ${HTML2MD}.tar.gz + HTML2MD_VER=v1.5.0 HTML2MD_BIN="./${HTML2MD}/html2md" + SOURCE_SITE="https://sites.google.com/view/flux-kubecon-paris-2024/home" + export SOURCE_SITE HTML2MD_BIN HTML2MD_VER HTML2MD + + ./script/update-kubecon.sh - wget https://sites.google.com/view/flux-kubecon-paris-2024/home -O kubecon.html \ - && ${HTML2MD_BIN} -i kubecon.html |sed '1,6d'|head -n -13 \ - | sed 's_# \[Copy heading link\](\\#h\.[a-z0-9]*)[[:space:]]*_# _' \ - | sed 's_/view/flux-kubecon-paris-2024/home_/kubecon' \ - > KUBECON.md \ - && rm kubecon.html && rm -rf ${HTML2MD}* - name: Create Pull Request uses: peter-evans/create-pull-request@v6 with: diff --git a/KUBECON.md b/KUBECON.md index 2bc27fe4..068f431c 100644 --- a/KUBECON.md +++ b/KUBECON.md @@ -1,14 +1,16 @@ -[![](https://lh3.googleusercontent.com/YyFFZKmhaF_tupq893gXB9QlI0sTIB_kKIWRQRKYkM4DM57NiWsA8-a3fdAsNfVSENMpmB8woL7ZoMxvz60QJ9E=w16383)Flux and Flagger @ KubeCon Paris 2024](/kubecon) +[Flux and Flagger @ KubeCon Paris 2024](/kubecon) # KubeCon activities! -![](https://lh4.googleusercontent.com/Zs2nLOcdZduejxNPG1ggl7LC7LGW4e9ICzWj6PVeOvb3U4BA4VxylXIJbNIDUGB9K8lKVQrRhtJ8K7zc69cvVqggfFYepEqpA1c6-QQwZKfzzW6UT3P42uB9M6XpLk7eyA=w1280) + + {{< figure src="img/flux-horizontal-color.png" alt="Flux Logo" class="flux-logo-inner-header-left" >}} # KubeCon Paris 2024 March 19-22, 2024 -![](https://lh5.googleusercontent.com/QSY9peqmDRMHJ48d6C39-WFTsXZmWchXFWGo-sLsPqQjWiYlwgifgBTnpYmmQKmQxAmHcgvCSNvYX4Hy8OY21OHqd7S-05iWaULoskrqSdmspuH4lj31FFOBmIcwQH02kw=w1280) + + {{< figure src="img/flux-horizontal-color.png" alt="Flux Logo" class="inner-header-right-align" >}} # Flux news! @@ -16,7 +18,8 @@ March 19-22, 2024 [Second Security audit: No CVEs!](https://fluxcd.io/blog/2023/11/flux-security-audit/) -![](https://lh6.googleusercontent.com/kN2ZY5XrU7NJ6OLB6NIZn7m6eXLvhLKieXpvQ4jYhSoffmNMb4civCKYSQGhZ6MNewO2L0RJxhiiGFkmzIsUgzFYEQ4uao2zxwJV07qZ6XQ15m06KkRFdyp09sN1-dbuMg=w1280) + + {{< figure src="img/flux-cuttlefish-stickers.jpeg" alt="Custom printed stickers with cuttlefish mascot and Flux logos" class="stickers-float-left" >}} # Flux Booth fun! diff --git a/script/update-kubecon.sh b/script/update-kubecon.sh new file mode 100755 index 00000000..b7bce6ad --- /dev/null +++ b/script/update-kubecon.sh @@ -0,0 +1,41 @@ +#!/bin/bash +# Define and export these (ahead of the script): +# +# HTML2MD=html2md_1.5.0_linux_amd64 +# HTML2MD_VER=v1.5.0 +# HTML2MD_BIN="./${HTML2MD}/html2md" +# SOURCE_SITE="https://sites.google.com/view/flux-kubecon-paris-2024/home" +# export SOURCE_SITE HTML2MD_BIN HTML2MD_VER HTML2MD + +TEMP_FILE=kubecon.html +OUT_FILE=KUBECON.md + +if [[ -z "$DEBUG" ]]; then + wget https://github.com/suntong/html2md/releases/download/${HTML2MD_VER}/${HTML2MD}.tar.gz -O ${HTML2MD}.tar.gz + tar xvf ${HTML2MD}.tar.gz +else + HTML2MD_BIN=`which html2md` +fi + +# sed 1: Remove "Copy heading link" text, which is inserted by Google Site +# sed 2: make site top-link self-referential, it should point at /kubecon +# sed 3: remove empty image alt ref with no significance (branding logo) +wget ${SOURCE_SITE} -O ${TEMP_FILE} \ + && ${HTML2MD_BIN} -i ${TEMP_FILE} |sed '1,6d'|head -n -13 \ + | sed 's_# \[Copy heading link\](\\#h\.[a-z0-9]*)[[:space:]]*_# _' \ + | sed 's_/view/flux-kubecon-paris-2024/home_/kubecon_' \ + | sed -E 's_\[!\[\]\([^)]+\)_[_g' \ + | sed -E 's_!\[flux-logo-inner-header-left[^)]+\)_\ + {{< figure src="img/flux-horizontal-color.png" alt="Flux Logo" class="flux-logo-inner-header-left" >}}_g' \ + | sed -E 's_!\[inner-header-right-align[^)]+\)_\ + {{< figure src="img/flux-horizontal-color.png" alt="Flux Logo" class="inner-header-right-align" >}}_g' \ + | sed -E 's_!\[stickers-float-left[^)]+\)_\ + {{< figure src="img/flux-cuttlefish-stickers.jpeg" alt="Custom printed stickers with cuttlefish mascot and Flux logos" class="stickers-float-left" >}}_g' \ + > ${OUT_FILE} + +# TODO: The remaining images all have alt-text which can be further +# re-processed into CSS selectors? or maybe short codes, I think 😡 + +if [[ -z "$DEBUG" ]]; then + rm ${TEMP_FILE} && rm -rf ${HTML2MD}* +fi From ceff57e94b9b6e8e3a8d6a631e4e54a6555332c8 Mon Sep 17 00:00:00 2001 From: Kingdon Barrett Date: Tue, 27 Feb 2024 13:29:52 -0500 Subject: [PATCH 3/5] clean up comments in source code Signed-off-by: Kingdon Barrett --- script/update-kubecon.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/script/update-kubecon.sh b/script/update-kubecon.sh index b7bce6ad..50c76ac4 100755 --- a/script/update-kubecon.sh +++ b/script/update-kubecon.sh @@ -20,6 +20,7 @@ fi # sed 1: Remove "Copy heading link" text, which is inserted by Google Site # sed 2: make site top-link self-referential, it should point at /kubecon # 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 wget ${SOURCE_SITE} -O ${TEMP_FILE} \ && ${HTML2MD_BIN} -i ${TEMP_FILE} |sed '1,6d'|head -n -13 \ | sed 's_# \[Copy heading link\](\\#h\.[a-z0-9]*)[[:space:]]*_# _' \ @@ -33,9 +34,6 @@ wget ${SOURCE_SITE} -O ${TEMP_FILE} \ {{< figure src="img/flux-cuttlefish-stickers.jpeg" alt="Custom printed stickers with cuttlefish mascot and Flux logos" class="stickers-float-left" >}}_g' \ > ${OUT_FILE} -# TODO: The remaining images all have alt-text which can be further -# re-processed into CSS selectors? or maybe short codes, I think 😡 - if [[ -z "$DEBUG" ]]; then rm ${TEMP_FILE} && rm -rf ${HTML2MD}* fi From 33456718e2e8bee330b5d695cfa390dc0bff5b9f Mon Sep 17 00:00:00 2001 From: Kingdon Barrett Date: Tue, 27 Feb 2024 14:50:36 -0500 Subject: [PATCH 4/5] fixup (blob-waving.gif) Signed-off-by: Kingdon Barrett --- script/update-kubecon.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/update-kubecon.sh b/script/update-kubecon.sh index 50c76ac4..4ea4f22a 100755 --- a/script/update-kubecon.sh +++ b/script/update-kubecon.sh @@ -29,7 +29,7 @@ wget ${SOURCE_SITE} -O ${TEMP_FILE} \ | sed -E 's_!\[flux-logo-inner-header-left[^)]+\)_\ {{< figure src="img/flux-horizontal-color.png" alt="Flux Logo" class="flux-logo-inner-header-left" >}}_g' \ | sed -E 's_!\[inner-header-right-align[^)]+\)_\ - {{< figure src="img/flux-horizontal-color.png" alt="Flux Logo" class="inner-header-right-align" >}}_g' \ + {{< figure src="img/blob-waving.gif" alt="Blob Waving" class="inner-header-right-align" >}}_g' \ | sed -E 's_!\[stickers-float-left[^)]+\)_\ {{< figure src="img/flux-cuttlefish-stickers.jpeg" alt="Custom printed stickers with cuttlefish mascot and Flux logos" class="stickers-float-left" >}}_g' \ > ${OUT_FILE} From 1a334b0cb45ff05caaf635080f90370499c6b176 Mon Sep 17 00:00:00 2001 From: Kingdon Barrett Date: Tue, 27 Feb 2024 14:51:43 -0500 Subject: [PATCH 5/5] Update KUBECON.md Signed-off-by: Kingdon Barrett --- KUBECON.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/KUBECON.md b/KUBECON.md index 068f431c..7887a28b 100644 --- a/KUBECON.md +++ b/KUBECON.md @@ -10,7 +10,7 @@ March 19-22, 2024 - {{< figure src="img/flux-horizontal-color.png" alt="Flux Logo" class="inner-header-right-align" >}} + {{< figure src="img/blob-waving.gif" alt="Blob Waving" class="inner-header-right-align" >}} # Flux news!