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

fix url for 1.11 docs #10087

Merged
merged 1 commit into from
Sep 5, 2018
Merged

fix url for 1.11 docs #10087

merged 1 commit into from
Sep 5, 2018

Conversation

mtaufen
Copy link
Contributor

@mtaufen mtaufen commented Aug 27, 2018

The URL was not updated to point to release-1.11 branch when 1.11 was released.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 27, 2018
@k8sio-netlify-preview-bot
Copy link
Collaborator

k8sio-netlify-preview-bot commented Aug 27, 2018

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

Built with commit c96781a

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

Copy link
Contributor

@xiangpengzhao xiangpengzhao left a comment

Choose a reason for hiding this comment

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

@mtaufen I guess you wanted to send this patch to 1.11 branch instead of master?

@@ -30,7 +30,7 @@ it simplifies node deployment and configuration management.

The subset of the Kubelet's configuration that can be configured via a file
is defined by the `KubeletConfiguration` struct
[here (v1beta1)](https://github.com/kubernetes/kubernetes/blob/release-1.10/pkg/kubelet/apis/kubeletconfig/v1beta1/types.go).
[here (v1beta1)](https://github.com/kubernetes/kubernetes/blob/release-1.11/pkg/kubelet/apis/kubeletconfig/v1beta1/types.go).
Copy link
Contributor

Choose a reason for hiding this comment

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

I guess you want to use param here.

[[params.versions]]
fullversion = "v1.11.0"
version = "v1.11"
githubbranch = "v1.11.0"
docsbranch = "release-1.11"
url = "https://kubernetes.io"

Then you don't need to hard-code the release version and modify it each release.

@chenopis the params are widely used in docs for such case, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.
Let me know if it looks right, the only other use I saw of docsbranch was in content/en/docs/concepts/configuration/assign-pod-node.md, so I just copied that.

Copy link
Contributor

Choose a reason for hiding this comment

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

@mtaufen I think this is the right way. Let @chenopis help confirm this :)

@Bradamant3
Copy link
Contributor

/assign @chenopis

@mtaufen
Copy link
Contributor Author

mtaufen commented Aug 27, 2018

@mtaufen I guess you wanted to send this patch to 1.11 branch instead of master?

I think, at least in the past, updates for whatever is on the current site were sent to master, and the release branches are more like pre-release docs staging that get merged into master after a release, or something like that. It's been a little while since I encountered that so I could be wrong.

The URL was not updated to point to release-1.11 branch when 1.11 was released.
This PR updates it to use the docsbranch param, so we don't have to
update it for every release.
@xiangpengzhao
Copy link
Contributor

I think, at least in the past, updates for whatever is on the current site were sent to master, and the release branches are more like pre-release docs staging that get merged into master after a release, or something like that. It's been a little while since I encountered that so I could be wrong.

I also miss something about the current version management mechanism. @Bradamant3 @chenopis @zacharysarah can you please give some explanation on this? Thanks!

@zacharysarah
Copy link
Contributor

@mtaufen Heya! 👋 For fixes to the current version (in this case 1.11), please base PRs on master.

@xiangpengzhao Thanks for the heads up! 🙇‍♂️

@mtaufen
Copy link
Contributor Author

mtaufen commented Aug 31, 2018

@chenopis friendly ping

@tengqm
Copy link
Contributor

tengqm commented Sep 5, 2018

/lgtm

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

/approve

@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 Sep 5, 2018
@k8s-ci-robot k8s-ci-robot merged commit e30e4c2 into kubernetes:master Sep 5, 2018
bsalamat pushed a commit to bsalamat/kubernetes.github.io that referenced this pull request Sep 7, 2018
The URL was not updated to point to release-1.11 branch when 1.11 was released.
This PR updates it to use the docsbranch param, so we don't have to
update it for every release.
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/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.

8 participants