Merge pull request #919 from microwavables/updating-community-details

Updated community and resources pages

README.md

@@ -33,11 +33,13 @@ building and testing the code, submitting PRs, and other contributor topics.
 ## Community meetings
 
 Pinniped is better because of our contributors and [maintainers](MAINTAINERS.md). It is because of you that we can bring great 
-software to the community. Please join us during our online community meetings,
+software to the community. Please join us during our online community meetings, occurring every first and third 
-occurring every first and third Thursday of the month at 9 AM PT / 12 PM ET.
+Thursday of the month at 9 AM PT / 12 PM ET. 
-Use [this Zoom Link](https://go.pinniped.dev/community/zoom)
+
-to attend and add any agenda items you wish to discuss
+**Note:** Community meetings are currently paused until early 2022 as we wind down 2021! 
-to [the notes document](https://hackmd.io/rd_kVJhjQfOvfAWzK8A3tQ?view).
+
+Use [this Zoom Link](https://go.pinniped.dev/community/zoom) to attend and add any agenda items you wish to 
+discuss to [the notes document](https://go.pinniped.dev/community/agenda). 
 Join our [Google Group](https://groups.google.com/g/project-pinniped) to receive invites to this meeting.
 
 If the meeting day falls on a US holiday, please consider that occurrence of the meeting to be canceled.

site/content/community/_index.html

@@ -35,9 +35,9 @@ layout: section
             </div>
             <div class="content">
                 <h3><a href="{{< param "community_url" >}}">Community Meetings</a></h3>
-                <p>Pinniped Community Meetings are held every first and third Thursday of the month at 9 AM PT / 12 PM ET</p>
+                <p>Pinniped <a href="https://go.pinniped.dev/community/agenda">Community Meetings</a> are on hold until early 2022. Stay tuned for more details on our return. Happy Holidays!</p>
                 <p>Join our <a href="https://groups.google.com/u/1/g/project-pinniped">Google Group</a> to receive invites to the meeting</p>
-                <p>Watch previous community meetings on our <a href="https://www.youtube.com/playlist?list=PL7bmigfV0EqQ8qYn8ornuJnuGvCt0belt">YouTube playlist</a></p>
+                <p>Watch previous community meetings on our <a href="https://go.pinniped.dev/community/youtube">YouTube playlist</a></p>
             </div>
         </div>
     </div>

site/content/resources/_index.html

@@ -12,31 +12,6 @@ layout: section
     <h2>Resources about Pinniped, such as videos, podcasts, and community articles</h2>
     <div class="grid three">
 
-        <div class="col">
-            <div class="embed-responsive">
-                <iframe class="embed-responsive-item"
-                        src="https://www.youtube-nocookie.com/embed/YGeO1jKfgac?start=138"
-                        title="YouTube video player"
-                        frameborder="0"
-                        allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
-                        allowfullscreen>
-                </iframe>
-            </div>
-            <div class="content">
-                <p>
-                    <a href="https://www.cncf.io/online-programs/cncf-live-webinar-easy-secure-kubernetes-authentication-with-pinniped/"
-                       target="_blank">
-                        CNCF Live Webinar: Easy, Secure Kubernetes Authentication With Pinniped - August 24, 2021
-                        [VIDEO]
-                    </a>
-                    <a href="https://docs.google.com/presentation/d/1euA62C7SHQpHewPqPaxTvNEKdvyNOdU9MDWh3YN3NvY/edit?usp=sharing"
-                       target="_blank">
-                        [SLIDES]
-                    </a>
-                </p>
-            </div>
-        </div>
-
         <div class="col">
             <a href="https://github.com/vmware-tanzu/pinniped">
                 <div class="icon">
@@ -49,5 +24,57 @@ layout: section
             </a>
         </div>
 
+        <div class="col">
+            <div class="icon">
+                <img src="/img/logo.svg" />
+            </div>
+            <div class="content">
+                <p class="strong">Community Meetings and Demos</p>
+                <p>We have a YouTube playlist for our Pinniped community meetings and demos, <a href="https://go.pinniped.dev/community/youtube">check it out here</a>.</p>
+            </div>
+        </div>
+
+        <div class="col">
+            <div class="embed-responsive">
+                <iframe class="embed-responsive-item" src="https://www.youtube.com/embed/OCkTnElNE9M"></iframe>
+            </div>
+            <div class="content">
+                <p><a href="https://www.youtube.com/watch?v=OCkTnElNE9M&feature=emb_logo">KubeCon + CloudNativeCon North America 2021: Everything Wrong with K8s Authentication and How We Worked Around It with Mo Khan & Margo Crawford</a></p>
+            </div>
+       </div>
+
+       <div class="col">
+           <div class="embed-responsive">
+               <iframe class="embed-responsive-item" src="https://www.youtube.com/embed/2fI_XOGEoIU"></iframe>
+           </div>
+           <div class="content">
+               <p><a href="https://www.youtube.com/watch?v=2fI_XOGEoIU&feature=emb_logo">Pinniped: A Unified Framework for User Authentication to Kubernetes Cluster with Mo Khan & Anjali Telang</a></p>
+           </div>
+      </div>
+       <div class="col">
+        <div class="embed-responsive">
+            <iframe class="embed-responsive-item"
+                    src="https://www.youtube-nocookie.com/embed/YGeO1jKfgac?start=138"
+                    title="YouTube video player"
+                    frameborder="0"
+                    allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+                    allowfullscreen>
+            </iframe>
+        </div>  
+        <div class="content">
+            <p>
+                <a href="https://www.cncf.io/online-programs/cncf-live-webinar-easy-secure-kubernetes-authentication-with-pinniped/"
+                   target="_blank">
+                    CNCF Live Webinar: Easy, Secure Kubernetes Authentication With Pinniped - August 24, 2021
+                    [VIDEO]
+                </a>
+                <a href="https://docs.google.com/presentation/d/1euA62C7SHQpHewPqPaxTvNEKdvyNOdU9MDWh3YN3NvY/edit?usp=sharing"
+                   target="_blank">
+                    [SLIDES]
+                </a>
+            </p>
+        </div>
+    </div>
+
     </div>
 </div>

site/redirects/go.pinniped.dev/netlify.toml

@@ -12,7 +12,7 @@
 
 [[redirects]]
   from = "/community/agenda"
-  to = "https://hackmd.io/rd_kVJhjQfOvfAWzK8A3tQ?view"
+  to = "https://hackmd.io/rd_kVJhjQfOvfAWzK8A3tQ"
   status = 302
   force = true