Merge the tutorials under tutorials->clusters into tutorials->security #31014
Conversation
k8s-ci-robot
added
cncf-cla: yes
k8s-ci-robot
added
the
sig/docs
|
✔️ Deploy Preview for kubernetes-io-main-staging ready! 🔨 Explore the source changes: cb9a103 🔍 Inspect the deploy log: https://app.netlify.com/sites/kubernetes-io-main-staging/deploys/61db55dc3a076700077eca9a 😎 Browse the preview: https://deploy-preview-31014--kubernetes-io-main-staging.netlify.app |
|
Hi @shannonxtreme @daminisatya can you PTAL at this PR when you are free. Thanks |
|
Preview of updated page: Redirects in the preview are working /lgtm |
k8s-ci-robot
added
the
lgtm
|
LGTM label has been added. Git tree hash: c9d90bad61517c4a7a6b47fcc5de462efd3ae528
|
|
/lgtm leaving approval for @sftim |
k8s-ci-robot
added
the
sig/security
static/_redirects
Outdated
| /docs/tutorials/clusters/apparmor/ /docs/tutorials/security/apparmor/ 301 | ||
| /docs/tutorials/clusters/seccomp/ /docs/tutorials/security/seccomp/ 301 |
There was a problem hiding this comment.
nit: I'd usually put this before the localization-specific redirects.
k8s-ci-robot
added
approved
|
Oh, merge conflict? @Babapool would you like help fixing that? |
|
Yes please, I would definitely love the help in fixing this merge conflict. Thank you @sftim. (Also will you be able to tell me more about this conflict because when I opened the PR GitHub told me it can be merged, thanks.) |
|
Also I can push the nit changes only after the merge conflict is resolved? @sftim |
|
Hi @Babapool, merge conflicts happen when another contributor changes to the same file/ line of a file. In this case, looks like conflict may be in the Try following the steps outlined in the merge conflict and rebasing and if you have any questions, feel free to reach out in #sig-docs slack channel |
|
Hi @annajung, I will try to follow the steps outline and in case of any doubts I will surely reach out in the slack channel. Thanks |
k8s-ci-robot
added
size/XXL
|
With your permission @Babapool I can fix this one up for you and push the squashed change to your fork. https://kubernetes.io/docs/contribute/new-content/open-a-pr/#squashing-commits covers how to do a squash; for learning how to rebase in general, I'd look to the wider internet for a guide / book / video that fits your level of Git experience. |
|
@sftim Thank you, it would be really great if you could handle this one for me. I'll read up on this more so that I can handle such situations in a better manner next time. Thanks again! |
k8s-ci-robot
added
size/S
|
Try that! |
|
/remove-area blog |
k8s-ci-robot
removed
area/blog
|
/approve |
Co-Authored-By: Tim Bannister <tim@scalefactory.com>
|
/approve cancel |
k8s-ci-robot
added
the
lgtm
|
LGTM label has been added. Git tree hash: c389793990610adfee0365074f5def07a8b4754c
|
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: sftim 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 |
|
Hi @sftim, Thank you once again for handling this one for me. Hope to handle such cases better next time. |
Fixes #30778
It moves the move the tutorials under https://github.com/kubernetes/website/tree/main/content/en/docs/tutorials/clusters into https://github.com/kubernetes/website/tree/main/content/en/docs/tutorials/security
The Clusters section is merged into the Security section here: https://github.com/kubernetes/website/blob/main/content/en/docs/tutorials/_index.md
Based on the suggestion made in the PR comment : #30422 (review)
Also redirects of the tutorial has been made to their new location ( Since this is my first PR working with
redirectsand involvesmoving of files, appreciate all the feedback)Signed by : Vitthal Sai vitthalsai2001@gmail.com