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.

Sign up for GitHub

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

Jump to bottom

Delete the simple-yaml.md example #16411

Merged
merged 1 commit into from
Nov 13, 2015
Merged

Delete the simple-yaml.md example #16411

merged 1 commit into from
Nov 13, 2015
+10 −124

Conversation

feihujiang
Copy link
Contributor

Fix #15355

@k8s-github-robot
Copy link

Labelling this PR as size/M

@k8s-github-robot k8s-github-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Oct 28, 2015
@feihujiang feihujiang force-pushed the deleteSimpleYamlDocInUserGuide branch from 35108ea to 807f79c Compare October 28, 2015 07:07
@k8s-github-robot
Copy link

Labelling this PR as size/L

@k8s-github-robot k8s-github-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 28, 2015
@feihujiang feihujiang force-pushed the deleteSimpleYamlDocInUserGuide branch from 807f79c to b26e2ed Compare October 28, 2015 07:25
@k8s-bot
Copy link

k8s-bot commented Oct 28, 2015

GCE e2e test build/test passed for commit 35108ea7342fe66f773a3d8d0a7445178445cdf0.

@k8s-bot
Copy link

k8s-bot commented Oct 28, 2015

GCE e2e test build/test passed for commit 807f79c2ac9dff796dfe5bb500b30a34d5ab64a5.

@k8s-bot
Copy link

k8s-bot commented Oct 28, 2015

GCE e2e test build/test passed for commit b26e2ed4b41f06d0dff4c05c4a26a27e85fe2a7b.

@bgrant0607
Copy link
Member

Thanks.

Is replication.yaml tested in examples/examples_test.go?

Please search for links to this doc and update them also.

@feihujiang feihujiang force-pushed the deleteSimpleYamlDocInUserGuide branch from b26e2ed to 1196931 Compare November 2, 2015 06:56
@k8s-bot
Copy link

k8s-bot commented Nov 2, 2015

GCE e2e test build/test passed for commit 1196931e2fb692ebedda54a78227516059c0637f.

@feihujiang feihujiang force-pushed the deleteSimpleYamlDocInUserGuide branch from 1196931 to 1ddf331 Compare November 2, 2015 07:27
@feihujiang
Copy link
Contributor Author

@bgrant0607 Yes, the replication.yaml is really in examples/examples_test.go. I deleted it. It doesn't show as “replication.yaml”, but "replication", I didn't take notice of it firstly.
The other place I searched is in user-guide/managing-deployments.md, it is part of URL, "https://raw.githubusercontent.com/GoogleCloudPlatform/kubernetes/master/docs/user-guide/replication.yaml". and I changed.
I searched for links to this doc and updated them to deploying-applications.md.

@k8s-bot
Copy link

k8s-bot commented Nov 2, 2015

GCE e2e test build/test passed for commit 1ddf3312e3505f3c75699621c01dd6d9976242bd.

@feihujiang feihujiang force-pushed the deleteSimpleYamlDocInUserGuide branch from 1ddf331 to 511e77e Compare November 2, 2015 08:19
@feihujiang feihujiang closed this Nov 2, 2015
@feihujiang feihujiang reopened this Nov 2, 2015
@k8s-bot
Copy link

k8s-bot commented Nov 2, 2015

GCE e2e test build/test passed for commit 511e77e1ad0f2e2858236fa6b6e33c036f8a2fba.

@feihujiang
Copy link
Contributor Author

@bgrant0607 Could you please review this PR?

@ashcrow
Copy link
Contributor

ashcrow commented Nov 9, 2015

Shippable failure looks like a flake:

FAIL    k8s.io/kubernetes/pkg/storage/etcd  2.692s

@bgrant0607 bgrant0607 assigned janetkuo and unassigned bgrant0607 Nov 10, 2015
@bgrant0607
Copy link
Member

cc @jeffmendoza @amygdala

janetkuo
janetkuo reviewed Nov 11, 2015
View reviewed changes
docs/admin/daemons.md
@@ -77,7 +77,7 @@ but with different flags and/or different memory and cpu requests for different
### Required Fields

As with all other Kubernetes config, a DaemonSet needs `apiVersion`, `kind`, and `metadata` fields. For
general information about working with config files, see [here](../user-guide/simple-yaml.md),
general information about working with config files, see [here](../user-guide/deploying-applications.md),
Copy link
Member

Choose a reason for hiding this comment

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

Can you change each "here" to the title/description of the link?

janetkuo
janetkuo reviewed Nov 11, 2015
View reviewed changes
docs/user-guide/managing-deployments.md
@@ -117,8 +117,8 @@ It is a recommended practice to put resources related to the same microservice o
A URL can also be specified as a configuration source, which is handy for deploying directly from configuration files checked into github:

```console
$ kubectl create -f https://raw.githubusercontent.com/GoogleCloudPlatform/kubernetes/master/docs/user-guide/replication.yaml
replicationcontrollers/nginx
$ kubectl create -f https://raw.githubusercontent.com/GoogleCloudPlatform/kubernetes/master/docs/user-guide/pod.yaml
Copy link
Member

Choose a reason for hiding this comment

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

Why change this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Because docs/user-guide/replication.yaml will be deleted by this PR. And Changing the URL doesn't change the meaning of the example.

@feihujiang feihujiang force-pushed the deleteSimpleYamlDocInUserGuide branch from 511e77e to 46abf36 Compare November 12, 2015 02:16
@feihujiang
Copy link
Contributor Author

@janetkuo I updated this PR based on your feedback, please review again.

@k8s-bot
Copy link

k8s-bot commented Nov 12, 2015

GCE e2e test build/test passed for commit 46abf36e3b9ff82cb513dc037a238dd5c7bbccb1.

janetkuo
janetkuo reviewed Nov 12, 2015
View reviewed changes
docs/admin/daemons.md
general information about working with config files, see [here](../user-guide/simple-yaml.md),
[here](../user-guide/configuring-containers.md), and [here](../user-guide/working-with-resources.md).
general information about working with config files, see [deploying applications](../user-guide/deploying-applications.md),
[configuring containers](../user-guide/configuring-containers.md), and [working with resources](../user-guide/working-with-resources.md).
Copy link
Member

Choose a reason for hiding this comment

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

add "documents" to the end

@feihujiang feihujiang force-pushed the deleteSimpleYamlDocInUserGuide branch from 46abf36 to ef0239a Compare November 12, 2015 05:52
@feihujiang
Copy link
Contributor Author

@janetkuo Updated based on your advices, please have a look.

@k8s-bot
Copy link

k8s-bot commented Nov 12, 2015

GCE e2e build/test failed for commit ef0239a.

@feihujiang
Copy link
Contributor Author

@k8s-bot test this please

@k8s-bot
Copy link

k8s-bot commented Nov 12, 2015

GCE e2e test build/test passed for commit ef0239a.

@ashcrow
Copy link
Contributor

ashcrow commented Nov 12, 2015

@k8s-teamcity-mesosphere error is a known issue under a specific revision. If you want it to pass you can rebase and it should go away.

@feihujiang
Copy link
Contributor Author

@ashcrow Thanks for providing such information. I can ignore them :)

@ashcrow
Copy link
Contributor

ashcrow commented Nov 13, 2015

Looks good to me!

@janetkuo janetkuo added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 13, 2015
@janetkuo
Copy link
Member

Applying lgtm since we can ignore the mesos smoke test failure.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

k8s-github-robot pushed a commit that referenced this pull request Nov 13, 2015
Merge pull request #16411 from feihujiang/deleteSimpleYamlDocInUserGuide
6a34b2c 
Auto commit by PR queue bot
@k8s-github-robot k8s-github-robot merged commit 6a34b2c into kubernetes:master Nov 13, 2015
@feihujiang feihujiang deleted the deleteSimpleYamlDocInUserGuide branch November 24, 2015 07:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@janetkuo janetkuo

Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@feihujiang @k8s-github-robot @k8s-bot @bgrant0607 @ashcrow @janetkuo @k8s-teamcity-mesosphere @googlebot @wojtek-t