Merge master into dev-1.22 to keep in sync
This commit is contained in:
@@ -50,7 +50,7 @@ To complete this tutorial, you should already have a basic familiarity with
|
||||
### Additional Minikube setup instructions
|
||||
|
||||
{{< caution >}}
|
||||
[Minikube](https://minikube.sigs.k8s.io/docs/) defaults to 1024MiB of memory and 1 CPU.
|
||||
[Minikube](https://minikube.sigs.k8s.io/docs/) defaults to 2048MB of memory and 2 CPU.
|
||||
Running Minikube with the default resource configuration results in insufficient resource
|
||||
errors during this tutorial. To avoid these errors, start Minikube with the following settings:
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ ready)_, multi-tier web application using Kubernetes and
|
||||
[Docker](https://www.docker.com/). This example consists of the following
|
||||
components:
|
||||
|
||||
* A single-instance [Redis](https://www.redis.com/) to store guestbook entries
|
||||
* A single-instance [Redis](https://www.redis.io/) to store guestbook entries
|
||||
* Multiple web frontend instances
|
||||
|
||||
## {{% heading "objectives" %}}
|
||||
|
||||
Reference in New Issue
Block a user