Merge branch 'master' into oscon2019

This commit is contained in:
Bridget Kromhout
2019-07-09 11:57:27 -05:00

View File

@@ -168,7 +168,7 @@ with a cloud provider
az aks get-credentials --resource-group my-aks-group --name my-aks-cluster
```
- The cluster has a lot of goodies pre-installed
- The cluster has useful components pre-installed, such as the metrics server
---
@@ -224,7 +224,7 @@ with a cloud provider
kubectl config use-context do-xxx1-my-do-cluster
```
- The cluster comes with some goodies (like Cilium) but no metrics server
- The cluster comes with some components (like Cilium) but no metrics server
---