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

Convert site to Hugo #8316

Merged
merged 1 commit into from
May 5, 2018
Merged

Conversation

bep
Copy link
Contributor

@bep bep commented May 5, 2018

This commit converts content and layout to use Hugo.

This includes a complete Netlify configuration (see netlify.toml) for production and branches (incl. PRs), so this should just work.

Note that you should clean up some old config in the Netlify console, but netlify.toml should take precedence.

There are some known tasks that need to be done to make this conversion complete, but that is easier to do once this is merged. Then edits can be applied without having to think about keeping the two content trees in synch.

@k8s-ci-robot
Copy link
Contributor

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.


Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels May 5, 2018
@k8sio-netlify-preview-bot
Copy link
Collaborator

k8sio-netlify-preview-bot commented May 5, 2018

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

Built with commit e524d67

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

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels May 5, 2018
@zacharysarah
Copy link
Contributor

/approve
/hold

@bep 👋 Please resolve the merge conflicts.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 5, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 5, 2018
@bep
Copy link
Contributor Author

bep commented May 5, 2018

@zacharysarah this PR didn't have any merge conflicts when I opened it. This operation only works if you put a effective freeze on the master branch during the review of this PR.

And that includes a revert or whatever of 7745f0e -- which made the conflict in this case.

If I have to go back and do a new migration for every commit you make from now on in master, that is 1-2 hours per migration, which does not sound cost effective.

This commit converts content and layout to use Hugo.
@bep bep force-pushed the hugo-migration-rc1 branch from 5766c4c to e524d67 Compare May 5, 2018 15:27
@bep
Copy link
Contributor Author

bep commented May 5, 2018

@zacharysarah I have "hand rebased" against master, which was OK for this one small change. But any "bigger changes" needs a roundtrip via a full conversion, so a freeze of some sort would be good.

@zacharysarah
Copy link
Contributor

@bep 👋

I have "hand rebased" against master, which was OK for this one small change.

👍

a freeze of some sort would be good

Done. A freeze is in place, announced in #sig-docs Slack.

@zacharysarah
Copy link
Contributor

Here we go. 🚀

/lgtm
/hold cancel

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels May 5, 2018
@k8s-ci-robot k8s-ci-robot merged commit 7f3b633 into kubernetes:master May 5, 2018
@guybrush
Copy link

i think this change is unintended?

it should be:

apt-get update && apt-get install -y docker-ce=$(apt-cache madison docker-ce | grep 17.03 | head -1 | awk '{print $3}')

not:

apt-get update && apt-get install -y docker-ce=$(apt-cache madison docker-ce | grep 17.03 | head -1 | awk '{print }')

note: i did not test the command without $3

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.

5 participants