From bd561d7026ae46733024fe696a4e00f40709ff6f Mon Sep 17 00:00:00 2001 From: "Kyle J. Davis" Date: Mon, 6 Nov 2023 14:16:47 -0700 Subject: [PATCH] adds community section --- assets/scss/_styles_project.scss | 20 ++++++ config.toml | 5 ++ content/en/community/_index.markdown | 6 ++ .../en/community/chat-discuss/index.markdown | 21 ++++++ content/en/community/events/index.markdown | 7 ++ content/en/community/links/index.markdown | 7 ++ content/en/community/meetups/index.markdown | 7 ++ data/events/reinvent-2023.toml | 8 +++ data/links/cis-benchmark-blog.toml | 8 +++ data/links/fosdem-2023.toml | 8 +++ data/links/opensearch-kubelet-fluent-bit.toml | 8 +++ data/links/sp-os-wg-video.toml | 8 +++ data/links/target-au-gafoor.toml | 8 +++ data/meetups/community-meeting.toml | 7 ++ layouts/partials/event.html | 9 +++ layouts/partials/link.html | 7 ++ layouts/partials/meetup.html | 7 ++ layouts/shortcodes/events/loop.html | 65 +++++++++++++++++++ layouts/shortcodes/links/loop.html | 11 ++++ layouts/shortcodes/meetup/loop.html | 11 ++++ 20 files changed, 238 insertions(+) create mode 100644 content/en/community/_index.markdown create mode 100644 content/en/community/chat-discuss/index.markdown create mode 100644 content/en/community/events/index.markdown create mode 100644 content/en/community/links/index.markdown create mode 100644 content/en/community/meetups/index.markdown create mode 100644 data/events/reinvent-2023.toml create mode 100644 data/links/cis-benchmark-blog.toml create mode 100644 data/links/fosdem-2023.toml create mode 100644 data/links/opensearch-kubelet-fluent-bit.toml create mode 100644 data/links/sp-os-wg-video.toml create mode 100644 data/links/target-au-gafoor.toml create mode 100644 data/meetups/community-meeting.toml create mode 100644 layouts/partials/event.html create mode 100644 layouts/partials/link.html create mode 100644 layouts/partials/meetup.html create mode 100644 layouts/shortcodes/events/loop.html create mode 100644 layouts/shortcodes/links/loop.html create mode 100644 layouts/shortcodes/meetup/loop.html diff --git a/assets/scss/_styles_project.scss b/assets/scss/_styles_project.scss index 38b76491..8821485a 100644 --- a/assets/scss/_styles_project.scss +++ b/assets/scss/_styles_project.scss @@ -478,6 +478,26 @@ nav.foldable-nav .with-child, nav.foldable-nav .without-child { } } +/* resources / links / events */ +.resource-list, #event_list { + h3 { + margin-bottom: 0; + } + margin-bottom: 2em; +} +#event_list { + &.future_only { + .event.past { + display: none; + } + } + &.past_only { + .event.future { + display: none; + } + } + margin-top: 2em; +} /* style bottom links */ footer .text-links { diff --git a/config.toml b/config.toml index b8a88356..1cd54d52 100644 --- a/config.toml +++ b/config.toml @@ -85,3 +85,8 @@ ul_show = 1 name = "FAQ" weight = 20 url = "en/faq/" + +[[menu.main]] + name = "Community" + weight = 20 + url = "en/community/" diff --git a/content/en/community/_index.markdown b/content/en/community/_index.markdown new file mode 100644 index 00000000..4831ba6f --- /dev/null +++ b/content/en/community/_index.markdown @@ -0,0 +1,6 @@ ++++ +type="docs" +title="Community" ++++ + +Find out with other Bottlerocket users are doing by connecting through collaboration, stories, and interactions. diff --git a/content/en/community/chat-discuss/index.markdown b/content/en/community/chat-discuss/index.markdown new file mode 100644 index 00000000..c53aa913 --- /dev/null +++ b/content/en/community/chat-discuss/index.markdown @@ -0,0 +1,21 @@ ++++ +title = "Chat & Discussion" +type = "docs" +description = "Avenues to talk to others interested in Bottlerocket" ++++ + +## Slack + +You can find Bottlerocket developers and users on various Slack instances. + +- [Kubernetes Slack](https://communityinviter.com/apps/kubernetes/community) on channel `#eks` +- [AWS Developer Slack](https://awsdevelopers.slack.com/join/shared_invite/zt-yryddays-C9fkWrmguDv0h2EEDzCqvw#/shared-invite/email) on channel `#bottlerocket` +- [CNCF Slack](https://communityinviter.com/apps/cloud-native/cncf) on channel `#wg-sp-os` + +## Forum + +The [Bottlerocket GitHub Discussions forum](https://github.com/bottlerocket-os/bottlerocket/discussions) is a great way to ask questions or get feedback from developers and other users. + +## Problems with Bottlerocket? + +If you think you found a bug or other problem with Bottlerocket, [file an issue](https://github.com/bottlerocket-os/bottlerocket/issues). diff --git a/content/en/community/events/index.markdown b/content/en/community/events/index.markdown new file mode 100644 index 00000000..03ed95f4 --- /dev/null +++ b/content/en/community/events/index.markdown @@ -0,0 +1,7 @@ ++++ +title = "Events" +type = "docs" +description = "Upcoming events to find out more information about Bottlerocket" ++++ + +{{< events/loop >}} diff --git a/content/en/community/links/index.markdown b/content/en/community/links/index.markdown new file mode 100644 index 00000000..734ab361 --- /dev/null +++ b/content/en/community/links/index.markdown @@ -0,0 +1,7 @@ ++++ +title = "Links & Resources" +type = "docs" +description = "Discover what others have written and said about Bottlerocket" ++++ + +{{< links/loop >}} diff --git a/content/en/community/meetups/index.markdown b/content/en/community/meetups/index.markdown new file mode 100644 index 00000000..66b14b01 --- /dev/null +++ b/content/en/community/meetups/index.markdown @@ -0,0 +1,7 @@ ++++ +title = "Meetups" +type = "docs" +description = "Join a group with others interested in Bottlerocket" ++++ + +{{< meetup/loop >}} diff --git a/data/events/reinvent-2023.toml b/data/events/reinvent-2023.toml new file mode 100644 index 00000000..8d378519 --- /dev/null +++ b/data/events/reinvent-2023.toml @@ -0,0 +1,8 @@ +name = "Join us at re:Invent 2023" +start_date = "2023-11-27" +end_date = "2023-12-01" +description = """ +Join Bottlerocket at re:Invent 2023! The Bottlerocket team is presenting [a workshop](https://hub.reinvent.awsevents.com/attendee-portal/catalog/?search=OPN202), +will be avaliable at [the Modern Applications zone in the expo hall](https://hub.reinvent.awsevents.com/attendee-portal/catalog/?search=ACT167), and [available to meet +for conversations](https://github.com/bottlerocket-os/bottlerocket/discussions/3573). +""" \ No newline at end of file diff --git a/data/links/cis-benchmark-blog.toml b/data/links/cis-benchmark-blog.toml new file mode 100644 index 00000000..643a677b --- /dev/null +++ b/data/links/cis-benchmark-blog.toml @@ -0,0 +1,8 @@ +date = "2023-02-02" +title = "Validating Amazon EKS optimized Bottlerocket AMI against the CIS Benchmark" +description = """ +This blog post describes how to validate Bottlerocket EKS variants using the CIS Benchmark. +""" +url = "https://aws.amazon.com/blogs/containers/validating-amazon-eks-optimized-bottlerocket-ami-against-the-cis-benchmark/" +type = "blog" +tags = [ "deep-dive" ] \ No newline at end of file diff --git a/data/links/fosdem-2023.toml b/data/links/fosdem-2023.toml new file mode 100644 index 00000000..297882b4 --- /dev/null +++ b/data/links/fosdem-2023.toml @@ -0,0 +1,8 @@ +date = "2023-02-23" +title = "Bottlerocket OS - a container-optimized Linux" +description = """ +A recording of the Bottlerocket talk at FOSDEM 23 which provides an introduction to the container optimized-space and an overview of Bottlerocket. +""" +url = "https://archive.fosdem.org/2023/schedule/event/container_bottlerocket_os/" +type = "video" +tags = [ "introduction" ] \ No newline at end of file diff --git a/data/links/opensearch-kubelet-fluent-bit.toml b/data/links/opensearch-kubelet-fluent-bit.toml new file mode 100644 index 00000000..ca076c79 --- /dev/null +++ b/data/links/opensearch-kubelet-fluent-bit.toml @@ -0,0 +1,8 @@ +date = "2022-07-20" +title = "Using Fluent Bit and OpenSearch with Bottlerocket and Kubelet logs" +description = """ +A walk through of capturing Bottlerocket's kubelet logs with Fluent Bit and sending them to OpenSearch. +""" +url = "https://opensearch.org/blog/bottlerocket-k8s-fluent-bit/" +type = "blog" +tags = [ "walk-through" ] \ No newline at end of file diff --git a/data/links/sp-os-wg-video.toml b/data/links/sp-os-wg-video.toml new file mode 100644 index 00000000..d9632d96 --- /dev/null +++ b/data/links/sp-os-wg-video.toml @@ -0,0 +1,8 @@ +date = "2023-10-03" +title = "Bottlerocket at TAG Runtime Special Purpose Operating System Working Group (sp-os-wg)" +description = """ +In this video, Bottlerocket is introduced to the CNCF TAG Runtime Special Purpose OS working group. +""" +url = "https://www.youtube.com/watch?v=zLP2JUR2xUg" +type = "video" +tags = [ "introduction" ] \ No newline at end of file diff --git a/data/links/target-au-gafoor.toml b/data/links/target-au-gafoor.toml new file mode 100644 index 00000000..b1a4969b --- /dev/null +++ b/data/links/target-au-gafoor.toml @@ -0,0 +1,8 @@ +date = "2023-10-10" +title = "Reducing compute capacity by 40% on EKS with Bottlerocket and Karpenter" +description = """ +A Kube.fm interview with Gazal Gafoor on how and why they used Bottlerocket with Karpenter at Target Australia. +""" +url = "https://kube.fm/gazal-eks-bottlerocket-karpenter" +type = "video" +tags = [ "interview" ] \ No newline at end of file diff --git a/data/meetups/community-meeting.toml b/data/meetups/community-meeting.toml new file mode 100644 index 00000000..1049990b --- /dev/null +++ b/data/meetups/community-meeting.toml @@ -0,0 +1,7 @@ +title = "Official Bottlerocket Community Meeting Group" +url = "https://www.meetup.com/bottlerocket-community/" +type = "online" +description = """ +Join this meetup for community meetings held every other Wednesday. +This meetup features feedback sessions, release reviews, design reviews, as well as an interactive Q&A section. +""" \ No newline at end of file diff --git a/layouts/partials/event.html b/layouts/partials/event.html new file mode 100644 index 00000000..d643213f --- /dev/null +++ b/layouts/partials/event.html @@ -0,0 +1,9 @@ +
+

{{ .event.name }}

+
+ Date: {{.event.start_date}} + {{ if (isset .event "end_date") }} - {{.event.end_date}} + {{end}} +
+

{{ .event.description | markdownify }}

+
\ No newline at end of file diff --git a/layouts/partials/link.html b/layouts/partials/link.html new file mode 100644 index 00000000..4fce843f --- /dev/null +++ b/layouts/partials/link.html @@ -0,0 +1,7 @@ +
+

{{ .link.title }}

+
+ Date: {{ .link.date}} / Type: {{ .link.type}} +
+

{{ .link.description | markdownify }}

+
diff --git a/layouts/partials/meetup.html b/layouts/partials/meetup.html new file mode 100644 index 00000000..7eff4895 --- /dev/null +++ b/layouts/partials/meetup.html @@ -0,0 +1,7 @@ +
+

{{ .meetup.title }}

+
+ Type: {{ .meetup.type}} +
+

{{ .meetup.description | markdownify }}

+
diff --git a/layouts/shortcodes/events/loop.html b/layouts/shortcodes/events/loop.html new file mode 100644 index 00000000..628b0f80 --- /dev/null +++ b/layouts/shortcodes/events/loop.html @@ -0,0 +1,65 @@ +
+ + + +
+ +{{ $events_with_id := slice }} +{{ range $k, $v := $.Site.Data.events }} + {{ $events_with_id = $events_with_id | append (dict "event" $v "id" $k "start_date" $v.start_date) }} +{{ end }} + +{{ $events := sort $events_with_id "start_date" "desc" }} + +
+{{ range $events }} + {{- partial "event.html" . -}} +{{ end }} +
+ + \ No newline at end of file diff --git a/layouts/shortcodes/links/loop.html b/layouts/shortcodes/links/loop.html new file mode 100644 index 00000000..6679cfd0 --- /dev/null +++ b/layouts/shortcodes/links/loop.html @@ -0,0 +1,11 @@ +{{ $links_with_id := slice }} +{{ range $k, $v := $.Site.Data.links }} + {{ $links_with_id = $links_with_id | append (dict "link" $v "id" $k "date" $v.date) }} +{{ end }} + +{{ $links := sort $links_with_id "date" "desc" }} + + +{{ range $links }} + {{- partial "link.html" . -}} +{{ end }} \ No newline at end of file diff --git a/layouts/shortcodes/meetup/loop.html b/layouts/shortcodes/meetup/loop.html new file mode 100644 index 00000000..456ce3fd --- /dev/null +++ b/layouts/shortcodes/meetup/loop.html @@ -0,0 +1,11 @@ +{{ $meetups_with_id := slice }} +{{ range $k, $v := $.Site.Data.meetups }} + {{ $meetups_with_id = $meetups_with_id | append (dict "meetup" $v "id" $k "date" $v.date) }} +{{ end }} + +{{ $meetups := sort $meetups_with_id "date" "desc" }} + + +{{ range $meetups }} + {{- partial "meetup.html" . -}} +{{ end }} \ No newline at end of file