From dc314bd157d821430fa7d6a6ef73c7df6ffef75c Mon Sep 17 00:00:00 2001 From: Lee Calcote Date: Sun, 16 Oct 2016 21:00:05 -0500 Subject: [PATCH] Update kubernetes.html.md Included Kubernetes contributors and rkt compatibility. --- website/source/intro/vs/kubernetes.html.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/website/source/intro/vs/kubernetes.html.md b/website/source/intro/vs/kubernetes.html.md index fa688f4e3..022b0b973 100644 --- a/website/source/intro/vs/kubernetes.html.md +++ b/website/source/intro/vs/kubernetes.html.md @@ -8,9 +8,8 @@ description: |- # Nomad vs. Kubernetes -Kubernetes is an orchestration system for Docker developed by the Cloud Native -Computing Foundation (CNCF). Kubernetes aims to provide all the features -needed to run Docker based applications including cluster management, +Kubernetes is an orchestration system for containers originally designed by Google, now governed by the Cloud Native +Computing Foundation (CNCF) and devloped by Google, Red Hat, CoreOS and many others. Kubernetes aims to provide all the features needed to run docker or rkt-based applications including cluster management, scheduling, service discovery, monitoring, secrets management and more. Nomad only aims to provide cluster management and scheduling and is designed