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

Branch sync - Merge master with dev 1.19 #21073

Merged
merged 125 commits into from
May 20, 2020
Merged

Branch sync - Merge master with dev 1.19 #21073

merged 125 commits into from
May 20, 2020

Conversation

savitharaghunathan
Copy link
Member

Sync master with dev-1.19

cc: @zacharysarah @jimangel @kbarnard10

zhanw15 and others added 30 commits March 31, 2020 20:52
Hi,

crio installation steps for CentOS/RHEL distribution are not valid anymore(CBS repo does not exist anymore)

I'm updating the documentation following the exactly same instructions reported on crio official repository
updating link for community calendar
translating /docs/tasks/tools/install-minikube/ to Indonesia
…nstraints.md

Co-authored-by: LiuDui <1693291525@qq.com>
ID /docs/tasks/job/automated-tasks-with-cron-jobs/
Polish zh version of pod-topology-spread-constraints.md
Update crio installation steps for CentOS/RHEL
@k8s-ci-robot k8s-ci-robot added language/ja Issues or PRs related to Japanese language language/ko Issues or PRs related to Korean language labels May 19, 2020
@k8s-ci-robot k8s-ci-robot requested review from ahg-g and balopat May 19, 2020 21:04
@k8s-ci-robot k8s-ci-robot added language/pl Issues or PRs related to Polish language language/vi Issues or PRs related to Vietnamese language language/zh Issues or PRs related to Chinese language sig/docs Categorizes an issue or PR as relevant to SIG Docs. labels May 19, 2020
@jimangel
Copy link
Member

/LGTM

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 19, 2020
@fejta-bot
Copy link

Unknown CLA label state. Rechecking for CLA labels.

Send feedback to sig-testing, kubernetes/test-infra and/or fejta.
/check-cla

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 19, 2020
@kbhawkey
Copy link
Contributor

kbhawkey commented May 20, 2020

Hi @savitharaghunathan ,
The changes look good except for this change (that shows an X):
f1929c8

https://app.netlify.com/sites/kubernetes-io-master-staging/deploys/5ec42918bba0b0000785a9a1

@sftim
Copy link
Contributor

sftim commented May 20, 2020

I'm not sure why #21073 (comment) / https://app.netlify.com/sites/kubernetes-io-master-staging/deploys/5ec42918bba0b0000785a9a1 is a problem - that merge seems valid to me.

@kbhawkey do you have a theory about why GitHub shows that as a failed commit?

@kbhawkey
Copy link
Contributor

Hi. Nothing stands out in that pull request.
Look like the changes did not deploy. What happens if you "hit redeploy" in this pull request?
@savitharaghunathan , did you build your branch locally before sending in the PR?

@savitharaghunathan
Copy link
Member Author

Hi @kbhawkey, do you mean building it locally with hugo? If so, No I did not.

@kbhawkey
Copy link
Contributor

Hi @kbhawkey, do you mean building it locally with hugo? If so, No I did not.

Yes, did you build your branch locally with the correct version of Hugo (extended version).

@savitharaghunathan
Copy link
Member Author

savitharaghunathan commented May 20, 2020

Hi @kbhawkey, do you mean building it locally with hugo? If so, No I did not.

Yes, did you build your branch locally with the correct version of Hugo (extended version).

@kbhawkey No, I did not.

I followed the guide from docs role handbook -https://github.com/kubernetes/sig-release/tree/master/release-team/role-handbooks/docs#maintain-the-current-and-upcoming-dev-branch. If building with hugo locally is required, @jimangel or I could add this to the role handbook.

Do I need to build locally and force push this PR?

@jimangel
Copy link
Member

jimangel commented May 20, 2020

The changes look good except for this change (that shows an X):
f1929c8

https://app.netlify.com/sites/kubernetes-io-master-staging/deploys/5ec42918bba0b0000785a9a1

Failed during stage 'deploying site': Failed to execute deploy: Error: deploy timed out while waiting to enter states: prepared,ready

I almost wonder if this was just a blip in Netlify rather than a specific failure to the PR. I saw some funky time outs on 5/14 that I added more details on slack.

It appears that f1929c8 was merged on 5/14 so that lines up.

did you build your branch locally with the correct version of Hugo (extended version)?

Since this PR is a merge from master to sync the dev-x.Xy branch (no new content) what would the purpose be of testing a local build?

If it fails, it would mean there's issues in master with no clear ownership for repairing and if the merge fails, we'll see that in the open PR.

I am open to including the step in the handbook, but I want to be sure I understand the value.

@kbhawkey
Copy link
Contributor

Hi. I was not asking to change the handbook or challenge the process
Just thought that I would check my branch locally before pushing (because I do).
Regarding,
I almost wonder if this was just a blip in Netlify rather than a specific failure to the PR. I saw some funky time outs on 5/14 that I added more details on slack.
I too think that this is probably a Netlify error. Can we just hit the redeploy button and see if this "blip" resolves itself? In the past, I think we have given the go ahead and pushed the changes.
I think it would be good practice to figure out how to get a green line (every time).

@sftim
Copy link
Contributor

sftim commented May 20, 2020

Does Netlify test every commit? I didn't think it did.

@jimangel
Copy link
Member

Can we just hit the redeploy button and see if this "blip" resolves itself?

I like this idea! Just kicked off again.

I think it would be good practice to figure out how to get a green line (every time).

Agreed.

@jimangel
Copy link
Member

It looks like redeploying builds from the latest state not that specific commit / PR. That might answer the question from @sftim ...

@kbhawkey
Copy link
Contributor

This looks good now

@sftim
Copy link
Contributor

sftim commented May 20, 2020

/approve

@k8s-ci-robot
Copy link
Contributor

[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 /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 20, 2020
@k8s-ci-robot k8s-ci-robot merged commit 32d7f11 into kubernetes:dev-1.19 May 20, 2020
@savitharaghunathan savitharaghunathan deleted the merged-master-dev-1.19 branch May 20, 2020 15:11
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. area/blog Issues or PRs related to the Kubernetes Blog subproject cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. language/en Issues or PRs related to English language language/es Issues or PRs related to Spanish language language/id Issues or PRs related to Indonesian language language/it Issues or PRs related to Italian language language/ja Issues or PRs related to Japanese language language/ko Issues or PRs related to Korean language language/pl Issues or PRs related to Polish language language/vi Issues or PRs related to Vietnamese language language/zh Issues or PRs related to Chinese language lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/docs Categorizes an issue or PR as relevant to SIG Docs. 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.