From a19af32f811c6b4276244a85e3c38a69fc409c92 Mon Sep 17 00:00:00 2001
From: Kevin Casey <12061237+kevinjamescasey@users.noreply.github.com>
Date: Wed, 2 Oct 2024 21:52:37 -0500
Subject: [PATCH 1/6] Update deploy-intro.html
Add note to alert people that the command might not work on their machine depending on the CPU architecture
---
.../tutorials/kubernetes-basics/deploy-app/deploy-intro.html | 1 +
1 file changed, 1 insertion(+)
diff --git a/content/en/docs/tutorials/kubernetes-basics/deploy-app/deploy-intro.html b/content/en/docs/tutorials/kubernetes-basics/deploy-app/deploy-intro.html
index 3411ce8f54d0c..364e45b0cf299 100644
--- a/content/en/docs/tutorials/kubernetes-basics/deploy-app/deploy-intro.html
+++ b/content/en/docs/tutorials/kubernetes-basics/deploy-app/deploy-intro.html
@@ -121,6 +121,7 @@ kubectl basics
Deploy an app
Let’s deploy our first app on Kubernetes with the kubectl create deployment command. We need to provide the deployment name and app image location (include the full repository url for images hosted outside Docker Hub).
+ Note: This only works on certain CPU architectures and may not work on your machine.
kubectl create deployment kubernetes-bootcamp --image=gcr.io/google-samples/kubernetes-bootcamp:v1
Great! You just deployed your first application by creating a deployment. This performed a few things for you:
From fdc9fd4bb00793413b0a56c550f36f371767e03c Mon Sep 17 00:00:00 2001
From: Kevin Casey <12061237+kevinjamescasey@users.noreply.github.com>
Date: Thu, 3 Oct 2024 08:36:10 -0500
Subject: [PATCH 2/6] Update deploy-intro.html
---
.../tutorials/kubernetes-basics/deploy-app/deploy-intro.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/content/en/docs/tutorials/kubernetes-basics/deploy-app/deploy-intro.html b/content/en/docs/tutorials/kubernetes-basics/deploy-app/deploy-intro.html
index 364e45b0cf299..903bbe2621e9f 100644
--- a/content/en/docs/tutorials/kubernetes-basics/deploy-app/deploy-intro.html
+++ b/content/en/docs/tutorials/kubernetes-basics/deploy-app/deploy-intro.html
@@ -121,7 +121,7 @@ kubectl basics
Deploy an app
Let’s deploy our first app on Kubernetes with the kubectl create deployment command. We need to provide the deployment name and app image location (include the full repository url for images hosted outside Docker Hub).
- Note: This only works on certain CPU architectures and may not work on your machine.
+ {{< note >}}This `kubenetes-bootcamp` image is built only for the `amd64` CPU architecture and may not work on your machine.{{< note >}}
kubectl create deployment kubernetes-bootcamp --image=gcr.io/google-samples/kubernetes-bootcamp:v1
Great! You just deployed your first application by creating a deployment. This performed a few things for you:
From f73eb2243ab72aeb54aca7757e83babb678217f4 Mon Sep 17 00:00:00 2001
From: Kevin Casey <12061237+kevinjamescasey@users.noreply.github.com>
Date: Thu, 3 Oct 2024 08:39:48 -0500
Subject: [PATCH 3/6] Update deploy-intro.html
---
.../tutorials/kubernetes-basics/deploy-app/deploy-intro.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/content/en/docs/tutorials/kubernetes-basics/deploy-app/deploy-intro.html b/content/en/docs/tutorials/kubernetes-basics/deploy-app/deploy-intro.html
index 903bbe2621e9f..1006560f26cb7 100644
--- a/content/en/docs/tutorials/kubernetes-basics/deploy-app/deploy-intro.html
+++ b/content/en/docs/tutorials/kubernetes-basics/deploy-app/deploy-intro.html
@@ -121,7 +121,7 @@ kubectl basics
Deploy an app
Let’s deploy our first app on Kubernetes with the kubectl create deployment command. We need to provide the deployment name and app image location (include the full repository url for images hosted outside Docker Hub).
- {{< note >}}This `kubenetes-bootcamp` image is built only for the `amd64` CPU architecture and may not work on your machine.{{< note >}}
+ {{< note >}}This `kubenetes-bootcamp` image is built only for the `amd64` CPU architecture and may not work on your machine.{{< /note >}}
kubectl create deployment kubernetes-bootcamp --image=gcr.io/google-samples/kubernetes-bootcamp:v1
Great! You just deployed your first application by creating a deployment. This performed a few things for you:
From 34b620e53b4b704a54086a39b3fd2a8e2cfbcd7a Mon Sep 17 00:00:00 2001
From: Kevin Casey <12061237+kevinjamescasey@users.noreply.github.com>
Date: Thu, 3 Oct 2024 09:55:16 -0500
Subject: [PATCH 4/6] Update deploy-intro.html
---
.../tutorials/kubernetes-basics/deploy-app/deploy-intro.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/content/en/docs/tutorials/kubernetes-basics/deploy-app/deploy-intro.html b/content/en/docs/tutorials/kubernetes-basics/deploy-app/deploy-intro.html
index 1006560f26cb7..c7fdf68fbb9bc 100644
--- a/content/en/docs/tutorials/kubernetes-basics/deploy-app/deploy-intro.html
+++ b/content/en/docs/tutorials/kubernetes-basics/deploy-app/deploy-intro.html
@@ -121,7 +121,7 @@ kubectl basics
Deploy an app
Let’s deploy our first app on Kubernetes with the kubectl create deployment command. We need to provide the deployment name and app image location (include the full repository url for images hosted outside Docker Hub).
- {{< note >}}This `kubenetes-bootcamp` image is built only for the `amd64` CPU architecture and may not work on your machine.{{< /note >}}
+ {{< note >}}This kubenetes-bootcamp image is built only for the amd64 CPU architecture and may not work on your machine.{{< /note >}}
kubectl create deployment kubernetes-bootcamp --image=gcr.io/google-samples/kubernetes-bootcamp:v1
Great! You just deployed your first application by creating a deployment. This performed a few things for you:
From c26b9acab6af192b451baaa935c38ef658c854ea Mon Sep 17 00:00:00 2001
From: Kevin Casey <12061237+kevinjamescasey@users.noreply.github.com>
Date: Thu, 3 Oct 2024 16:30:29 -0500
Subject: [PATCH 5/6] Update deploy-intro.html
Explain how to ensure `docker` driver is used for non-AMD64 users.
---
.../tutorials/kubernetes-basics/deploy-app/deploy-intro.html | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/content/en/docs/tutorials/kubernetes-basics/deploy-app/deploy-intro.html b/content/en/docs/tutorials/kubernetes-basics/deploy-app/deploy-intro.html
index c7fdf68fbb9bc..db4268bc56f67 100644
--- a/content/en/docs/tutorials/kubernetes-basics/deploy-app/deploy-intro.html
+++ b/content/en/docs/tutorials/kubernetes-basics/deploy-app/deploy-intro.html
@@ -30,7 +30,9 @@ Kubernetes Deployments
{{< note >}}
This tutorial uses a container that requires the AMD64 architecture. If you are using
minikube on a computer with a different CPU architecture, you could try using minikube with
- a driver that can emulate AMD64. For example, the Docker Desktop driver can do this.
+ a driver that can emulate AMD64. For example, the Docker Desktop driver can do this. You can
+ make sure Docker Deskstop is running when you issue your first `minikube start` command. If
+ you already have other Minikube instances you can create a one with `minikube start driver=docker`.
{{< /note >}}
@@ -121,7 +123,6 @@
kubectl basics
Deploy an app
Let’s deploy our first app on Kubernetes with the kubectl create deployment command. We need to provide the deployment name and app image location (include the full repository url for images hosted outside Docker Hub).
- {{< note >}}This kubenetes-bootcamp image is built only for the amd64 CPU architecture and may not work on your machine.{{< /note >}}
kubectl create deployment kubernetes-bootcamp --image=gcr.io/google-samples/kubernetes-bootcamp:v1
Great! You just deployed your first application by creating a deployment. This performed a few things for you:
From 03fa18508d4e9c57a4eb815b262a340f99f96f05 Mon Sep 17 00:00:00 2001
From: Kevin Casey <12061237+kevinjamescasey@users.noreply.github.com>
Date: Thu, 19 Dec 2024 10:57:52 -0600
Subject: [PATCH 6/6] typo. clarify Docker Desktop installation requirement
---
.../kubernetes-basics/deploy-app/deploy-intro.html | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/content/en/docs/tutorials/kubernetes-basics/deploy-app/deploy-intro.html b/content/en/docs/tutorials/kubernetes-basics/deploy-app/deploy-intro.html
index db4268bc56f67..0d617f32d2463 100644
--- a/content/en/docs/tutorials/kubernetes-basics/deploy-app/deploy-intro.html
+++ b/content/en/docs/tutorials/kubernetes-basics/deploy-app/deploy-intro.html
@@ -28,11 +28,13 @@ Objectives
Kubernetes Deployments
{{< note >}}
- This tutorial uses a container that requires the AMD64 architecture. If you are using
- minikube on a computer with a different CPU architecture, you could try using minikube with
- a driver that can emulate AMD64. For example, the Docker Desktop driver can do this. You can
- make sure Docker Deskstop is running when you issue your first `minikube start` command. If
- you already have other Minikube instances you can create a one with `minikube start driver=docker`.
+ This tutorial uses a container that requires the AMD64 architecture. If you are
+ using minikube on a computer with a different CPU architecture, you could try using
+ minikube with a driver that can emulate AMD64. For example, the Docker Desktop
+ driver can do this after
+ you install Docker Desktop. You can either make sure Docker Desktop is running when
+ you issue your first `minikube start` comman; or, if you already have a Minikube
+ instance, you can create a new one with `minikube start driver=docker`.
{{< /note >}}