Skip to content

Commit daf3254

Browse files
authored
Merge branch 'main' into receivers-update
2 parents d67fde2 + ce9a786 commit daf3254

11 files changed

+29
-17
lines changed

docs/for-ops/how-to/use-team-admin.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,12 @@ Let's now configure public exposure for the workload we deployed in the namespac
8484

8585
4. Fill in the port of the service (8080 in this case).
8686

87-
5. Under `Exposure Ingress`, select `Ingress`.
87+
5. Under `Exposure Ingress`, select `External`.
8888

8989
6. Turn off `Use team domain` and fill in the name of the service as the hostname (hello-deploy in this example).
9090

9191
7. Click on `Submit`.
9292

9393
8. Click on `Deploy Changes` (the Deploy Changes button in the left panel will light-up after you click on submit).
9494

95-
Your service and URL will now show up in the list of Services.
95+
Your service and URL will now show up in the list of Services.

docs/get-started/labs/auto-image-update.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Now go to the `green` repo in Gitea and change the the welcome message:
5959
<style>
6060
body {
6161
color: #ffffff;
62-
background-color: green
62+
background-color: green;
6363
font-family: Arial, sans-serif;
6464
font-size: 14px;
6565
}

docs/get-started/labs/canary-deployment.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ We now created 2 deployments. One for `blue` and one for `green`. The `green` im
6363

6464
- Under `Traffic Control` click `enabled` (and use the default weights for v1 and v2).
6565

66-
- Under `Exposure Ingress`, select `Ingress` and use the default configuration.
66+
- Under `Exposure Ingress`, select `External` and use the default configuration.
6767

6868
- Click `Submit`.
6969

docs/get-started/labs/create-netpols.md

+14-2
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@ Use the `k8s-deployment` chart to deploy the vote app. Use the following values:
7979
Name: `vote`
8080

8181
```yaml
82+
image:
83+
repository: harbor.<your-domain>/team-<team-name>/vote
84+
pullPolicy: IfNotPresent
85+
tag: latest
8286
containerPorts:
8387
- name: http
8488
containerPort: 80
@@ -96,6 +100,10 @@ Use the `k8s-deployment` chart to deploy the worker app. Use the following value
96100
Name: `worker`
97101

98102
```yaml
103+
image:
104+
repository: harbor.<your-domain>/team-<team-name>/worker
105+
pullPolicy: IfNotPresent
106+
tag: latest
99107
containerPorts:
100108
- name: http
101109
containerPort: 80
@@ -129,6 +137,10 @@ Use the `k8s-deployment` chart to deploy the result app. Use the following value
129137
Name: `result`
130138

131139
```yaml
140+
image:
141+
repository: harbor.<your-domain>/team-<team-name>/result
142+
pullPolicy: IfNotPresent
143+
tag: latest
132144
containerPorts:
133145
- name: http
134146
containerPort: 80
@@ -239,10 +251,10 @@ curl https://apl-docs.net
239251
```
240252
You should see the HTML of the apl-docs.net website
241253

242-
2. Run the following command to see the `<h1>Build, Deploy and Run applications at scale</h1>` message:
254+
2. Run the following command to see the `<title data-rh="true">App Platform for LKE</title>` message:
243255

244256
```shell
245-
curl https://apl-docs.net | grep -o '<h1>.*</h1>'
257+
curl -s https://apl-docs.net | grep -o '<title.*</title>'
246258
```
247259

248260
3. Type `exit` to exit the Netshoot pod.

docs/get-started/labs/create-rabbitmq-cluster.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,13 @@ In this example the `rabbitMQ cluster` was created in the Team demo, so we have
7878
1. Use the following command to retrieve the username:
7979

8080
```bash
81-
kubectl get secret rabbit1-rabbitmq-default-user -n team-demo -o jsonpath="{.data.username}" | base64 --decode
81+
kubectl get secret rabbit1-quickstart-rabbitmq-default-user -n team-demo -o jsonpath="{.data.username}" | base64 --decode
8282
```
8383

8484
2. Use the following command to retrieve the password:
8585

8686
```bash
87-
kubectl get secret rabbit1-rabbitmq-default-user -n team-demo -o jsonpath="{.data.password}" | base64 --decode
87+
kubectl get secret rabbit1-quickstart-rabbitmq-default-user -n team-demo -o jsonpath="{.data.password}" | base64 --decode
8888
```
8989
:::info
9090
Make sure you don't copy the `%` symbol at the end.
@@ -129,13 +129,13 @@ To connect to the `rabbitMQ cluster` you use `AMQP` to open a connection. To ope
129129
1. Get the host use the following command:
130130

131131
```bash
132-
kubectl get secret rabbit1-rabbitmq-default-user -n team-demo -o jsonpath="{.data.host}" | base64 --decode
132+
kubectl get secret rabbit1-quickstart-rabbitmq-default-user -n team-demo -o jsonpath="{.data.host}" | base64 --decode
133133
```
134134

135135
2. Get the port use the following command:
136136

137137
```bash
138-
kubectl get secret rabbit1-rabbitmq-default-user -n team-demo -o jsonpath="{.data.port}" | base64 --decode
138+
kubectl get secret rabbit1-quickstart-rabbitmq-default-user -n team-demo -o jsonpath="{.data.port}" | base64 --decode
139139
```
140140

141141
The connection string is build like this:

docs/get-started/labs/create-sealed-secrets.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: Create Sealed Secrets
44
sidebar_label: Create Sealed Secrets
55
---
66

7-
In this lab we will create sealed secrets and see how to securely sensitive information in git repository.
7+
In this lab we will create sealed secrets and see how to securely store sensitive information in git repository.
88

99
## Creating a Sealed Secret
1010

docs/get-started/labs/create-workloads.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ image:
3636

3737
All the needed Argo CD resources to deploy your workload will now be created.
3838

39-
8. Click on `Workloads` in the left menu. You will now see a list of all Workloads and there status:
39+
8. Click on `Workloads` in the left menu. You will now see a list of all Workloads and their status:
4040

4141
![workloads](../../img/workloads-2.png)
4242

docs/get-started/labs/custom-metrics.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ for i in {1..1000}; do curl https://custom-metrics-labs.<your-domain>/hello; sle
7272

7373
4. Click `+ Add visualization`.
7474

75-
5. In the `Query` tab select `Prometheus Platform`.
75+
5. In the `Data source` tab select `Prometheus Platform`.
7676

7777
6. In the `A` collapsible section, select a metric from the `Metric` drop-down list. In our example we use the `application_greetings_total` metric.
7878

@@ -115,7 +115,7 @@ data:
115115

116116
7. Click on `Dashboard settings` (in the top right).
117117

118-
8. In the left menu click `JSON model`.
118+
8. Go to `JSON model` tab.
119119

120120
9. Copy the JSON model and paste it into the ConfigMap. Make sure to indent with 4.
121121

docs/get-started/labs/detect-threats.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ helm install team-labs falcosecurity/event-generator -n team-labs
3131

3232
1. In the left menu, click on `Apps` and open `Grafana`.
3333

34-
2. Click on the `Detected threads in containers` dashboards
34+
2. Click on the `Detected threats in containers` dashboards
3535

3636
3. See all the generated threat events
3737

docs/get-started/labs/using-argo-cd.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Let's demonstrate the capabilities of Argo CD by adding some manifests to the re
7474
7575
3. Commit the changes to the repository.
7676
77-
Once you return to the Argo CD application, click on the `team<name>` application.
77+
Once you return to the Argo CD application, click on the `team-<name>` application.
7878

7979
The application is set to sync automatically, so a manual `SYNC` is not required. Once ArgoCD completes the sync, the nginx deployment will appear as shown below:
8080

docs/get-started/labs/view-metrics.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ The dashboards are dynamically added based on the enabled platform capabilities:
2828
| Kubernetes / Pods | When Prometheus on the platform level is enabled |
2929
| Team status | When Prometheus on the platform level is enabled |
3030
| Container scan results | When Trivy Operator on the platform level is enabled |
31-
| Detected threads in containers | When Falco on the platform level is enabled |
31+
| Detected threats in containers | When Falco on the platform level is enabled |
3232

3333
## View container metrics
3434

0 commit comments

Comments
 (0)