From fe97407bb27a7c192c2a4f9af46d9e943e45d515 Mon Sep 17 00:00:00 2001 From: Paul Harkink Date: Tue, 3 Mar 2026 19:38:30 +0100 Subject: [PATCH] docs: update ex02 guidance and sync project logs --- docs/02-deploy-podinfo.md | 16 +++++++++------- roadmap.md | 13 +++++++++++++ sessions.md | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 7 deletions(-) diff --git a/docs/02-deploy-podinfo.md b/docs/02-deploy-podinfo.md index 322d9d5..c5c03f5 100644 --- a/docs/02-deploy-podinfo.md +++ b/docs/02-deploy-podinfo.md @@ -5,7 +5,6 @@ --- - ## Wat je leert - Hoe je een ArgoCD Application toevoegt door één bestand te committen @@ -116,7 +115,8 @@ spec: > **Voor beginners (optioneel):** > Zie deze `Application` als een "pointer": -> hij zegt tegen ArgoCD *waar* de echte Kubernetes YAML staat (`manifests/apps/podinfo`) en *waar* die toegepast moet worden (namespace `podinfo`). +> hij zegt tegen ArgoCD *waar* de echte Kubernetes YAML staat (`manifests/apps/podinfo`) en *waar* die toegepast moet +> worden (namespace `podinfo`). ```yaml apiVersion: argoproj.io/v1alpha1 @@ -188,9 +188,12 @@ Wacht tot je `Synced` en `Healthy` ziet. Dan: > kubectl port-forward svc/podinfo -n podinfo 9898:80 > ``` -In een ander terminal (of via curl): +> *Optioneel*: hiermee kun je podinfo nog niet zien in je browser. Probeer dat eerst voor elkaar te krijgen, zodat +> onderstaand commando ook vanaf de host werkt -> **HOST** +In een andere terminal: + +> **VM** > ```bash > curl http://localhost:9898 > # {"hostname":"podinfo-xxx","version":"6.6.2", ...} @@ -225,9 +228,8 @@ Commit en push: > git push > ``` -Binnen ~3 minuten (standaard poll-interval van ArgoCD) herstart de pod -en zie je de nieuwe kleur. Je kunt ook op **Refresh** klikken in de UI -voor direct effect. +Binnen ~3 minuten (standaard poll-interval van ArgoCD) herstart de pod en zie je de nieuwe kleur (indien je het +optionele deel van stap 5 hebt gedaan). Je kunt ook op **Refresh** klikken in de UI voor direct effect. --- diff --git a/roadmap.md b/roadmap.md index 0af716f..665743b 100644 --- a/roadmap.md +++ b/roadmap.md @@ -69,3 +69,16 @@ Full end-to-end test: completed on `ops-demo-tryout` from clean baseline through - root recursive discovery - MetalLB CRD `caBundle` drift handling - Tekton empty `kustomize` drift fix in solution flow + +## Recent Changes (2026-03-03) + +- `ops-demo-tryout` reset for continuation from Exercise 03: + - VM recreated from scratch + - local `main` reset to `upstream/main` + - solution 01 and 02 merged in sequence + - tags created: `tryout-after-solution-01`, `tryout-after-solution-02`, `tryout-ready-assignment-03` +- Tryout manifests updated to fork URL `https://github.com/paulharkink/ops-demo-tryout.git` + for `root`, Argo values source, and `podinfo` app. +- Verified runtime handoff state in tryout cluster: + - `root` and `podinfo` are `Synced/Healthy` + - `podinfo` deployment reaches `1/1` ready diff --git a/sessions.md b/sessions.md index 24e619a..1410d17 100644 --- a/sessions.md +++ b/sessions.md @@ -4,6 +4,39 @@ Per-session progress notes. Newest entry first. --- +## 2026-03-03 — Tryout reset and handoff ready for Exercise 03 (SESSION 6) + +**Session goal**: Prepare `ops-demo-tryout` so workshop flow can resume directly from Exercise 03. + +**Completed this session**: +- In `ops-demo-tryout`: + - destroyed and recreated VM (`vagrant destroy -f`, `vagrant up`) + - hard reset `main` to `upstream/main` + - merged `upstream/solution/01-argocd-bootstrap` and `upstream/solution/02-deploy-podinfo` + - created tags: + - `tryout-after-solution-01` + - `tryout-after-solution-02` +- Patched repo URLs for tryout fork: + - `apps/root.yaml` + - `apps/argocd.yaml` + - `apps/apps/podinfo.yaml` + - URL set to `https://github.com/paulharkink/ops-demo-tryout.git` +- Bootstrapped from host and re-registered Argo repository secret for tryout repo. +- Forced Argo refresh after initial auth-cache miss; root then synced and child apps were created. +- Verified handoff state: + - `root` app: `Synced/Healthy` + - `podinfo` app: `Synced/Healthy` + - `podinfo` workload: `1/1 Running` +- Committed tryout URL patch in tryout repo: + - `9208d45` `chore: point argo apps to ops-demo-tryout repo` +- Added tag for resume point: + - `tryout-ready-assignment-03` + +**Notes**: +- First podinfo pull on fresh VM can take longer; manual `k3s ctr images pull` confirmed/fixed delayed image availability during this run. + +--- + ## 2026-03-01 — Full end-to-end validation + out-of-box hardening (SESSION 5) **Session goal**: Run the complete workshop flow in a clean tryout repo/VM and close all blockers until 01→06 works out of the box.