From 324ad2fdd06b47452dd68f0f7c6cca656dec2cbc Mon Sep 17 00:00:00 2001 From: Ludovic Piot Date: Wed, 11 Jun 2025 19:21:13 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Update=20mermaid=20scenario=20di?= =?UTF-8?q?agram?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- slides/k8s/M6-M01-adding-MOVY-tenant.md | 56 ++++++++++- slides/k8s/M6-START-a-company-scenario.md | 50 +++++----- slides/k8s/M6-mermaid.md | 111 ---------------------- 3 files changed, 80 insertions(+), 137 deletions(-) delete mode 100644 slides/k8s/M6-mermaid.md diff --git a/slides/k8s/M6-M01-adding-MOVY-tenant.md b/slides/k8s/M6-M01-adding-MOVY-tenant.md index d81ef26d..62ffb803 100644 --- a/slides/k8s/M6-M01-adding-MOVY-tenant.md +++ b/slides/k8s/M6-M01-adding-MOVY-tenant.md @@ -87,6 +87,12 @@ k8s@shpod:~/fleet-config-using-flux-XXXXX$ \ --- +class: pic + +![Running Mario](images/M6-running-Mario.gif) + +--- + class: extra-details ### Another Flux error? @@ -122,6 +128,16 @@ k8s@shpod:~$ flux reconcile source git movy-app -n movy-test ] +--- + +class: pic + +![Running Mario](images/M6-running-Mario.gif) + +--- + +### New branch detected + You now have a second app responding on [http://movy.test.mybestdomain.com] But as of now, it's just the same as the **_🎸ROCKY_** one. @@ -176,6 +192,21 @@ pod network is still full mesh and any connection is authorized. --- +## Adding NetworkPolicies to **_🎸ROCKY_** and **_🎬MOVY_** namespaces + +`Network policies` may be seen as the firewall feature in the pod network. +They rules ingress and egress network connections considering a described subset of pods. + +They are not + +--- + +class: pic + +![Running Mario](images/M6-running-Mario.gif) + +--- + ### 🗺️ Where are we in our scenario? 
@@ -247,13 +278,34 @@ gitGraph
     checkout TEST-env
     merge MOVY tag:'MOVY v1.0.3' type: REVERSE
 
+    checkout OPS
+    commit id:'Network policies'
+    checkout TEST-env
+    merge OPS type: HIGHLIGHT
+
     checkout YouRHere
     commit id:'x'
     checkout OPS
     merge YouRHere id:'YOU ARE HERE'
 
     checkout OPS
-    commit id:'Network policies'
-    checkout TEST-env
+    commit id:'k0s install on METAL cluster' tag:'K01'
+    commit id:'Flux config. for METAL cluster' tag:'K02'
+    branch METAL_TEST-PROD order:3
+    commit id:'ROCKY/MOVY tenants on METAL' type: HIGHLIGHT
+    checkout OPS
+    commit id:'Flux config. for OpenEBS' tag:'K03'
+    checkout METAL_TEST-PROD
+    merge OPS id:'openEBS on METAL' type: HIGHLIGHT
+
+    checkout OPS
+    commit id:'Prometheus install'
+    checkout METAL_TEST-PROD
+    merge OPS type: HIGHLIGHT
+
+    checkout OPS
+    commit id:'Kyverno install'
+    commit id:'Kyverno rules'
+    checkout METAL_TEST-PROD
     merge OPS type: HIGHLIGHT
diff --git a/slides/k8s/M6-START-a-company-scenario.md b/slides/k8s/M6-START-a-company-scenario.md index f57a1640..3fdc2889 100644 --- a/slides/k8s/M6-START-a-company-scenario.md +++ b/slides/k8s/M6-START-a-company-scenario.md @@ -249,9 +249,9 @@ The **_⚙️OPS_** team aims to provide clusters offering the following feature }%% gitGraph commit id:"0" tag:"start" - branch ROCKY order:3 - branch MOVY order:4 - branch YouRHere order:5 + branch ROCKY order:4 + branch MOVY order:5 + branch YouRHere order:6 checkout YouRHere commit id:'x' @@ -314,13 +314,28 @@ gitGraph checkout OPS commit id:'Network policies' checkout TEST-env + merge OPS type: HIGHLIGHT tag:'T07' + + checkout OPS + commit id:'k0s install on METAL cluster' tag:'K01' + commit id:'Flux config. for METAL cluster' tag:'K02' + branch METAL_TEST-PROD order:3 + commit id:'ROCKY/MOVY tenants on METAL' type: HIGHLIGHT + checkout OPS + commit id:'Flux config. for OpenEBS' tag:'K03' + checkout METAL_TEST-PROD + merge OPS id:'openEBS on METAL' type: HIGHLIGHT + + checkout OPS + commit id:'Prometheus install' + checkout METAL_TEST-PROD merge OPS type: HIGHLIGHT - checkout MOVY - commit id:'MOVY HELM chart' tag:'M03' - - checkout TEST-env - merge MOVY tag:'MOVY v1.0' + checkout OPS + commit id:'Kyverno install' + commit id:'Kyverno rules' + checkout METAL_TEST-PROD + merge OPS type: HIGHLIGHT checkout OPS commit id:'Flux config. for PROD tenant' tag:'P01' @@ -333,21 +348,8 @@ gitGraph checkout PROD-env merge ROCKY tag:'ROCKY v1.0.2' - checkout OPS - commit id:'Prometheus install' - checkout PROD-env - merge OPS type: HIGHLIGHT - - checkout OPS - commit id:'Kyverno install' - commit id:'Kyverno rules' - checkout PROD-env - merge OPS type: HIGHLIGHT - - checkout OPS - commit id:'Add OpenEBS' + checkout MOVY + commit id:'MOVY HELM chart' tag:'M03' checkout TEST-env - merge OPS id:'patch dedicated to PROD' type: REVERSE - checkout PROD-env - merge OPS type: HIGHLIGHT + merge MOVY tag:'MOVY v1.0' diff --git a/slides/k8s/M6-mermaid.md b/slides/k8s/M6-mermaid.md deleted file mode 100644 index 3a5e783c..00000000 --- a/slides/k8s/M6-mermaid.md +++ /dev/null @@ -1,111 +0,0 @@ -%%{init: - { - "theme": "default", - "gitGraph": { - "mainBranchName": "OPS", - "mainBranchOrder": 0 - } - } -}%% -gitGraph - commit id:"0" tag:"start" - branch ROCKY order:3 - branch MOVY order:4 - branch YouRHere order:5 - - checkout YouRHere - commit id:'x' - checkout OPS - merge YouRHere id:'YOU ARE HERE' - - checkout OPS - commit id:'Flux install on CLOUDY cluster' tag:'T01' - branch TEST-env order:1 - commit id:'FLUX install on TEST' tag:'T02' type: HIGHLIGHT - - checkout OPS - commit id:'ROCKY config.' tag:'T03' - commit id:'namespace isolation by RBAC' - checkout TEST-env - merge OPS id:'ROCKY tenant creation' tag:'T04' - - checkout OPS - commit id:'ROCKY deploy. config.' tag:'R01' - - checkout TEST-env - merge OPS id:'FLUX ready to deploy ROCKY' type: HIGHLIGHT tag:'R02' - - checkout ROCKY - commit id:'ROCKY' tag:'v1.0.0' - - checkout TEST-env - merge ROCKY tag:'ROCKY v1.0.0' - - checkout OPS - commit id:'ROCKY patch for ingress config.' tag:'R03' - checkout TEST-env - merge OPS id:'ingress config. for ROCKY app' - - checkout OPS - commit id:'Ingress-controller config.' tag:'T05' - checkout TEST-env - merge OPS id:'Ingress-controller install' type: HIGHLIGHT tag:'T06' - - checkout ROCKY - commit id:'blue color' tag:'v1.0.1' - checkout TEST-env - merge ROCKY tag:'ROCKY v1.0.1' - - checkout ROCKY - commit id:'pink color' tag:'v1.0.2' - checkout TEST-env - merge ROCKY tag:'ROCKY v1.0.2' - - checkout MOVY - commit id:'MOVY' tag:'v1.0.3' - checkout TEST-env - merge MOVY tag:'MOVY v1.0.3' type: REVERSE - - checkout MOVY - commit id:'MOVY HELM chart' tag:'C01' - - checkout OPS - commit id:'FLUX config for MOVY deployment' tag:'C02' - checkout TEST-env - merge OPS id:'FLUX ready to deploy MOVY' type: HIGHLIGHT tag:'C03' - - checkout TEST-env - merge MOVY tag:'MOVY v1.0' - - checkout ROCKY - commit id:'fix namespace' tag:'v1.1.1' - checkout TEST-env - merge ROCKY tag:'ROCKY v1.1.1' - - checkout ROCKY - commit id:'add a field' tag:'v1.2' - checkout TEST-env - merge ROCKY tag:'ROCKY v1.2' - - checkout OPS - commit id:'Kyverno install' - commit id:'Kyverno rules' - checkout TEST-env - merge OPS type: HIGHLIGHT - - checkout OPS - commit id:'Network policies' - checkout TEST-env - merge OPS type: HIGHLIGHT - - checkout OPS - branch PROD-env order:2 - commit id:'FLUX install on PROD' - commit id:'PROD cluster configuration' - - checkout OPS - commit id:'Add OpenEBS' - checkout TEST-env - merge OPS id:'patch dedicated to PROD' type: REVERSE - checkout PROD-env - merge OPS type: HIGHLIGHT