diff --git a/Gemfile b/Gemfile index e07257c9127..638b5cf1e88 100644 --- a/Gemfile +++ b/Gemfile @@ -44,10 +44,10 @@ group :jekyll_plugins do gem "jekyll-theme-tactile", "0.0.3" gem "jekyll-theme-time-machine", "0.0.3" gem "jekyll-titles-from-headings", "~> 0.1" + gem "jekyll-include-cache", "~> 0.1" + gem 'jekyll-youtube', '~> 1.0' end -gem "jekyll-include-cache", "~> 0.1" - gem "kramdown", "~> 1.11" gem "rouge", "~> 2.0" gem "pry" diff --git a/Gemfile.lock b/Gemfile.lock index 4af0fc40657..050410dfc11 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,9 +12,9 @@ GEM ethon (0.11.0) ffi (>= 1.3.0) execjs (2.7.0) - faraday (0.13.1) + faraday (0.14.0) multipart-post (>= 1.2, < 3) - ffi (1.9.18) + ffi (1.9.21) forwardable-extended (2.6.0) jekyll (3.6.0) addressable (~> 2.4) @@ -33,11 +33,11 @@ GEM coffee-script (~> 2.2) jekyll-default-layout (0.1.4) jekyll (~> 3.0) - jekyll-feed (0.9.2) + jekyll-feed (0.9.3) jekyll (~> 3.3) - jekyll-gist (1.4.1) + jekyll-gist (1.5.0) octokit (~> 4.2) - jekyll-github-metadata (2.9.3) + jekyll-github-metadata (2.9.4) jekyll (~> 3.1) octokit (~> 4.0, != 4.4.0) jekyll-include-cache (0.1.0) @@ -49,13 +49,13 @@ GEM jekyll (~> 3.0) jekyll-redirect-from (0.13.0) jekyll (~> 3.3) - jekyll-relative-links (0.5.1) + jekyll-relative-links (0.5.2) jekyll (~> 3.3) - jekyll-sass-converter (1.5.0) + jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-seo-tag (2.3.0) + jekyll-seo-tag (2.4.0) jekyll (~> 3.3) - jekyll-sitemap (1.1.1) + jekyll-sitemap (1.2.0) jekyll (~> 3.3) jekyll-swiss (0.4.0) jekyll-theme-architect (0.0.3) @@ -86,35 +86,41 @@ GEM jekyll (~> 3.3) jekyll-theme-time-machine (0.0.3) jekyll (~> 3.3) - jekyll-titles-from-headings (0.5.0) + jekyll-titles-from-headings (0.5.1) jekyll (~> 3.3) - jekyll-watch (1.5.0) - listen (~> 3.0, < 3.1) + jekyll-watch (1.5.1) + listen (~> 3.0) + jekyll-youtube (1.0.0) + jekyll json (1.8.6) - kramdown (1.15.0) + kramdown (1.16.2) liquid (4.0.0) - listen (3.0.8) + listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) mercenary (0.3.6) method_source (0.9.0) - minima (2.1.1) - jekyll (~> 3.3) + minima (2.3.0) + jekyll (~> 3.5) + jekyll-feed (~> 0.9) + jekyll-seo-tag (~> 2.1) multipart-post (2.0.0) - octokit (4.7.0) + octokit (4.8.0) sawyer (~> 0.8.0, >= 0.5.3) - pathutil (0.16.0) + pathutil (0.16.1) forwardable-extended (~> 2.6) - pry (0.11.2) + pry (0.11.3) coderay (~> 1.1.0) method_source (~> 0.9.0) - public_suffix (3.0.0) + public_suffix (3.0.2) rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) rouge (2.2.1) + ruby_dep (1.5.0) safe_yaml (1.0.4) - sass (3.5.3) + sass (3.5.5) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -164,6 +170,7 @@ DEPENDENCIES jekyll-theme-tactile (= 0.0.3) jekyll-theme-time-machine (= 0.0.3) jekyll-titles-from-headings (~> 0.1) + jekyll-youtube (~> 1.0) json (~> 1.7, >= 1.7.7) kramdown (~> 1.11) minima (~> 2.0) @@ -173,4 +180,4 @@ DEPENDENCIES unicode-display_width (~> 1.1) BUNDLED WITH - 1.15.4 + 1.16.1 diff --git a/Makefile b/Makefile index 999feab316e..85ea30f6471 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ build: ## Build site with production settings and put deliverables in _site. bundle exec jekyll build build-preview: ## Build site with drafts and future posts enabled. - bundle exec jekyll build --drafts --future + bundle exec jekyll build --drafts --future --trace serve: ## Boot the development server. bundle exec jekyll serve diff --git a/_config.yml b/_config.yml index d0decddd540..2fe87ddc327 100644 --- a/_config.yml +++ b/_config.yml @@ -14,6 +14,10 @@ safe: false lsi: false latest: "v1.10" + +paginate: 7 +paginate_path: "/blog/page:num/" + defaults: - scope: @@ -66,6 +70,8 @@ plugins: - jekyll-sitemap - jekyll-seo-tag - jekyll-include-cache + - jekyll-paginate + - jekyll-youtube # disabled gems # - jekyll-redirect-from @@ -90,3 +96,4 @@ tocs: - samples - search - imported + - blog diff --git a/_includes/CommunityHangout/Apr3.html b/_includes/CommunityHangout/Apr3.html new file mode 100644 index 00000000000..e5637e0c520 --- /dev/null +++ b/_includes/CommunityHangout/Apr3.html @@ -0,0 +1,227 @@ +
+
+
+Every week the Kubernetes contributing community meet virtually over Google Hangouts. We want anyone who's interested to know what's discussed in this forum.
+
+
+
+Agenda:
+ +
+
+Notes from meeting:
+
    +
  1. +Quinton - Cluster federation
    +
  2. + +
+
+
    +
  1. +Satnam - Soak Test
    +
  2. + +
  3. +Brian - v1beta3 is enabled by default, v1beta1 and v1beta2 deprecated, turned off  in June.  Should still work with upgrading existing clusters, etc.
    +
  4. +
+
diff --git a/_includes/CommunityHangout/Mar27.html b/_includes/CommunityHangout/Mar27.html new file mode 100644 index 00000000000..a3a892119c3 --- /dev/null +++ b/_includes/CommunityHangout/Mar27.html @@ -0,0 +1,176 @@ + + + +
+
+ Every week the Kubernetes contributing community meet virtually over Google Hangouts. We want anyone who's interested to know what's discussed in this forum.
+
+
+
+ Agenda:
+
+ - Andy - demo remote execution and port forwarding
+
+ - Quinton - Cluster federation - Postponed
+
+ - Clayton - UI code sharing and collaboration around Kubernetes
+
+
+
+ Notes from meeting:
+
+ 1. Andy from RedHat:
+ +
+ 2. Clayton: where are we wrt a community organization for e.g. kubernetes UI components?
+ +
+ 3. Brian Grant:
+ +
+ 4. General consensus that 30 minutes is better than 60
+
+ +
diff --git a/_includes/footer.html b/_includes/footer.html index 4d15180920e..edda25d1d10 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,9 +1,9 @@ -