deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

Typo fix in conversion.md (#985)

Browse Source 
* Typo fix in conversion.md

Kubernetes uses it's own->Kubernetes uses its own

* Update glide.yaml
This commit is contained in:
AdamDang 2018-04-17 03:21:25 +08:00 committed by Charlie Drage
parent 5fc22fde87
commit d892abc353
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/conversion.md
View File

@ -57,7 +57,7 @@ __Glossary:__
| labels | ✓ | ✓ | ✓ | Metadata.Annotations | | | labels | ✓ | ✓ | ✓ | Metadata.Annotations | |
| links | x | x | x | | All containers in the same pod are accessible in Kubernetes | | links | x | x | x | | All containers in the same pod are accessible in Kubernetes |
| logging | x | x | x | | Kubernetes has built-in logging support at the node-level | | logging | x | x | x | | Kubernetes has built-in logging support at the node-level |
| network_mode | x | x | x | | Kubernetes uses it's own cluster networking | | network_mode | x | x | x | | Kubernetes uses its own cluster networking |
| networks | x | x | x | | See `networks` key | | networks | x | x | x | | See `networks` key |
| networks: aliases | x | x | x | | See `networks` key | | networks: aliases | x | x | x | | See `networks` key |
| networks: addresses | x | x | x | | See `networks` key | | networks: addresses | x | x | x | | See `networks` key |
@ -68,7 +68,7 @@ __Glossary:__
| secrets | - | - | n | | | | secrets | - | - | n | | |
| secrets: short-syntax | - | - | n | | | | secrets: short-syntax | - | - | n | | |
| secrets: long-syntax | - | - | n | | | | secrets: long-syntax | - | - | n | | |
| security_opt | x | x | x | | Kubernetes uses it's own container naming scheme | | security_opt | x | x | x | | Kubernetes uses its own container naming scheme |
| stop_grace_period | ✓ | ✓ | ✓ | Pod.Spec.TerminationGracePeriodSeconds | | | stop_grace_period | ✓ | ✓ | ✓ | Pod.Spec.TerminationGracePeriodSeconds | |
| stop_signal | x | x | x | | Not supported within Kubernetes. See issue https://github.com/kubernetes/kubernetes/issues/30051 | | stop_signal | x | x | x | | Not supported within Kubernetes. See issue https://github.com/kubernetes/kubernetes/issues/30051 |
| sysctls | n | n | n | | | | sysctls | n | n | n | | |

2
glide.yaml
View File

@ -77,6 +77,6 @@ import:
# libcompose and OpenShift depends on different Docker version, # libcompose and OpenShift depends on different Docker version,
# this makes sure that we are using version that is compatible with both. # this makes sure that we are using version that is compatible with both.
# Glide will show WARN about conflicting rev (it this case it is OK) # Glide will show WARN about conflicting rev (in this case it is OK)
- package: github.com/docker/docker - package: github.com/docker/docker
version: 58b1788c81f937bb2aaf1b0077c6b3b23a8397ff version: 58b1788c81f937bb2aaf1b0077c6b3b23a8397ff