Merge pull request kubernetes#248 from jcmoraisjr/jm-haproxy-docs-fix

Small fixes on HAProxy Ingress docs
danielqsj · Feb 8, 2017 · 0b1fc38 · 0b1fc38
2 parents 1eaea75 + 67f1e77
commit 0b1fc38
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/examples/deployment/haproxy/README.md b/examples/deployment/haproxy/README.md
@@ -89,7 +89,7 @@ spec:
       - path: /
         backend:
           serviceName: http-svc
-          servicePort: 80
+          servicePort: 8080
 EOF
 ```
 
@@ -147,5 +147,5 @@ haproxy-ingress-2556761959-tv20k           1/1       Running   0          9m
 ...
 
 $ kubectl logs haproxy-ingress-2556761959-tv20k
-$ kubectl describe haproxy-ingress-2556761959-tv20k
+$ kubectl describe pod/haproxy-ingress-2556761959-tv20k
 ```
diff --git a/examples/tls-termination/haproxy/README.md b/examples/tls-termination/haproxy/README.md
@@ -1,4 +1,4 @@
-# TLS termination
+# HAProxy Ingress TLS termination
 
 ## Prerequisites
 
@@ -102,13 +102,13 @@ Here is the difference:
 Now `foo.bar` certificate should be used to terminate TLS:
 
 ```console
-openssl s_client -connect 172.17.4.99:31692
+$ openssl s_client -connect 172.17.4.99:31692
 ...
 subject=/CN=localhost
 issuer=/CN=localhost
 ---
 
-openssl s_client -connect 172.17.4.99:31692 -servername foo.bar
+$ openssl s_client -connect 172.17.4.99:31692 -servername foo.bar
 ...
 subject=/CN=foo.bar
 issuer=/CN=foo.bar

diff --git a/examples/tls-termination/haproxy/ingress-tls-default.yaml b/examples/tls-termination/haproxy/ingress-tls-default.yaml
@@ -13,4 +13,4 @@ spec:
       - path: /
         backend:
           serviceName: http-svc
-          servicePort: 80
+          servicePort: 8080
diff --git a/examples/tls-termination/haproxy/ingress-tls-foobar.yaml b/examples/tls-termination/haproxy/ingress-tls-foobar.yaml
@@ -14,4 +14,4 @@ spec:
       - path: /
         backend:
           serviceName: http-svc
-          servicePort: 80
+          servicePort: 8080