Skip to content

Update master to Hugo version 0.57.2#16814

Merged
k8s-ci-robot merged 1 commit intokubernetes:masterfrom
zacharysarah:update-hugo-for-1.16
Oct 27, 2019
Merged

Update master to Hugo version 0.57.2#16814
k8s-ci-robot merged 1 commit intokubernetes:masterfrom
zacharysarah:update-hugo-for-1.16

Conversation

@zacharysarah
Copy link
Copy Markdown
Contributor

This PR reintroduces #16094, which replicates #16104 and #16151 for master (and thereby current and future versions).

Fixes #16066

Context

#16066 exhibits behavior characteristic of gohugoio/hugo#5615. To resolve the issue, we need to upgrade Hugo to a version that includes the solution.

Because #16094 got lost in the release timing shuffle, this PR didn't make it into master.

/sig docs
/priority important-soon

/assign @aimeeu

@k8s-ci-robot k8s-ci-robot added sig/docs Categorizes an issue or PR as relevant to SIG Docs. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 11, 2019
@netlify
Copy link
Copy Markdown

netlify bot commented Oct 11, 2019

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

Built with commit 40ecf09

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

Copy link
Copy Markdown
Contributor

@sftim sftim left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, no objection. Not sure I know enough about Hugo to give a solid thumbs up.


[build.environment]
HUGO_VERSION = "0.53"
HUGO_VERSION = "0.57.2"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zacharysarah , Do you know how netlify is configured to use the extended version of Hugo? Just wondered.
Also, the other week I saw PR #16708 upgrade netlify for the code shortcode issue on the release-1.16 branch. I think this PR upgraded Hugo to the latest version.

Has the Makefile been updated to this version of Hugo (for local testing)?

Copy link
Copy Markdown
Contributor

@aimeeu aimeeu Oct 11, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kbhawkey - Thanks for pointing that out! The makefile has not been updated. And thanks for pointing out PR 16708, which set the HUGO_VERSION to 0.58.3! That's a release head of 0.57.2, which is specified in this PR.

Your Netflify question is great too! Poking around, it looks like Netlify supplies build images with pre-installed software; [build settings(https://www.netlify.com/docs/build-settings/) and build images. I have not been able to locate information on which versions of Hugo are installed on each build image. However I did come across this: "If you would like to use the new Sass compilation features in recent Hugo releases (using the “extended” version of the binaries), you can use the new build image selection setting (currently in beta) to select the Ubuntu Xenial 16.04 image, which supports all Hugo versions." Kubernetes uses the Ubuntu 16 build image. I didn't find anything on the Netlify site about configuring the Hugo version as '0.57.2/extended' in the netlify.toml file - the docs only mention version numbers.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kbhawkey

Do you know how netlify is configured to use the extended version of Hugo?

I don't. I'm not sure I know what "extended version" means in the context of Hugo--I'll do some research!

I think this PR upgraded Hugo to the latest version.

Thanks for raising visibility on that PR, along with @aimeeu. That's a problematic PR for a host of unrelated reasons, and it's been reverted.

Has the Makefile been updated to this version of Hugo (for local testing)?

Good catch, I'll do that now.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I noticed that Intermediate - view your changes locally states "Install Hugo version 0.53 or later." That should change to something like "Install the Hugo version specified in website/netlify.toml." Can you make that change in this PR or do you want a separate PR?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aimeeu To prevent scope creep, that’s a separate issue and PR. I’m happy to open those and link them to this PR.

@aimeeu
Copy link
Copy Markdown
Contributor

aimeeu commented Oct 11, 2019

End user acceptance testing https://deploy-preview-16813--k8s-v1-15.netlify.com/

  • "latest version" link in deprecation warning on k8s.io points to https://kubernetes.io/docs/home/ (from issue 16606)
  • "latest version" link in deprecation warning on k8s.io/docs/home points to https://kubernetes.io/docs/home/ (from issue 16606)
  • links on Home page point to 1.15 version
  • reference API docs 1.15 version and buttons work
  • eyeball links on various pages to make sure they all point to 1.15

Locally:

  1. Fetch the PR
  2. run from <website_dir>: $ make check-hugo-versions
  • output states the Hugo versions match between Makefile and netlify.toml
  1. Install Hugo version specified and compile site using hugo server
    • One compile warning:
    Building sites … WARN 2019/10/11 10:59:15 Content directory "/home/aimee/Dev/git/github.com/aimeeu/k8s/sigdocs/website/content/en/docs/reference/kubernetes-api" have both index.* and _index.* files, pick one.
    
  • Docs smoke test page renders correctly
  1. Build the Docker container
  • make docker-image builds a Docker image with the Hugo version specified in the makefile
  • make docker-serve executes without error

Based on my random testing, I'd say this is good to push once the makefile has been updated.

Update Makefile for 0.57.2
@zacharysarah
Copy link
Copy Markdown
Contributor Author

@aimeeu

search results return 1.15 pages - NO search results return links to non-deprecated content (looks like this how it's always worked)

Yup! That's intentional: diluting our SEO across multiple versions of the same page is a bad idea.

@kbhawkey
Copy link
Copy Markdown
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 Oct 16, 2019
@zacharysarah
Copy link
Copy Markdown
Contributor Author

zacharysarah commented Oct 16, 2019

@aimeeu If this looks good to you, please /approve.

Oh wait, you can't yet. 😳 @zparnold Please wrangle, wrangler! 🤠

@zacharysarah
Copy link
Copy Markdown
Contributor Author

/assign @bradtopol

@jimangel
Copy link
Copy Markdown
Member

/lgtm
/approve

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jimangel

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

The pull request process is described here

Details 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 Oct 27, 2019
@k8s-ci-robot k8s-ci-robot merged commit 41ea6d4 into kubernetes:master Oct 27, 2019
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. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. sig/docs Categorizes an issue or PR as relevant to SIG Docs. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Broken link to latest Kubernetes documentation

7 participants