Skip to content

Commit 7b262f6

Browse files
authored
Merge pull request #40306 from sftim/20230323_drop_katacoda
Drop or adapt tutorials that rely on Katacoda
2 parents 2b29a34 + 252bcf6 commit 7b262f6

File tree

16 files changed

+543
-302
lines changed

16 files changed

+543
-302
lines changed

content/en/docs/contribute/style/style-guide.md

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -385,29 +385,6 @@ The output is:
385385
Beware.
386386
{{< /warning >}}
387387

388-
### Katacoda Embedded Live Environment
389-
390-
This button lets users run Minikube in their browser using the Katacoda Terminal.
391-
It lowers the barrier of entry by allowing users to use Minikube with one click instead of going through the complete
392-
Minikube and Kubectl installation process locally.
393-
394-
The Embedded Live Environment is configured to run `minikube start` and lets users complete tutorials in the same window
395-
as the documentation.
396-
397-
{{< caution >}}
398-
The session is limited to 15 minutes.
399-
{{< /caution >}}
400-
401-
For example:
402-
403-
```
404-
{{</* kat-button */>}}
405-
```
406-
407-
The output is:
408-
409-
{{< kat-button >}}
410-
411388
## Common Shortcode Issues
412389

413390
### Ordered Lists

content/en/docs/tasks/access-application-cluster/ingress-minikube.md

Lines changed: 30 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,16 @@ This page shows you how to set up a simple Ingress which routes requests to Serv
1717

1818
## {{% heading "prerequisites" %}}
1919

20+
This tutorial assumes that you are using `minikube` to run a local Kubernetes cluster.
21+
Visit [Install tools](/docs/tasks/tools/#minikube) to learn how to install `minikube`.
22+
2023
{{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
2124
If you are using an older Kubernetes version, switch to the documentation for that version.
2225

23-
### Create a Minikube cluster
26+
### Create a minikube cluster
2427

25-
Using Katacoda
26-
: {{< kat-button >}}
28+
If you haven't already set up a cluster locally, run `minikube start` to create a cluster.
2729

28-
Locally
29-
: If you already [installed Minikube](/docs/tasks/tools/#minikube)
30-
locally, run `minikube start` to create a cluster.
3130

3231
<!-- steps -->
3332

@@ -41,10 +40,6 @@ Locally
4140

4241
1. Verify that the NGINX Ingress controller is running
4342

44-
45-
{{< tabs name="tab_with_md" >}}
46-
{{% tab name="minikube v1.19 or later" %}}
47-
4843
```shell
4944
kubectl get pods -n ingress-nginx
5045
```
@@ -61,35 +56,6 @@ Locally
6156
ingress-nginx-admission-patch-rqp78 0/1 Completed 1 11m
6257
ingress-nginx-controller-59b45fb494-26npt 1/1 Running 0 11m
6358
```
64-
{{% /tab %}}
65-
66-
{{% tab name="minikube v1.18.1 or earlier" %}}
67-
68-
```shell
69-
kubectl get pods -n kube-system
70-
```
71-
72-
{{< note >}}
73-
It can take up to a minute before you see these pods running OK.
74-
{{< /note >}}
75-
76-
The output is similar to:
77-
78-
```none
79-
NAME READY STATUS RESTARTS AGE
80-
default-http-backend-59868b7dd6-xb8tq 1/1 Running 0 1m
81-
kube-addon-manager-minikube 1/1 Running 0 3m
82-
kube-dns-6dcb57bcc8-n4xd4 3/3 Running 0 2m
83-
kubernetes-dashboard-5498ccf677-b8p5h 1/1 Running 0 2m
84-
nginx-ingress-controller-5984b97644-rnkrg 1/1 Running 0 1m
85-
storage-provisioner 1/1 Running 0 2m
86-
```
87-
88-
Make sure that you see a Pod with a name that starts with `nginx-ingress-controller-`.
89-
90-
{{% /tab %}}
91-
92-
{{< /tabs >}}
9359

9460
## Deploy a hello, world app
9561

@@ -142,12 +108,6 @@ Locally
142108
http://172.17.0.15:31637
143109
```
144110

145-
{{< note >}}
146-
Katacoda environment only: at the top of the terminal panel, click the plus sign,
147-
and then click **Select port to view on Host 1**. Enter the NodePort value,
148-
in this case `31637`, and then click **Display Port**.
149-
{{< /note >}}
150-
151111
The output is similar to:
152112

153113
```none
@@ -197,25 +157,11 @@ The following manifest defines an Ingress that sends traffic to your Service via
197157
example-ingress <none> hello-world.info 172.17.0.15 80 38s
198158
```
199159

200-
1. Add the following line to the bottom of the `/etc/hosts` file on
201-
your computer (you will need administrator access):
202-
203-
```none
204-
172.17.0.15 hello-world.info
205-
```
206-
207-
{{< note >}}
208-
If you are running Minikube locally, use `minikube ip` to get the external IP.
209-
The IP address displayed within the ingress list will be the internal IP.
210-
{{< /note >}}
211-
212-
After you make this change, your web browser sends requests for
213-
`hello-world.info` URLs to Minikube.
214160

215161
1. Verify that the Ingress controller is directing traffic:
216162

217163
```shell
218-
curl hello-world.info
164+
curl --resolve "hello-world.info:80:$( minikube ip )" -i http://hello-world.info
219165
```
220166

221167
You should see:
@@ -226,9 +172,27 @@ The following manifest defines an Ingress that sends traffic to your Service via
226172
Hostname: web-55b8c6998d-8k564
227173
```
228174

229-
{{< note >}}
230-
If you are running Minikube locally, you can visit `hello-world.info` from your browser.
231-
{{< /note >}}
175+
You can also visit `hello-world.info` from your browser.
176+
177+
* **Optionally**
178+
Look up the external IP address as reported by minikube:
179+
```shell
180+
minikube ip
181+
```
182+
183+
Add line similar to the following one to the bottom of the `/etc/hosts` file on
184+
your computer (you will need administrator access):
185+
186+
```none
187+
172.17.0.15 hello-world.info
188+
```
189+
190+
{{< note >}}
191+
Change the IP address to match the output from `minikube ip`.
192+
{{< /note >}}
193+
194+
After you make this change, your web browser sends requests for
195+
`hello-world.info` URLs to Minikube.
232196

233197
## Create a second Deployment
234198

@@ -288,7 +252,7 @@ The following manifest defines an Ingress that sends traffic to your Service via
288252
1. Access the 1st version of the Hello World app.
289253

290254
```shell
291-
curl hello-world.info
255+
curl --resolve "hello-world.info:80:$( minikube ip )" -i http://hello-world.info
292256
```
293257

294258
The output is similar to:
@@ -302,7 +266,7 @@ The following manifest defines an Ingress that sends traffic to your Service via
302266
1. Access the 2nd version of the Hello World app.
303267

304268
```shell
305-
curl hello-world.info/v2
269+
curl --resolve "hello-world.info:80:$( minikube ip )" -i http://hello-world.info/v2
306270
```
307271

308272
The output is similar to:
@@ -314,7 +278,7 @@ The following manifest defines an Ingress that sends traffic to your Service via
314278
```
315279

316280
{{< note >}}
317-
If you are running Minikube locally, you can visit `hello-world.info` and
281+
If you did the optional step to update `/etc/hosts`, you can also visit `hello-world.info` and
318282
`hello-world.info/v2` from your browser.
319283
{{< /note >}}
320284

content/en/docs/tutorials/configuration/configure-java-microservice/configure-java-microservice-interactive.html

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,34 @@
11
---
2-
title: "Interactive Tutorial - Configuring a Java Microservice"
2+
title: "Tutorial - Configuring a Java Microservice"
33
weight: 20
4+
headless: true
5+
toc_hide: true
6+
_build:
7+
list: never
8+
publishResources: false
49
---
510

6-
{{% katacoda-removal %}}
7-
811
<!DOCTYPE html>
912

1013
<html lang="en">
1114

1215
<body>
1316

14-
<link href="/docs/tutorials/kubernetes-basics/public/css/styles.css" rel="stylesheet">
15-
<link href="/docs/tutorials/kubernetes-basics/public/css/overrides.css" rel="stylesheet">
16-
{{< katacoda-tutorial >}}
17-
1817
<div class="layout" id="top">
1918

2019
<main class="content katacoda-content">
21-
<div class="katacoda">
22-
<div class="katacoda__box" id="inline-terminal-1" data-katacoda-id="kubernetes-bootcamp/9" data-katacoda-color="326de6" data-katacoda-secondary="273d6d" data-katacoda-hideintro="false" data-katacoda-prompt="Kubernetes Bootcamp Terminal" style="height: 600px;"></div>
20+
<div>
21+
<h2 class="katacoda-gone">
22+
Content unavailable
23+
</h2>
24+
<p>
25+
The interactive tutorial for creating a cluster is not available.
26+
For more information, see the
27+
<a href="https://kubernetes.io/blog/2023/02/14/kubernetes-katacoda-tutorials-stop-from-2023-03-31/">
28+
shutdown announcement</a>.
29+
</p>
2330
</div>
31+
2432
</main>
2533

2634
</div>

0 commit comments

Comments
 (0)