From 331309dc63619546e8e05541764bfd28ae12bf2a Mon Sep 17 00:00:00 2001 From: Ludovic Piot Date: Mon, 9 Jun 2025 14:11:05 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20cleanup=20display=20of=20some=20?= =?UTF-8?q?console=20results?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- slides/k8s/M6-T02-flux-install.md | 9 ++++---- slides/k8s/M6-T03-installing-tenants.md | 30 ++++++++++++------------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/slides/k8s/M6-T02-flux-install.md b/slides/k8s/M6-T02-flux-install.md index a249a398..e7a2768a 100644 --- a/slides/k8s/M6-T02-flux-install.md +++ b/slides/k8s/M6-T02-flux-install.md @@ -91,10 +91,11 @@ class: pic .lab[ ```bash -shpod:~# export GITHUB_TOKEN="my-token" -shpod:~# export GITHUB_USER="container-training-fleet" -shpod:~# export GITHUB_REPO="fleet-config-using-flux-XXXXX" -shpod:~# flux bootstrap github \ +shpod:~# \ + export GITHUB_TOKEN="my-token" && \ + export GITHUB_USER="container-training-fleet" && \ + export GITHUB_REPO="fleet-config-using-flux-XXXXX" && \ + flux bootstrap github \ --owner=${GITHUB_USER} \ --repository=${GITHUB_REPO} \ --team=OPS \ diff --git a/slides/k8s/M6-T03-installing-tenants.md b/slides/k8s/M6-T03-installing-tenants.md index 6a55d945..4786e596 100644 --- a/slides/k8s/M6-T03-installing-tenants.md +++ b/slides/k8s/M6-T03-installing-tenants.md @@ -46,13 +46,13 @@ Creating the **_⚗️TEST_** tenant ```bash shpod:~# cd fleet-config-using-flux-XXXXX/ -shpod:~/fleet-config-using-flux-lpiot# flux create kustomization tenants \ - --namespace=flux-system \ - --source=GitRepository/flux-system \ - --path ./tenants/test \ - --prune \ - --interval=1m \ - --export >> clusters/CLOUDY/tenants.yaml +shpod:~/fleet-config-using-flux-lpiot# \ + flux create kustomization tenant-test \ + --namespace=flux-system \ + --source=GitRepository/flux-system \ + --path ./tenants/test \ + --interval=1m \ + --prune --export >> clusters/CLOUDY/tenants.yaml ``` ] @@ -66,13 +66,13 @@ Then we create the **_🏭PROD_** tenant .lab[ ```bash -shpod:~/fleet-config-using-flux-lpiot# flux create kustomization tenants \ - --namespace=flux-system \ - --source=GitRepository/flux-system \ - --path ./tenants/prod \ - --prune \ - --interval=3m \ - --export >> clusters/CLOUDY/tenants.yaml +shpod:~/fleet-config-using-flux-lpiot# \ + flux create kustomization tenant-prod \ + --namespace=flux-system \ + --source=GitRepository/flux-system \ + --path ./tenants/prod \ + --interval=3m \ + --prune --export >> clusters/CLOUDY/tenants.yaml ``` ] @@ -104,7 +104,7 @@ flux-system gitrepository/flux-system main@sha1:4db19114 False True stored artifact for revision 'main@sha1:4db19114' NAMESPACE NAME REVISION SUSPENDED - READY MESSAGE + READY MESSAGE flux-system kustomization/flux-system main@sha1:d48291a8 False False kustomize build failed: accumulating resources: accumulation err='accumulating resources from './tenants.yaml': may not add resource with an already registered id: Kustomization.v1.kustomize.toolkit.fluxcd.io/tenants.flux-system': must build at directory: '/tmp/kustomization-689086759/clusters/CLOUDY/tenants.yaml': file is not directory ```