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.

Sign up for GitHub

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

Jump to bottom

Add Community to website navbar, add events to community as subfolder #1281

Merged
merged 7 commits into from
Jun 21, 2024
Merged

Add Community to website navbar, add events to community as subfolder #1281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f5c2668
docs: add events to community folder
mrcdb Jun 18, 2024
a7522e9
feat: add community folder to website directory via makefile
mrcdb Jun 18, 2024
4eb9a70
docs: add community README
mrcdb Jun 19, 2024
b7abb2e
chore: remove community default layout
mrcdb Jun 19, 2024
e72b133
fix(safe-kubecon.md): linting, spelling
mrcdb Jun 19, 2024
98feb2d
ci: update link test retries on 429
mrcdb Jun 19, 2024
a012a19
Merge branch 'main' into feat-website-recurring-events
eddie-knight Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ci/link-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"aliveStatusCodes": [200,206,402],
"fallbackRetryDelay": "5s",
"fallbackRetryDelay": "10s",
"replacementPatterns": [
{
"pattern": "^/",
"replacement": "{{BASEURL}}/"
}
],
"retryCount": 3,
"retryCount": 5,
"retryOn429": true,
"timeout": "20s",
"httpHeaders": [
Expand Down
3 changes: 3 additions & 0 deletions community/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# TAG-Security Community Activities

The Security TAG has several working groups that organize community activities around specific topics, including recurring meetings.
12 changes: 12 additions & 0 deletions community/events/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Events

## Upcoming Gatherings

[CloudNativeSecurityCon](https://events.linuxfoundation.org/cloudnativesecuritycon-north-america/):
June 26 – 27, 2024 — Seattle, Washington

## Recurring General Meetings

[Weekly US Meeting](https://zoom.us/j/99809474566): each Wednesday at 10 am (UTC-7)

[Bi-Weekly EMEA Meeting](https://zoom.us/j/99917523142): on Wednesdays at 1 pm (UTC+0, UTC+1 when daylight saving time is in effect)
2 changes: 1 addition & 1 deletion cloud_native_security.md → community/events/cloud-native-security.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ project, architecture, and enhance team awareness on security.

- Copenhagen, Denmark
- May 2-4, 2018
- [notes](safe_kubecon.md)
- [notes](safe-kubecon.md)

[KubeCon + CloudNativeCon, Shanghai](https://events19.linuxfoundation.cn/events/kubecon-cloudnativecon-china-2018/)

Expand Down
2 changes: 1 addition & 1 deletion past-events.md → community/events/past-events.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<!-- cSpell:ignore timothyhinrichs -->
<!-- cSpell:ignore sreetummidi -->

A list of past KubeCon/Cloud Native SecurityCon events an be found [here](cloud_native_security.md)
A list of past KubeCon/Cloud Native SecurityCon events can be found [here](cloud-native-security.md)

## DockerCon, San Francisco, CA, Apr 30 - May 2, 2019

Expand Down
9 changes: 4 additions & 5 deletions safe_kubecon.md → community/events/safe-kubecon.md
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This highlights an issue regarding sorting past events and future events.

Having this file within events is a dramatic improvement from having it at the repo top level, but does it now require website visitors to click and read the entry to determine whether it is a past or upcoming event? If so, do we have any way to improve that?

Happy to file this as a nit to address in a followup PR, if we have some type of consensus the matter.

Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
### SAFE Recap @ [Kubecon Europe 2018](https://events.linuxfoundation.org/events/kubecon-cloudnativecon-europe-2018/)
# SAFE Recap @ [Kubecon Europe 2018](https://events.linuxfoundation.org/events/kubecon-cloudnativecon-europe-2018/)

SAFE had two sessions for introducing SAFE and getting feedback from the community.
SAFE had two sessions for introducing SAFE and getting feedback from the community.

* [SAFE WG Intro](https://kccnceu18.sched.com/event/ENw3/safe-wg-intro-jeyappragash-j-j-padmeio-ray-colline-google-any-skill-level)
* [SAFE WG Deep Dive](https://kccnceu18.sched.com/event/ENw5/safe-wg-deep-dive-ray-colline-google-intermediate-skill-level)

We had a small but relevant group and hallway conversations were equally engaging and informative.

Excited to have [Liz Rice](https://github.com/lizrice) and [Justin Cormack](https://github.com/justincormack) join us.
Excited to have [Liz Rice](https://github.com/lizrice) and [Justin Cormack](https://github.com/justincormack) join us.

Across the board, everyone I had conversation with, there was a natural acknowledgement that security is an end-end problem and understanding secure access and providing a safe end-end system for enduser is critical. Highlighted at the [keynote by Alexis](https://twitter.com/MayaKaczorowski/status/991601395450171392?s=15).
Across the board, everyone I had conversation with, there was a natural acknowledgement that security is an end-end problem and understanding secure access and providing a safe end-end system for end-user is critical. Highlighted at the [keynote by Alexis](https://twitter.com/MayaKaczorowski/status/991601395450171392?s=15).

We are just getting started on this, incredibly excited to be part of this team and the effort!

1 change: 1 addition & 0 deletions website/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ deps:
--include='assessments' --include='assessments/**' \
--include='governance' --include='governance/**' \
--include='publications' --include='publications/**' \
--include='community' --include='community/**' \
--include='*.md' --exclude='*'

# Move over content such as graphics and logos
Expand Down
10 changes: 0 additions & 10 deletions website/content/events/_index.md
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions website/themes/docsy/layouts/community/list.html
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mrcdb @brandtkeller

What if we can set this up to behave like the Blog page? Might be as simple as overriding this layout file with a copy of the blog template. Might also take more work, but WDYT— worth a try?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some extra formatting will need to be done on each event page to format them correctly, but what do yall think about this as an approach?

Screenshot 2024-06-19 at 1 17 26 PM

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Blog posts get grouped by year based on their heading, e.g.:

---
title:  "Clusters for all cloud tenants"
date:   2022-06-02 13:04:00 +0200
author: Josh Gavant 
---

I think the best approach would be to create standalone files for each event (both past and future, e.g. each CNSCon event gets its own page) and creating a heading for each of them so that they are automatically grouped based on the year. This would improve readability and fix the sorting issue you mentioned above, but it requires a bit more work as individual files are created for each event.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That matches the approach I used for the image above. If we add the headers to the event files, they will behave like blog posts within this subsection. Then we'd be able to remove the past and future events files.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@brandtkeller @mrcdb Do yall want me to push the commit to this PR or in a follow-up?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can help with updating the event files and checking in the blog-alike layout for community events myself, but please feel free to push any commit to this PR if you have already built some of that 👍

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@eddie-knight I have pushed an initial commit that would add the events on a timeline similarly to what is done for blogs. the only problem I couldn't fix is how to apply the custom layout to community/events, not sure if this is a Hugo limitation (I am not really an expert on that).

As a workaround, I had to move Events as a top-level menu item so that the custom layout would only apply to the events and not affect the other pages in community, which otherwise wouldn't display correctly.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The last commit seems to be a large divergence from your previous approach 🤔 If you'd like to roll it back, I can make a small commit that allows for a similar result while keeping the Events content in the Community directory.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, I did try to make it work (see my comment above) but faced some limitations. I have reverted my previous commit, please feel free to push your commit 👍

This file was deleted.

Loading