diff --git a/cluster/gce/trusty/master.yaml b/cluster/gce/trusty/master.yaml index 826c46b616f..73cf72c3bb5 100644 --- a/cluster/gce/trusty/master.yaml +++ b/cluster/gce/trusty/master.yaml @@ -205,7 +205,7 @@ Content-Disposition: attachment; filename="kube-master-health-monitoring.conf" #upstart-job -description "Kubenetes master health monitoring" +description "Kubernetes master health monitoring" start on stopped kube-docker diff --git a/cluster/gce/trusty/node.yaml b/cluster/gce/trusty/node.yaml index 17cdcfe88b2..587f8c52c97 100644 --- a/cluster/gce/trusty/node.yaml +++ b/cluster/gce/trusty/node.yaml @@ -258,7 +258,7 @@ Content-Type: text/upstart-job; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="kube-node-health-monitoring.conf" -description "Kubenetes node health monitoring" +description "Kubernetes node health monitoring" start on stopped kube-docker diff --git a/cluster/vsphere/util.sh b/cluster/vsphere/util.sh index 6f04de1e493..ef04eda6498 100755 --- a/cluster/vsphere/util.sh +++ b/cluster/vsphere/util.sh @@ -322,7 +322,7 @@ function setup-pod-routes { done - # identify the subnet assigned to the node by the kubernertes controller manager. + # identify the subnet assigned to the node by the kubernetes controller manager. KUBE_NODE_BRIDGE_NETWORK=() for (( i=0; i<${#NODE_NAMES[@]}; i++)); do printf " finding network of cbr0 bridge on node ${NODE_NAMES[$i]}\n" diff --git a/docs/proposals/image-provenance.md b/docs/proposals/image-provenance.md index 827c9eb81b3..9a7d3d5013d 100644 --- a/docs/proposals/image-provenance.md +++ b/docs/proposals/image-provenance.md @@ -61,7 +61,7 @@ Non-goals include: * A third-party implementation of an image policy checker could optionally use ThirdPartyResource to store its policy. * Kubernetes core code dealing with concepts of image layers, build processes, source repositories, etc. * We expect there will be multiple PaaSes and/or de-facto programming environments, each with different takes on - these concepts. At any rate, Kuberenetes is not ready to be opinionated on these concepts. + these concepts. At any rate, Kubernetes is not ready to be opinionated on these concepts. * Sending more information than strictly needed to a third-party service. * Information sent by Kubernetes to a third-party service constitutes an API of Kubernetes, and we want to avoid making these broader than necessary, as it restricts future evolution of Kubernetes, and makes diff --git a/staging/src/k8s.io/client-go/copy.sh b/staging/src/k8s.io/client-go/copy.sh index db23a87f3ca..fb7f4b65b8a 100755 --- a/staging/src/k8s.io/client-go/copy.sh +++ b/staging/src/k8s.io/client-go/copy.sh @@ -71,7 +71,7 @@ ls "${CLIENT_REPO}" | { grep -v '_tmp' || true; } | xargs rm -rf mv "${CLIENT_REPO_TEMP}"/* "${CLIENT_REPO}" rm -r "${CLIENT_REPO_TEMP}" -echo "moving vendor/k8s.io/kuberentes" +echo "moving vendor/k8s.io/kubernetes" cp -rn "${CLIENT_REPO}"/vendor/k8s.io/kubernetes/. "${CLIENT_REPO}"/ rm -rf "${CLIENT_REPO}"/vendor/k8s.io/kubernetes # client-go will share the vendor of the main repo for now. When client-go