diff --git a/OWNERS b/OWNERS index cf57dd3921..906f057a2d 100644 --- a/OWNERS +++ b/OWNERS @@ -8,6 +8,7 @@ approvers: - a-mccarthy - abiogenesis-now - bradamant3 +- bradtopol - steveperry-53 - zacharysarah - chenopis diff --git a/_data/glossary/cloud-provider.yaml b/_data/glossary/cloud-provider.yaml new file mode 100644 index 0000000000..82ba2f4c22 --- /dev/null +++ b/_data/glossary/cloud-provider.yaml @@ -0,0 +1,10 @@ +id: cloud-provider +name: Cloud Provider +full-link: /docs/concepts/cluster-administration/cloud-providers +tags: +- community +short-description: > + Cloud provider is a company that offers cloud computing platform that can run Kubernetes clusters. +long-description: > + Cloud providers or sometime called Cloud Service Provider (CSPs) provides cloud computing platforms. They may offer services such as Infrastructure as a Service (IaaS) or Platform as a Service (PaaS). Cloud providers host the Kubernetes cluster and also provide services that interact with the cluster, such as Load Balancers, Storage Classes etc. + diff --git a/case-studies/index.html b/case-studies/index.html index d17c34b502..d3ce939c70 100644 --- a/case-studies/index.html +++ b/case-studies/index.html @@ -14,6 +14,12 @@ cid: caseStudies
+
+ huawei +

"Kubernetes basically solved most of our problems. Before, the time of deployment took about a week, now it only takes minutes."

+ + Read about Huawei +
Haufe Group

"Over the next couple of years, people won’t even think that much about it when they want to run containers. Kubernetes is going to be the go-to solution."

@@ -72,6 +78,7 @@ cid: caseStudies Goldman Sachs GolfNow Haufe Group + Huawei JD.COM LivePerson monzo diff --git a/docs/concepts/api-extension/custom-resources.md b/docs/concepts/api-extension/custom-resources.md index beaca92f97..4e22ccc635 100644 --- a/docs/concepts/api-extension/custom-resources.md +++ b/docs/concepts/api-extension/custom-resources.md @@ -159,7 +159,7 @@ Aggregated APIs offer more advanced API features and customization of other feat | Multi-versioning | Allows serving the same object through two API versions. Can help ease API changes like renaming fields. Less important if you control your client versions. | No | Yes | | Custom Storage | If you need storage with a different performance mode (for example, time-series database instead of key-value store) or isolation for security (for example, encryption secrets or different | No | Yes | | Custom Business Logic | Perform arbitrary checks or actions when creating, reading, updating or deleting an object | No, but can get some of the same effects with Initializers or Finalizers (requires programming) | Yes | -| Subresources | {::nomarkdown}
  • Add extra operations other than CRUD, such as "scale" or "exec"
  • Allows systems like like HorizontalPodAutoscaler and PodDisruptionBudget interact with your new resource
  • Finer-grained access control: user writes spec section, controller writes status section.
  • Allows incrementing object Generation on custom resource data mutation (requires separate spec and status sections in the resource)
{:/} | `status` and `scale` subresources are supported | Yes, any Subresource | +| Subresources | {::nomarkdown}
  • Add extra operations other than CRUD, such as "scale" or "exec"
  • Allows systems like HorizontalPodAutoscaler and PodDisruptionBudget interact with your new resource
  • Finer-grained access control: user writes spec section, controller writes status section.
  • Allows incrementing object Generation on custom resource data mutation (requires separate spec and status sections in the resource)
{:/} | No but planned | Yes, any Subresource | | strategic-merge-patch | The new endpoints support PATCH with `Content-Type: application/strategic-merge-patch+json`. Useful for updating objects that may be modified both locally, and by the server. For more information, see ["Update API Objects in Place Using kubectl patch"](/docs/tasks/run-application/update-api-object-kubectl-patch/) | No | Yes | | Protocol Buffers | The new resource supports clients that want to use Protocol Buffers | No | Yes | | OpenAPI Schema | Is there an OpenAPI (swagger) schema for the types that can be dynamically fetched from the server? Is the user protected from misspelling field names by ensuring only allowed fields are set? Are types enforced (in other words, don't put an `int` in a `string` field?) | No but planned | Yes | diff --git a/docs/concepts/cluster-administration/sysctl-cluster.md b/docs/concepts/cluster-administration/sysctl-cluster.md index 6fa32786cb..796c735bb2 100644 --- a/docs/concepts/cluster-administration/sysctl-cluster.md +++ b/docs/concepts/cluster-administration/sysctl-cluster.md @@ -130,10 +130,13 @@ to schedule those pods onto the right nodes. ## PodSecurityPolicy Annotations -The use of sysctl in pods can be controlled via annotations on the PodSecurityPolicy. +The use of sysctl in pods can be controlled via annotation on the PodSecurityPolicy. -Here is an example, it authorizes binding user creating pod with corresponding -_safe_ and _unsafe_ sysctls. +Sysctl annotation represents a whitelist of allowed safe and unsafe sysctls +in a pod spec. It's a comma-separated list of plain sysctl names or sysctl patterns +(which end in `*`). The string `*` matches all sysctls. + +Here is an example, it authorizes binding user creating pod with corresponding sysctls. ```yaml apiVersion: extensions/v1beta1 @@ -141,8 +144,7 @@ kind: PodSecurityPolicy metadata: name: sysctl-psp annotations: - security.alpha.kubernetes.io/sysctls: 'kernel.shm_rmid_forced' - security.alpha.kubernetes.io/unsafe-sysctls: 'net.ipv4.route.*,kernel.msg*' + security.alpha.kubernetes.io/sysctls: 'net.ipv4.route.*,kernel.msg*' spec: ... ``` diff --git a/docs/concepts/configuration/pod-priority-preemption.md b/docs/concepts/configuration/pod-priority-preemption.md index 72d67ac2a5..dc482b11e1 100644 --- a/docs/concepts/configuration/pod-priority-preemption.md +++ b/docs/concepts/configuration/pod-priority-preemption.md @@ -220,10 +220,11 @@ can be scheduled on N. P might become feasible on N only if a Pod on another Node is preempted. Here's an example: * Pod P is being considered for Node N. -* Pod Q is running on another Node in the same zone as Node N. -* Pod P has anti-affinity with Pod Q. -* There are no other cases of anti-affinity between Pod P and other Pods in the zone. -* In order to schedule Pod P on Node N, Pod Q should be preempted, but scheduler +* Pod Q is running on another Node in the same Zone as Node N. +* Pod P has Zone-wide anti-affinity with Pod Q +(`topologyKey: failure-domain.beta.kubernetes.io/zone`). +* There are no other cases of anti-affinity between Pod P and other Pods in the Zone. +* In order to schedule Pod P on Node N, Pod Q can be preempted, but scheduler does not perform cross-node preemption. So, Pod P will be deemed unschedulable on Node N. diff --git a/docs/concepts/overview/kubernetes-api.md b/docs/concepts/overview/kubernetes-api.md index e01e1905f2..8e10dc2bcf 100644 --- a/docs/concepts/overview/kubernetes-api.md +++ b/docs/concepts/overview/kubernetes-api.md @@ -24,7 +24,7 @@ What constitutes a compatible change and how to change the API are detailed by t ## OpenAPI and Swagger definitions -Complete API details are documented using [Swagger v1.2](http://swagger.io/) and [OpenAPI](https://www.openapis.org/). The Kubernetes apiserver (aka "master") exposes an API that can be used to retrieve the Swagger v1.2 Kubernetes API spec located at `/swaggerapi`. You can also enable a UI to browse the API documentation at `/swagger-ui` by passing the `--enable-swagger-ui=true` flag to apiserver. +Complete API details are documented using [Swagger v1.2](http://swagger.io/) and [OpenAPI](https://www.openapis.org/). The Kubernetes apiserver (aka "master") exposes an API that can be used to retrieve the Swagger v1.2 Kubernetes API spec located at `/swaggerapi`. Starting with Kubernetes 1.4, OpenAPI spec is also available at [`/swagger.json`](https://git.k8s.io/kubernetes/api/openapi-spec/swagger.json). While we are transitioning from Swagger v1.2 to OpenAPI (aka Swagger v2.0), some of the tools such as kubectl and swagger-ui are still using v1.2 spec. OpenAPI spec is in Beta as of Kubernetes 1.5. diff --git a/docs/concepts/services-networking/ingress.md b/docs/concepts/services-networking/ingress.md index 8715d3ecfe..7716da443b 100644 --- a/docs/concepts/services-networking/ingress.md +++ b/docs/concepts/services-networking/ingress.md @@ -60,7 +60,7 @@ kind: Ingress metadata: name: test-ingress annotations: - ingress.kubernetes.io/rewrite-target: / + nginx.ingress.kubernetes.io/rewrite-target: / spec: rules: - http: diff --git a/docs/concepts/storage/volumes.md b/docs/concepts/storage/volumes.md index 85c9d9d4f1..1e141129bf 100644 --- a/docs/concepts/storage/volumes.md +++ b/docs/concepts/storage/volumes.md @@ -70,6 +70,7 @@ Kubernetes supports several types of Volumes: * `azureFile` * `cephfs` * `configMap` + * `csi` * `downwardAPI` * `emptyDir` * `fc` (fibre channel) diff --git a/docs/getting-started-guides/ubuntu/installation.md b/docs/getting-started-guides/ubuntu/installation.md index 1cd44ca77e..f02bcb5bdb 100644 --- a/docs/getting-started-guides/ubuntu/installation.md +++ b/docs/getting-started-guides/ubuntu/installation.md @@ -175,7 +175,7 @@ mkdir -p ~/.kube Copy the kubeconfig file to the default location. ``` -sudo juju scp kubernetes-master/0:/home/ubuntu/config ~/.kube/config +juju scp kubernetes-master/0:/home/ubuntu/config ~/.kube/config ``` The next step is to install the kubectl client on your local machine. The recommended way to do this on Ubuntu is using the kubectl snap ([https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-with-snap-on-ubuntu](https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-with-snap-on-ubuntu)). diff --git a/docs/getting-started-guides/windows/index.md b/docs/getting-started-guides/windows/index.md index 666b455120..648a80e48c 100644 --- a/docs/getting-started-guides/windows/index.md +++ b/docs/getting-started-guides/windows/index.md @@ -493,6 +493,11 @@ Some of these limitations will be addressed by the community in future releases - Mount propagation is not supported on Windows - The StatefulSet functionality for stateful applications is not supported - Horizontal Pod Autoscaling for Windows Server Container pods has not been verified to work end-to-end +- Hyper-V isolated containers are not supported. +- Windows container OS must match the Host OS. If it does not, the pod will get stuck in a crash loop. +- Under the networking models of L3 or Host GW, Kubernetes Services are inaccessible to Windows nodes due to a Windows issue. This is not an issue if using OVN/OVS for networking. +- Windows kubelet.exe may fail to start when running on Windows Server under VMware Fusion [issue 57110](https://github.com/kubernetes/kubernetes/pull/57124) +- Flannel and Weavenet are not yet supported - Windows container OS must match the Host OS. If it does not, the pod will get stuck in a crash loop. - Under the networking models of L3 or Host GW, Kubernetes Services are inaccessible to Windows nodes due to a Windows issue. This is not an issue if using OVN/OVS for networking. - Windows kubelet.exe may fail to start when running on Windows Server under VMware Fusion [issue 57110](https://github.com/kubernetes/kubernetes/pull/57124) diff --git a/docs/home/contribute/includes.md b/docs/home/contribute/includes.md index 0f6099085f..c7da927162 100644 --- a/docs/home/contribute/includes.md +++ b/docs/home/contribute/includes.md @@ -62,7 +62,7 @@ changed by setting the for_k8s_version variable. ## Glossary -You can reference glossary terms with an inclusion that will automatically update and replace content with the relevant links from [our glossary](docs/reference/glossary/). When the term is moused-over by someone +You can reference glossary terms with an inclusion that will automatically update and replace content with the relevant links from [our glossary](/docs/reference/glossary/). When the term is moused-over by someone using the online documentation, the glossary entry will display a tooltip. The raw data for glossary terms is stored at [https://github.com/kubernetes/website/tree/master/_data/glossary](https://github.com/kubernetes/website/tree/master/_data/glossary), with a YAML file for each glossary term. diff --git a/docs/reference/generated/kubernetes-api/v1.9/index.html b/docs/reference/generated/kubernetes-api/v1.9/index.html index d2777e193c..86e75f54e9 100644 --- a/docs/reference/generated/kubernetes-api/v1.9/index.html +++ b/docs/reference/generated/kubernetes-api/v1.9/index.html @@ -520,7 +520,6 @@ Appears In: -<<<<<<< HEAD 201
CronJob Created @@ -532,19 +531,6 @@ Appears In: 200
CronJob OK -======= -200
CronJob -OK - - -201
CronJob -Created - - -202
CronJob -Accepted - ->>>>>>> bb8c59a640337f352e57a094ddac20bd6bbd4715

Patch

@@ -2249,10 +2235,6 @@ spec: -202
DaemonSet -Accepted - - 200
DaemonSet OK @@ -2260,6 +2242,10 @@ spec: 201
DaemonSet Created + +202
DaemonSet +Accepted +

Patch

@@ -2441,13 +2427,13 @@ spec: -201
DaemonSet -Created - - 200
DaemonSet OK + +201
DaemonSet +Created +

Delete

@@ -3512,13 +3498,13 @@ $ curl -X GET http:// -201
DaemonSet -Created - - 200
DaemonSet OK + +201
DaemonSet +Created +
@@ -5994,7 +5980,6 @@ $ kubectl proxy 200
Deployment -<<<<<<< HEAD OK @@ -6266,14 +6251,8 @@ $ kubectl proxy 200
Scale -======= ->>>>>>> bb8c59a640337f352e57a094ddac20bd6bbd4715 OK - -201
Deployment -Created -
@@ -9942,10 +9921,6 @@ Appears In: 200
Pod OK - -201
Pod -Created -

Replace Status

@@ -13157,13 +13132,13 @@ Appears In: -201
ReplicaSet -Created - - 200
ReplicaSet OK + +201
ReplicaSet +Created +

Misc Operations

@@ -13727,10 +13702,6 @@ Appears In: -202
ReplicationController -Accepted - - 200
ReplicationController OK @@ -13738,6 +13709,10 @@ Appears In: 201
ReplicationController Created + +202
ReplicationController +Accepted +

Patch

@@ -15729,13 +15704,13 @@ Appears In: -201
StatefulSet -Created - - 200
StatefulSet OK + +201
StatefulSet +Created +

Delete

@@ -17253,7 +17228,6 @@ Appears In: -<<<<<<< HEAD 200
Endpoints OK @@ -17265,19 +17239,6 @@ Appears In: 202
Endpoints Accepted -======= -201
Endpoints -Created - - -202
Endpoints -Accepted - - -200
Endpoints -OK - ->>>>>>> bb8c59a640337f352e57a094ddac20bd6bbd4715

Patch

@@ -25414,6 +25375,10 @@ Appears In: +201
PersistentVolumeClaim +Created + + 202
PersistentVolumeClaim Accepted @@ -25421,10 +25386,6 @@ Appears In: 200
PersistentVolumeClaim OK - -201
PersistentVolumeClaim -Created -

Patch

@@ -27968,10 +27929,6 @@ Appears In: -200
VolumeAttachment -OK - - 201
VolumeAttachment Created @@ -27979,6 +27936,10 @@ Appears In: 202
VolumeAttachment Accepted + +200
VolumeAttachment +OK +

Patch

@@ -30113,6 +30074,10 @@ Appears In: +200
CustomResourceDefinition +OK + + 201
CustomResourceDefinition Created @@ -30120,10 +30085,6 @@ Appears In: 202
CustomResourceDefinition Accepted - -200
CustomResourceDefinition -OK -

Patch

@@ -35010,7 +34971,6 @@ Appears In: -<<<<<<< HEAD 202
InitializerConfiguration Accepted @@ -35022,19 +34982,6 @@ Appears In: 201
InitializerConfiguration Created -======= -201
InitializerConfiguration -Created - - -202
InitializerConfiguration -Accepted - - -200
InitializerConfiguration -OK - ->>>>>>> bb8c59a640337f352e57a094ddac20bd6bbd4715

Patch

@@ -37780,10 +37727,6 @@ Appears In: -200
PodTemplate -OK - - 201
PodTemplate Created @@ -37791,6 +37734,10 @@ Appears In: 202
PodTemplate Accepted + +200
PodTemplate +OK +

Patch

@@ -40626,13 +40573,13 @@ Appears In: -201
PriorityClass -Created - - 200
PriorityClass OK + +201
PriorityClass +Created +

Delete

@@ -41593,13 +41540,13 @@ Appears In: -201
PodPreset -Created - - 200
PodPreset OK + +201
PodPreset +Created +

Delete

@@ -42636,6 +42583,10 @@ Appears In: +202
PodSecurityPolicy +Accepted + + 200
PodSecurityPolicy OK @@ -42643,10 +42594,6 @@ Appears In: 201
PodSecurityPolicy Created - -202
PodSecurityPolicy -Accepted -

Patch

@@ -44820,6 +44767,10 @@ Appears In: +202
CertificateSigningRequest +Accepted + + 200
CertificateSigningRequest OK @@ -44827,10 +44778,6 @@ Appears In: 201
CertificateSigningRequest Created - -202
CertificateSigningRequest -Accepted -

Patch

@@ -45004,13 +44951,13 @@ Appears In: -201
CertificateSigningRequest -Created - - 200
CertificateSigningRequest OK + +201
CertificateSigningRequest +Created +

Delete

@@ -47844,10 +47791,6 @@ Appears In: -202
LocalSubjectAccessReview -Accepted - - 200
LocalSubjectAccessReview OK @@ -47855,6 +47798,10 @@ Appears In: 201
LocalSubjectAccessReview Created + +202
LocalSubjectAccessReview +Accepted +
@@ -50220,13 +50167,13 @@ Appears In: -201
Node -Created - - 200
Node OK + +201
Node +Created +

Proxy Operations

@@ -51967,13 +51914,13 @@ Appears In: -201
PersistentVolume -Created - - 200
PersistentVolume OK + +201
PersistentVolume +Created +

Delete

@@ -53201,13 +53148,13 @@ Appears In: -201
ResourceQuota -Created - - 200
ResourceQuota OK + +201
ResourceQuota +Created +

Delete

@@ -54439,7 +54386,6 @@ Appears In: -<<<<<<< HEAD 200
Role OK @@ -54451,19 +54397,6 @@ Appears In: 202
Role Accepted -======= -201
Role -Created - - -202
Role -Accepted - - -200
Role -OK - ->>>>>>> bb8c59a640337f352e57a094ddac20bd6bbd4715

Patch

@@ -57090,6 +57023,10 @@ Appears In: +200
ServiceAccount +OK + + 201
ServiceAccount Created @@ -57097,10 +57034,6 @@ Appears In: 202
ServiceAccount Accepted - -200
ServiceAccount -OK -

Patch

@@ -58287,6 +58220,10 @@ Appears In: +200
SubjectAccessReview +OK + + 201
SubjectAccessReview Created @@ -58294,10 +58231,6 @@ Appears In: 202
SubjectAccessReview Accepted - -200
SubjectAccessReview -OK -
@@ -70962,6 +70895,10 @@ Appears In: +201
ClusterRole +Created + + 202
ClusterRole Accepted @@ -70969,10 +70906,6 @@ Appears In: 200
ClusterRole OK - -201
ClusterRole -Created -

Patch

@@ -71861,6 +71794,10 @@ Appears In: +200
ClusterRoleBinding +OK + + 201
ClusterRoleBinding Created @@ -71868,10 +71805,6 @@ Appears In: 202
ClusterRoleBinding Accepted - -200
ClusterRoleBinding -OK -

Patch

@@ -72045,13 +71978,13 @@ Appears In: -200
ClusterRoleBinding -OK - - 201
ClusterRoleBinding Created + +200
ClusterRoleBinding +OK +

Delete

@@ -72944,13 +72877,13 @@ Appears In: -201
ClusterRoleBinding -Created - - 200
ClusterRoleBinding OK + +201
ClusterRoleBinding +Created +

Delete

@@ -73674,6 +73607,10 @@ Appears In: +201
ControllerRevision +Created + + 202
ControllerRevision Accepted @@ -73681,10 +73618,6 @@ Appears In: 200
ControllerRevision OK - -201
ControllerRevision -Created -

Patch

@@ -74841,7 +74774,6 @@ Appears In: -<<<<<<< HEAD 201
ControllerRevision Created @@ -74853,19 +74785,6 @@ Appears In: 200
ControllerRevision OK -======= -202
ControllerRevision -Accepted - - -200
ControllerRevision -OK - - -201
ControllerRevision -Created - ->>>>>>> bb8c59a640337f352e57a094ddac20bd6bbd4715

Patch

@@ -77802,10 +77721,6 @@ spec: -202
DaemonSet -Accepted - - 200
DaemonSet OK @@ -77813,6 +77728,10 @@ spec: 201
DaemonSet Created + +202
DaemonSet +Accepted +

Patch

@@ -79662,13 +79581,13 @@ spec: -200
DaemonSet -OK - - 201
DaemonSet Created + +200
DaemonSet +OK +

Delete

@@ -89312,7 +89231,6 @@ $ kubectl proxy -<<<<<<< HEAD 200
DeploymentRollback OK @@ -89323,14 +89241,6 @@ $ kubectl proxy 202
DeploymentRollback Accepted -======= -201
Deployment -Created - - -200
Deployment -OK ->>>>>>> bb8c59a640337f352e57a094ddac20bd6bbd4715 @@ -91228,13 +91138,13 @@ Appears In: -201
HorizontalPodAutoscaler -Created - - 200
HorizontalPodAutoscaler OK + +201
HorizontalPodAutoscaler +Created +

Delete

@@ -92577,10 +92487,6 @@ Appears In: -200
LocalSubjectAccessReview -OK - - 201
LocalSubjectAccessReview Created @@ -92588,6 +92494,10 @@ Appears In: 202
LocalSubjectAccessReview Accepted + +200
LocalSubjectAccessReview +OK +
@@ -95968,15 +95878,7 @@ Appears In: -<<<<<<< HEAD 200
Scale -======= -201
ReplicaSet -Created - - -200
ReplicaSet ->>>>>>> bb8c59a640337f352e57a094ddac20bd6bbd4715 OK @@ -96228,6 +96130,10 @@ Appears In: +200
ReplicaSet +OK + + 201
ReplicaSet Created @@ -96235,10 +96141,6 @@ Appears In: 202
ReplicaSet Accepted - -200
ReplicaSet -OK -

Patch

@@ -99513,13 +99415,13 @@ Appears In: -201
Role -Created - - 200
Role OK + +201
Role +Created +

Delete

@@ -101639,10 +101541,6 @@ Appears In: -202
RoleBinding -Accepted - - 200
RoleBinding OK @@ -101650,6 +101548,10 @@ Appears In: 201
RoleBinding Created + +202
RoleBinding +Accepted +

Patch

@@ -105622,10 +105524,6 @@ Appears In: -202
StatefulSet -Accepted - - 200
StatefulSet OK @@ -105633,6 +105531,10 @@ Appears In: 201
StatefulSet Created + +202
StatefulSet +Accepted +

Patch

diff --git a/docs/reference/security.md b/docs/reference/security.md index 65c778712f..76e3919083 100644 --- a/docs/reference/security.md +++ b/docs/reference/security.md @@ -19,7 +19,7 @@ We’re extremely grateful for security researchers and users that report vulner To make a report, please email the private [kubernetes-security@googlegroups.com](mailto:kubernetes-security@googlegroups.com) list with the security details and the details expected for [all Kubernetes bug reports](https://git.k8s.io/kubernetes/.github/ISSUE_TEMPLATE.md). -You may encrypt your email to this list using the GPG keys of the [Product Security Team members](https://git.k8s.io/community/contributors/devel/security-release-process.md#product-security-team-pst). Encryption using GPG is NOT required to make a disclosure. +You may encrypt your email to this list using the GPG keys of the [Product Security Team members](https://git.k8s.io/sig-release/security-release-process-documentation/security-release-process.md#product-security-team-pst). Encryption using GPG is NOT required to make a disclosure. ### When Should I Report a Vulnerability? @@ -35,7 +35,7 @@ You may encrypt your email to this list using the GPG keys of the [Product Secur ## Security Vulnerability Response -Each report is acknowledged and analyzed by Product Security Team members within 3 working days. This will set off the [Security Release Process](https://git.k8s.io/community/contributors/devel/security-release-process.md#product-security-team-pst). +Each report is acknowledged and analyzed by Product Security Team members within 3 working days. This will set off the [Security Release Process](https://git.k8s.io/sig-release/security-release-process-documentation/security-release-process.md#disclosures). Any vulnerability information shared with Product Security Team stays within Kubernetes project and will not be disseminated to other projects unless it is necessary to get the issue fixed. diff --git a/docs/setup/pick-right-solution.md b/docs/setup/pick-right-solution.md index 35349edb6a..9302ce6950 100644 --- a/docs/setup/pick-right-solution.md +++ b/docs/setup/pick-right-solution.md @@ -166,12 +166,8 @@ GCE | CoreOS | CoreOS | flannel | [docs](/docs/gettin Vagrant | CoreOS | CoreOS | flannel | [docs](/docs/getting-started-guides/coreos/) | Community ([@pires](https://github.com/pires), [@AntonioMeireles](https://github.com/AntonioMeireles)) Bare-metal (Offline) | CoreOS | CoreOS | flannel | [docs](/docs/getting-started-guides/coreos/bare_metal_offline/) | Community ([@jeffbean](https://github.com/jeffbean)) CloudStack | Ansible | CoreOS | flannel | [docs](/docs/getting-started-guides/cloudstack/) | Community ([@sebgoa](https://github.com/sebgoa)) -<<<<<<< HEAD VMware vSphere | any | multi-support | multi-support | [docs](https://vmware.github.io/vsphere-storage-for-kubernetes/documentation/) | [Community](https://vmware.github.io/vsphere-storage-for-kubernetes/documentation/contactus.html) -======= -Vmware vSphere | Saltstack | Debian | OVS | [docs](/docs/getting-started-guides/vsphere/) | Community ([@imkin](https://github.com/imkin)) Bare-metal | custom | CentOS | flannel | [docs](/docs/getting-started-guides/centos/centos_manual_config/) | Community ([@coolsvap](https://github.com/coolsvap)) ->>>>>>> bb8c59a640337f352e57a094ddac20bd6bbd4715 lxd | Juju | Ubuntu | flannel/canal | [docs](/docs/getting-started-guides/ubuntu/local/) | [Commercial](https://www.ubuntu.com/kubernetes) and [Community](https://jujucharms.com/kubernetes) AWS | Juju | Ubuntu | flannel/calico/canal | [docs](/docs/getting-started-guides/ubuntu/) | [Commercial](https://www.ubuntu.com/kubernetes) and [Community](https://jujucharms.com/kubernetes) Azure | Juju | Ubuntu | flannel/calico/canal | [docs](/docs/getting-started-guides/ubuntu/) | [Commercial](https://www.ubuntu.com/kubernetes) and [Community](https://jujucharms.com/kubernetes) diff --git a/docs/tasks/administer-cluster/weave-network-policy.md b/docs/tasks/administer-cluster/weave-network-policy.md index fa86a6baad..c7576a99b7 100644 --- a/docs/tasks/administer-cluster/weave-network-policy.md +++ b/docs/tasks/administer-cluster/weave-network-policy.md @@ -38,7 +38,7 @@ The output is similar to this: ``` NAME READY STATUS RESTARTS AGE IP NODE -weave-net-1t1qg 2/2 Running 0 9d 192.168.2.10 workndoe3 +weave-net-1t1qg 2/2 Running 0 9d 192.168.2.10 worknode3 weave-net-231d7 2/2 Running 1 7d 10.2.0.17 worknodegpu weave-net-7nmwt 2/2 Running 3 9d 192.168.2.131 masternode weave-net-pmw8w 2/2 Running 0 9d 192.168.2.216 worknode2 diff --git a/docs/tutorials/stateless-application/hello-minikube.md b/docs/tutorials/stateless-application/hello-minikube.md index f8353290f8..24ca4951ee 100644 --- a/docs/tutorials/stateless-application/hello-minikube.md +++ b/docs/tutorials/stateless-application/hello-minikube.md @@ -341,7 +341,7 @@ Output: - ingress: disabled ``` -Minikube must be running for these command to take effect. To enable `heapster` addon, for example: +Minikube must be running for these commands to take effect. To enable `heapster` addon, for example: ```shell minikube addons enable heapster diff --git a/docs/update-user-guide-links.py b/docs/update-user-guide-links.py index 94915827ef..7c449d73ef 100644 --- a/docs/update-user-guide-links.py +++ b/docs/update-user-guide-links.py @@ -12,7 +12,7 @@ def find_documents_to_rewrite(): rewrites = [] for doc in moved_docs: location = doc_location(doc) - destinations = get_desinations_for_doc(doc) + destinations = get_destinations_for_doc(doc) if len(destinations) == 0: print("Unable to get possible destinations for %s" % doc) @@ -35,7 +35,7 @@ def doc_location(filename): REDIRECT_REGEX = re.compile("^.*\[(.*)\]\((.*)\)$") -def get_desinations_for_doc(filename): +def get_destinations_for_doc(filename): destination_paths = [] with open(filename) as f: lines = [line.rstrip('\n').rstrip('\r') for line in f.readlines()]