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.

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

Blog Migration: Continuation of WIP PR #7144 #7247

Merged
merged 12 commits into from Apr 3, 2018

Conversation

tehut
Copy link
Contributor

@tehut tehut commented Feb 6, 2018

UPDATE (@zacharysarah): Closes #5823

Continuation of WIP PR #7144

Migration currently feature complete with the following issues remaining to be resolved:
Intended Fix: Switch from official paginate gem to popular paginate-v2
- inconsistent resolution of liquid tags by official paginate gem on aggregation page
- had some trouble propagating changes that appeared on the index page. This is part
of the issue with the main paginate-gem and the primary reason to switch
Still missing:

Allow edits from maintainers checkbox


This change is Reviewable

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Feb 6, 2018
@k8s-ci-robot k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Feb 6, 2018
@tengqm
Copy link
Contributor

tengqm commented Feb 6, 2018

/assign @chenopis

@heckj
Copy link
Contributor

heckj commented Feb 14, 2018

👋 I tracked down the netlify failure (either above, or related to https://app.netlify.com/sites/kubernetes-io-master-staging/deploys/5a83dc1cfd0efa61de658997) - there's an issue with dependencies when using the jekyll plugins that were defined and added as a part of this work - specifically "jekyll-youtube". I'll circle back and see if I can help identify what versions are needed, as I was doing some emergency repair work on dependency updates recently to solve a build/deploy failure sequence yesterday

@heckj
Copy link
Contributor

heckj commented Feb 14, 2018

/assign

@heckj
Copy link
Contributor

heckj commented Feb 15, 2018

I snagged this and rebased it, resolving the netlify build problem. One gemfile needed to be updated, and the whole Gemfile.lock benefited from an update. You can see the delta comparing to #7416.

The short notes on how to do this:

rvm use ruby-2.2.9
bundle install
bundle update

and then review the Gemfile and Gemfile.lock files for changes. I can make a PR back to tehut's branch, you can just cherry pick what you want from my branch, or you can replicate the steps - but it's important to rebase this off github.com/kubernetes/website master branch to also get the changes we made to resolve from jekyll build breaks yesterday

@heckj
Copy link
Contributor

heckj commented Feb 15, 2018

It does look like you've enabled maintainers to update this branch, so there's also the option of me pushing a commit onto this branch if that would be easier...

@k8sio-netlify-preview-bot
Copy link
Collaborator

Deploy preview for kubernetes-io-master-staging ready!

Built with commit 04e9733

https://deploy-preview-7247--kubernetes-io-master-staging.netlify.com

@tehut
Copy link
Contributor Author

tehut commented Feb 16, 2018

@heckj Thanks again and I'm sorry I didn't see the comments on this PR earlier! I updated the PR with your commit and everything worked beautifully so feel free to close #7416.

@zacharysarah , et al I added a small fix to the sidebar and it looks like it fixed one thing and broke another. Just wanted to document that I've seen the issue and will address it in my next PR

@tehut tehut force-pushed the master branch 10 times, most recently from 5848e70 to 0432621 Compare February 21, 2018 07:43
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 8, 2018
@zacharysarah
Copy link
Contributor

@heckj There is one! #7610

updating Gemfile.lock with bundle install (rvm use ruby-2.2.9)

Updated links in header and footer

switch to paginate v2 gem

comment sidebar logic

fixing css regression

retry paginate

updated local ruby version

reverting to original pagination gem

remove text, make heading roboto, next/prev as buttons
@tehut
Copy link
Contributor Author

tehut commented Mar 9, 2018

@zacharysarah @heckj Sorry about the delay with my rebase. It looks like everything but tide pool is passing now.

format checking new posts

shrink fab-icons down to 33px
@tehut tehut force-pushed the master branch 2 times, most recently from d3edfcd to 47b798b Compare March 29, 2018 04:03
@zacharysarah
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 3, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: heckj, zacharysarah

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot merged commit 4e22f60 into kubernetes:master Apr 3, 2018
zacharysarah pushed a commit that referenced this pull request Apr 16, 2018
* WIP

* fixing layouts and assets

updating Gemfile.lock with bundle install (rvm use ruby-2.2.9)

Updated links in header and footer

switch to paginate v2 gem

comment sidebar logic

fixing css regression

retry paginate

updated local ruby version

reverting to original pagination gem

remove text, make heading roboto, next/prev as buttons

* reintoduce dir tree changes

format checking new posts

shrink fab-icons down to 33px

* reintoduce dir tree changes

format checking new posts

shrink fab-icons down to 33px

* next/prev buttons on posts and index

* Change "latest" to v1.10

* rename .md to match old blog and added explict permalinks for urls

* replacing a link to old blog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Migrate the K8s blog from Blogger to GitHub
7 participants