From 67e4f54aaa5de8cb767acec9d9b852638201c64f Mon Sep 17 00:00:00 2001 From: Dan Kohn Date: Tue, 27 Jun 2017 10:44:35 -0400 Subject: [PATCH 1/2] Replace remaining kargo usages to kubespray --- docs/getting-started-guides/kubespray.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/getting-started-guides/kubespray.md b/docs/getting-started-guides/kubespray.md index 404176aa29..17c1e446bc 100644 --- a/docs/getting-started-guides/kubespray.md +++ b/docs/getting-started-guides/kubespray.md @@ -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) - From f0c445980d5c58b7706f13bc84e749c7e080cbaf Mon Sep 17 00:00:00 2001 From: Ryan McGinnis Date: Tue, 27 Jun 2017 08:58:02 -0700 Subject: [PATCH 2/2] Update script.js In copyCode function, removes target.value from if (succeed) sweetAlert function. Sometimes target.value is too long, which causes the sweetAlert box to be cut off from the page. The confirmation button also gets cut off, which means that the user can't close the box, which means they need to refresh the page to continue. Instead, the alert tells the user which file was copied. --- js/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/script.js b/js/script.js index 9b9dde3958..21e8012399 100755 --- a/js/script.js +++ b/js/script.js @@ -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");