Merge branch 'master' into wwrk-2019-05

slides/kube-selfpaced.yml

@@ -34,8 +34,8 @@ chapters:
   - k8s/setup-k8s.md
   - k8s/kubectlrun.md
   - k8s/deploymentslideshow.md
-  - k8s/kubectlexpose.md
-- - k8s/shippingimages.md
+- - k8s/kubectlexpose.md
+  - k8s/shippingimages.md
   - k8s/buildshiprun-selfhosted.md
   - k8s/buildshiprun-dockerhub.md
   - k8s/ourapponkube.md
@@ -43,19 +43,19 @@ chapters:
   - k8s/localkubeconfig.md
   - k8s/accessinternal.md
   - k8s/dashboard.md
-  - k8s/kubectlscale.md
+- - k8s/kubectlscale.md
 #  - k8s/scalingdockercoins.md
 #  - shared/hastyconclusions.md
   - k8s/daemonset.md
   - k8s/rollout.md
-- - k8s/namespaces.md
-  - k8s/kustomize.md
+  - k8s/namespaces.md
+- - k8s/kustomize.md
   - k8s/helm.md
   - k8s/create-chart.md
   - k8s/healthchecks.md
   - k8s/logs-cli.md
   - k8s/logs-centralized.md
-  - k8s/netpol.md
+- - k8s/netpol.md
   - k8s/authn-authz.md
   - k8s/csr-api.md
   - k8s/podsecuritypolicy.md
@@ -68,7 +68,7 @@ chapters:
   - k8s/configuration.md
 - - k8s/owners-and-dependents.md
   - k8s/extending-api.md
-  - k8s/statefulsets.md
+- - k8s/statefulsets.md
   - k8s/local-persistent-volumes.md
   - k8s/portworx.md
   - k8s/staticpods.md