Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes in style and more on CDK #5292

Merged
merged 3 commits into from
Oct 3, 2017

Conversation

ktsakalozos
Copy link
Contributor

@ktsakalozos ktsakalozos commented Sep 4, 2017

A number of mainly style fixes on the ubuntu docs.

Allow edits from maintainers checkbox


This change is Reviewable

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 4, 2017
@k8sio-netlify-preview-bot
Copy link
Collaborator

k8sio-netlify-preview-bot commented Sep 4, 2017

Deploy preview ready!

Built with commit 0b0d03b

https://deploy-preview-5292--kubernetes-io-master-staging.netlify.com

Copy link
Contributor

@tvansteenburgh tvansteenburgh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good content, just a bunch of typo/grammatical fixes requested.


Exporting of cluster data is not supported at this time.
The `snapshot` action of the etcd charm allows the operator to snapshot
a running clusters data for use in cloning,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cluster's

Exporting of cluster data is not supported at this time.
The `snapshot` action of the etcd charm allows the operator to snapshot
a running clusters data for use in cloning,
backing up, or migrating to new clusters deployments.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

backing up, or migrating to a new cluster.

- **param** skip-backup: Don't backup any existing data.


## Migrating and etcd cluster
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/and/an/


```
juju deploy etcd new-etcd --resource snapshot=./etcd-snapshot-2016-11-09-02.41.47.tar.gz
```

Step 4: Re-Initialize the master with the data from the resource we just attached
**Step 4:** Re-Initialize the master with the data from the resource we just attached
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reinitialize


{% capture prerequisites %}
This page assumes you have a working Juju deployed cluster.

**Warning:** By the time you've reached this step you should have backed up your workloads and pertinent data, this section is for the complete destruction of a cluster.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/,/;/

Two methods of upgrading workers are supported.
[Blue/Green Deployment](http://martinfowler.com/bliki/BlueGreenDeployment.html)
and upgrade-in-place. Both methods are provided for operational flexibility and both
are supported and tested. Blue/Green will require more hardware up front than inplace,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in-place

---

{% capture overview %}
This page will outline how to ensure that a Juju deployed Kubernetes cluster has stood up correctly and is ready to accept workloads.
This page will outline how to ensure that a Juju deployed Kubernetes
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Juju-deployed

[Kinds of tests](https://git.k8s.io/community/contributors/devel/e2e-tests.md#kinds-of-tests)
to, we encourage you to see the [upstream documentation on the different types
of tests](https://git.k8s.io/community/contributors/devel/e2e-tests.md#kinds-of-tests),
and to strongly understand what subsets of the tests you are running.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/strongly/thoroughly/

@@ -106,11 +107,12 @@ places. The raw output of the e2e run is available in the `juju show-action-outp
command, as well as a flat file on disk on the `kubernetes-e2e` unit that
executed the test.

> Note: The results will only be available once the action has
**Note:** The results will only be available once the action has
completed the test run. End-to-end testing can be quite time intensive. Often
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

End-to-end testing can be quite time consuming, often

@@ -149,7 +151,8 @@ on the kubernetes-worker units.

## Upgrading the e2e tests

The e2e tests are always expanding, you can see if there's an upgrade available by running `juju status kubernetes-e2e`.
The e2e tests are always expanding, you can see if there's an upgrade
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/,/;/

Copy link
Contributor

@tvansteenburgh tvansteenburgh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@ktsakalozos
Copy link
Contributor Author

Hi @Bradamant3 did you comment on this PR? I did get an email but I do not see your comment here.

How can I check the issue with the italics you brought up? In both chrome and firefox the installation page renders correctly without escaping the * character.

Thank you.

@ktsakalozos
Copy link
Contributor Author

@Bradamant3 is there anything I can do to have this PR unblocked? Thank you.

@steveperry-53
Copy link
Contributor

Merging this in the spirit of having the Ubuntu docs maintained by the Ubuntu people.

@steveperry-53 steveperry-53 merged commit e4fd3f8 into kubernetes:master Oct 3, 2017
cnef pushed a commit to ghostcloud-cn/kubernetes.github.io that referenced this pull request Oct 3, 2017
…hub.io into format-example-code

* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Remove broken link (kubernetes#5726)
  unified style (kubernetes#5725)
  Fixes in style and more on CDK (kubernetes#5292)
  Use code style for inline code and commands (kubernetes#5724)
  Fix link. (kubernetes#5723)
  Update distribute-credentials-secure.md (kubernetes#5169)
  Update documentation for vSphere Persistent Volume support (kubernetes#5465)
  Update _redirects
  Update scale-intro.html
  Update cluster-management.md (kubernetes#4980)
  ingress grammar/spelling updates (kubernetes#5721)
  Fix an incorrect flag in configure-upgrade-etcd.md (kubernetes#5304)
  Updated PR template for GH workaround (kubernetes#5719)
  separate commands from output (kubernetes#5718)
  explain how to enable heapster on minikube (kubernetes#5710)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants