Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6
* 'master' of https://github.com/kubernetes/kubernetes.github.io: Update script.js Replace remaining kargo usages to kubespray
This commit is contained in:
@@ -32,7 +32,7 @@ to [kubeadm](../kubeadm) and [kops](../kops).
|
||||
|
||||
* You must have cloud instances or baremetal nodes running for your future Kubernetes cluster.
|
||||
A way to achieve that is to use the
|
||||
[kargo-cli tool](https://github.com/kubernetes-incubator/kubespray/blob/master/docs/getting-started.md).
|
||||
[kubespray-cli tool](https://github.com/kubernetes-incubator/kubespray/blob/master/docs/getting-started.md).
|
||||
* Or provision baremetal hosts with a tool-of-your-choice or launch cloud instances,
|
||||
then create an inventory file for Ansible with this [tool](https://github.com/kubernetes-incubator/kubespray/blob/master/contrib/inventory_builder/inventory.py).
|
||||
|
||||
@@ -65,7 +65,7 @@ to [kubeadm](../kubeadm) and [kops](../kops).
|
||||
#### Checklist
|
||||
|
||||
* Apply deployment with
|
||||
[kargo-cli tool](https://github.com/kubernetes-incubator/kubespray/blob/master/docs/getting-started.md)
|
||||
[kubespray-cli tool](https://github.com/kubernetes-incubator/kubespray/blob/master/docs/getting-started.md)
|
||||
or ``ansible-playbook``
|
||||
[manual commands](https://github.com/kubernetes-incubator/kubespray/blob/master/docs/getting-started.md#starting-custom-deployment).
|
||||
|
||||
@@ -95,6 +95,5 @@ Note, that it is highly unrecommended to delete production clusters with the res
|
||||
|
||||
## Feedback
|
||||
|
||||
* Slack Channel: [#kargo](https://kubernetes.slack.com/messages/kargo/)
|
||||
* Slack Channel: [#kubespray](https://kubernetes.slack.com/messages/kubespray/)
|
||||
* [GitHub Issues](https://github.com/kubernetes-incubator/kubespray/issues)
|
||||
|
||||
|
||||
+1
-1
@@ -35,7 +35,7 @@ function copyCode(elem){
|
||||
sweetAlert("Oh, no...","Sorry, your browser doesn't support document.execCommand('copy'), so we can't copy this code to your clipboard.");
|
||||
succeed = false;
|
||||
}
|
||||
if (succeed) sweetAlert("Copied to clipboard:",target.value);
|
||||
if (succeed) sweetAlert("Copied to clipboard: ",elem);
|
||||
return succeed;
|
||||
} else {
|
||||
sweetAlert("Oops!",elem + " not found when trying to copy code");
|
||||
|
||||
Reference in New Issue
Block a user