From add6e30826bf907a129650bd292ae313f8645e50 Mon Sep 17 00:00:00 2001 From: mark007 Date: Wed, 4 Jan 2017 14:58:58 +0000 Subject: [PATCH 1/2] Update index.html --- docs/tutorials/kubernetes-basics/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorials/kubernetes-basics/index.html b/docs/tutorials/kubernetes-basics/index.html index eac6d89492..5fc4b5b9bb 100644 --- a/docs/tutorials/kubernetes-basics/index.html +++ b/docs/tutorials/kubernetes-basics/index.html @@ -34,7 +34,7 @@ title: Overview

What can Kubernetes do for you?

-

With modern web services, users expect applications to be available 24/7, and developers expect to deploy new versions of those applications several times a day. Containerization helps package software to serve these goals, enabling applications to be released and updated in an easy and fast way without downtime. Kubernetes helps you make sure those containerized applications run where and when you want, and helps them find the resources and tools they need to work. Kubernetes is a production-ready, open source platform designed with the Google's accumulated experience in container orchestration, combined with best-of-breed ideas from the community.

+

With modern web services, users expect applications to be available 24/7, and developers expect to deploy new versions of those applications several times a day. Containerization helps package software to serve these goals, enabling applications to be released and updated in an easy and fast way without downtime. Kubernetes helps you make sure those containerized applications run where and when you want, and helps them find the resources and tools they need to work. Kubernetes is a production-ready, open source platform designed with Google's accumulated experience in container orchestration, combined with best-of-breed ideas from the community.

From e8b5af42028303c84cdfd7042e738353c02208f3 Mon Sep 17 00:00:00 2001 From: Janet Kuo Date: Thu, 29 Dec 2016 16:32:23 -0800 Subject: [PATCH 2/2] Fix incorrect / obsolete references to RCs and files --- docs/user-guide/connecting-applications.md | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/docs/user-guide/connecting-applications.md b/docs/user-guide/connecting-applications.md index adc47a64b4..f10cb25e4b 100644 --- a/docs/user-guide/connecting-applications.md +++ b/docs/user-guide/connecting-applications.md @@ -174,7 +174,7 @@ You can acquire all these from the [nginx https example](https://github.com/kube ```shell $ make keys secret KEY=/tmp/nginx.key CERT=/tmp/nginx.crt SECRET=/tmp/secret.json $ kubectl create -f /tmp/secret.json -secrets/nginxsecret +secret "nginxsecret" created $ kubectl get secrets NAME TYPE DATA default-token-il9rc kubernetes.io/service-account-token 1 @@ -183,19 +183,16 @@ nginxsecret Opaque 2 Now modify your nginx replicas to start an https server using the certificate in the secret, and the Service, to expose both ports (80 and 443): -{% include code.html language="yaml" file="nginx-secure-app.yaml" ghlink="/docs/user-guide/nginx-secure-app" %} +{% include code.html language="yaml" file="nginx-secure-app.yaml" ghlink="/docs/user-guide/nginx-secure-app.yaml" %} Noteworthy points about the nginx-secure-app manifest: -- It contains both rc and service specification in the same file +- It contains both Deployment and Service specification in the same file - The [nginx server](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/examples/https-nginx/default.conf) serves http traffic on port 80 and https traffic on 443, and nginx Service exposes both ports. - Each container has access to the keys through a volume mounted at /etc/nginx/ssl. This is setup *before* the nginx server is started. ```shell -$ kubectl apply -f ./nginx-secure-app.yaml -$ kubectl delete rc,svc -l app=nginx; kubectl create -f ./nginx-app.yaml -service "my-nginx" configured -deployment "my-nginx" configured +$ kubectl delete deployments,svc my-nginx; kubectl create -f ./nginx-secure-app.yaml ``` At this point you can reach the nginx server from any node. @@ -216,11 +213,10 @@ Lets test this from a pod (the same secret is being reused for simplicity, the p ```shell $ kubectl create -f ./curlpod.yaml -$ kubectl get pods -NAME READY STATUS RESTARTS AGE -curlpod 1/1 Running 0 2m - -$ kubectl exec curlpod -- curl https://my-nginx --cacert /etc/nginx/ssl/nginx.crt +$ kubectl get pods -l app=curlpod +NAME READY STATUS RESTARTS AGE +curl-deployment-1515033274-1410r 1/1 Running 0 1m +$ kubectl exec curl-deployment-1515033274-1410r -- curl https://my-nginx --cacert /etc/nginx/ssl/nginx.crt ... Welcome to nginx! ... @@ -291,6 +287,7 @@ $ kubectl describe service my-nginx LoadBalancer Ingress: a320587ffd19711e5a37606cf4a74574-1142138393.us-east-1.elb.amazonaws.com ... ``` + ## Further reading Kubernetes also supports Federated Services, which can span multiple