Skip to content

Merged master into dev 1.18#18768

Merged
k8s-ci-robot merged 31 commits intokubernetes:dev-1.18from
VineethReddy02:vineeth-merged-master-dev-1.18
Jan 19, 2020
Merged

Merged master into dev 1.18#18768
k8s-ci-robot merged 31 commits intokubernetes:dev-1.18from
VineethReddy02:vineeth-merged-master-dev-1.18

Conversation

@VineethReddy02
Copy link
Copy Markdown
Contributor

@VineethReddy02 VineethReddy02 commented Jan 19, 2020

Merged master into dev-1.18 to keep in sync

Signed-off-by: vineeth vineethpothulapati@outlook.com

@zacharysarah @jimangel

Fale and others added 30 commits January 16, 2020 05:24
* Use Control Plane instead of Master

* improve image. The SVG was not matching the PNG, so I basically had to re-create it from scratch. I kept the visual similarities as mush as possible

* remove tautological phrase

* fix glossary references as well

* improve cluster glossary to move from Master to Control Plane

* improve english form
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
Signed-off-by: ialidzhikov <i.alidjikov@gmail.com>
* Update k8s.io/docs/tutorials/hello-minikube

* Update hello-minikube.md
This resolves `no matches for kind "DaemonSet" in version "extensions/v1beta1"` with Kubernetes >=1.16.
"AND of exact match" in the "Affinity and anti-affinity" section should be "AND or exact match"
Introduce a couple of paragraphs explaining what backup folders
kubeadm creates during upgrade.
* [DOCS-DE] rewrite setup index page

* fix table caption

* fix whitespace
* fix the link for conjure-up

* Fix the link for conjure-up to docs.conjure-up.io
The kubeadm survey for 1.13:
https://docs.google.com/forms/d/1A855D054FZfdvNbx6mAa54tcZ204GmPCIhxe1UrXKd8/edit#responses

The kubeadm survey for 1.13:
https://docs.google.com/forms/d/1A855D054FZfdvNbx6mAa54tcZ204GmPCIhxe1UrXKd8/edit#responses

Revealed the top 3 plugins in terms of popularity are:

Flannel
Calico
WeaveNet
The kubeadm maintainers are in contact with the maintainers
of these plugins and can provide support and updates to this guide.

The rest of the plugins in the guide are unmaintained, by the kubeadm team!

Some plugins are not in the CNCF landscape, or maintained by the kubeadm team, but still
present in the guide.

Remove the following non-CNCF / unmaintained plugins:

AWS VPC
Romana
Juniper*
Canal (it is an alternative to Calico and already explained in the
Calico guide)
Add note that users can still defer to this page for more options and a more complete list:
https://kubernetes.io/docs/concepts/cluster-administration/networking/Revealed the top 3 plugins in terms of popularity are:
- Flannel
- Calico
- WeaveNet

The kubeadm maintainers are in contact with the maintainers
of these plugins and can provide support and updates to this guide.

Some plugins are not in the CNCF landscape, but still
covered in this page:
https://kubernetes.io/docs/concepts/cluster-administration/networking/

Remove the following non-CNCF plugins:
- AWS VPC
- Romana
- Juniper*
- Canal (it is an alternative to Calico and already explained in the
Calico guide)

Add note that users can still defer to this page for more options:
https://kubernetes.io/docs/concepts/cluster-administration/networking/
* Added a new section on Azure CNI

Azure provides a CNI for native integration of Kubernetes Pods in a Virtual Network. I have added a short description of this CNI and provided links to important documentation

* Update networking.md

* Made updates based on comments

This is much closer to what you are recommending. Please take a look
On the page, it says `as you .KUBECONFIG` whereas it is meant `as your
.KUBECONFIG`. Minor annoyance, but still benefits fixing. One char PR.

Signed-off-by: Mariyan Dimitrov <mariyan.dimitrov@gmail.com>
#17542)

The text gives me an impression that LegacyNodeRoleBehavior somehow
affects which label is in effect. But actually it doesn't.
On the latest Debian 10, the `arptables-legacy` and `ebtables-legacy` binaries are not installed by default. Although the (non-legacy) versions are installed by default, it appears the respective packages that provide the legacy binaries must be installed in order to switch to the legacy alternatives. If you attempt to switch to the legacy alternatives without installing the `arptables` and `ebtables` packages, you will see an error:
```
update-alternatives: error: alternative /usr/sbin/arptables-legacy for arptables not registered; not setting
```

I have confirmed that the packages are present on Debian 10 and Ubuntu 19.10 and they provide the legacy alternatives. See:
* https://packages.ubuntu.com/eoan/amd64/iptables/filelist
* https://packages.ubuntu.com/eoan/amd64/arptables/filelist
* https://packages.ubuntu.com/eoan/amd64/ebtables/filelist
* https://packages.debian.org/buster/amd64/iptables/filelist
* https://packages.debian.org/buster/amd64/arptables/filelist
* https://packages.debian.org/buster/amd64/ebtables/filelist
The notes for the other languages seem outdated and we should stick to
the default version.

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
Signed-off-by: vineeth <vineethpothulapati@outlook.com>
@k8sio-netlify-preview-bot
Copy link
Copy Markdown
Collaborator

Deploy preview for kubernetes-io-vnext-staging processing.

Building with commit 247c484

https://app.netlify.com/sites/kubernetes-io-vnext-staging/deploys/5e23de802515a30008f147d1

@k8s-ci-robot k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jan 19, 2020
@k8s-ci-robot k8s-ci-robot added language/de Issues or PRs related to German language language/en Issues or PRs related to English language language/ja Issues or PRs related to Japanese language language/zh Issues or PRs related to Chinese language sig/docs Categorizes an issue or PR as relevant to SIG Docs. labels Jan 19, 2020
@fejta-bot
Copy link
Copy Markdown

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 Jan 19, 2020
@sftim
Copy link
Copy Markdown
Contributor

sftim commented Jan 19, 2020

@VineethReddy02 / other people: can you give me a hint on what the review & approval process looks like for this kind of PR?
(I'm new to being an approver)

@jimangel
Copy link
Copy Markdown
Member

jimangel commented Jan 19, 2020

@VineethReddy02 / other people: can you give me a hint on what the review & approval process looks like for this kind of PR?

@sftim see the handbook (Step 3: Maintain the current and upcoming dev / release branches) for an overview of the process.

For review, I look at the dev-1.18 branch. As of writing this, the branch is 30 commits behind master. This PR is 31 commits, which adds up since the +1 commit is @VineethReddy02's merge.

One very important note is that this PR will need the tide/merge-method-merge label which can only be added by humans with write access to the repo. (context)

This looks good to me @VineethReddy02! Will you add the merge-method label? If you can't, find me on Slack and lets fix that.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 19, 2020
@VineethReddy02 VineethReddy02 added the tide/merge-method-merge Denotes a PR that should use a standard merge by tide when it merges. label Jan 19, 2020
@sftim
Copy link
Copy Markdown
Contributor

sftim commented Jan 19, 2020

/approve

@k8s-ci-robot
Copy link
Copy Markdown
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

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 Jan 19, 2020
@k8s-ci-robot k8s-ci-robot merged commit 954c59b into kubernetes:dev-1.18 Jan 19, 2020
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. language/de Issues or PRs related to German language language/en Issues or PRs related to English language language/ja Issues or PRs related to Japanese 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. tide/merge-method-merge Denotes a PR that should use a standard merge by tide when it merges.

Projects

None yet

Development

Successfully merging this pull request may close these issues.