From d4c260aa4ade7b36ab0896c26f8fbefd2f499290 Mon Sep 17 00:00:00 2001 From: Ludovic Piot Date: Mon, 9 Jun 2025 21:18:59 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=84=20=F0=9F=93=9D=20=F0=9F=8E=A8=20Up?= =?UTF-8?q?grade=20the=20mermaid=20scenario=20schema?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../M6-R01-flux_configure-ROCKY-deployment.md | 69 +++++++++++ slides/k8s/M6-START-a-company-scenario.md | 78 ++++++------ slides/k8s/M6-T02-flux-install.md | 50 ++++++++ slides/k8s/M6-T03-installing-tenants.md | 49 ++++++++ slides/k8s/M6-mermaid.md | 111 ++++++++++++++++++ 5 files changed, 323 insertions(+), 34 deletions(-) create mode 100644 slides/k8s/M6-mermaid.md diff --git a/slides/k8s/M6-R01-flux_configure-ROCKY-deployment.md b/slides/k8s/M6-R01-flux_configure-ROCKY-deployment.md index 3c431d58..c2dd4245 100644 --- a/slides/k8s/M6-R01-flux_configure-ROCKY-deployment.md +++ b/slides/k8s/M6-R01-flux_configure-ROCKY-deployment.md @@ -325,3 +325,72 @@ What happens if the **_🎸ROCKY_** team upgrades its branch to deploy `v1.0.1` ## _tenant_ **_🏭PROD_** 💡 **_🏭PROD_** _tenant_ is still waiting for its `Flux` configuration, but don't bother for it right now. + +--- + +### 🗺️ Where are we in our scenario? + +
+%%{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 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 YouRHere
+    commit id:'x'
+    checkout OPS
+    merge YouRHere id:'YOU ARE HERE'
+
+    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'
+
diff --git a/slides/k8s/M6-START-a-company-scenario.md b/slides/k8s/M6-START-a-company-scenario.md index c9936e62..d95cafb5 100644 --- a/slides/k8s/M6-START-a-company-scenario.md +++ b/slides/k8s/M6-START-a-company-scenario.md @@ -250,87 +250,97 @@ The **_⚙️OPS_** team aims to provide clusters offering the following feature gitGraph commit id:"0" tag:"start" branch ROCKY order:3 - branch CLASSY order:4 + branch MOVY order:4 checkout OPS commit id:'Flux install on CLOUDY cluster' tag:'T01' - branch CLOUDY-cluster_TEST-env order:1 + branch TEST-env order:1 commit id:'FLUX install on TEST' tag:'T02' type: HIGHLIGHT checkout OPS commit id:'ROCKY config.' tag:'T03' - checkout CLOUDY-cluster_TEST-env + 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 CLOUDY-cluster_TEST-env + checkout TEST-env merge OPS id:'FLUX ready to deploy ROCKY' type: HIGHLIGHT tag:'R02' checkout ROCKY - commit id:'ROCKY' tag:'v1.0' + commit id:'ROCKY' tag:'v1.0.0' - checkout CLOUDY-cluster_TEST-env - merge ROCKY tag:'ROCKY v1.0' - - checkout CLASSY - commit id:'CLASSY' tag:'v1.0' - - checkout CLASSY - commit id:'CLASSY HELM chart' tag:'C01' + checkout TEST-env + merge ROCKY tag:'ROCKY v1.0.0' checkout OPS - commit id:'FLUX config for CLASSY deployment' tag:'C02' - checkout CLOUDY-cluster_TEST-env - merge OPS id:'FLUX ready to deploy CLASSY' type: HIGHLIGHT tag:'C03' + 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 CLOUDY-cluster_TEST-env - merge CLASSY tag:'CLASSY v1.0' - checkout ROCKY - commit id:'new color' tag:'v1.1' - checkout CLOUDY-cluster_TEST-env - merge ROCKY tag:'ROCKY v1.1' + commit id:'blue color' tag:'v1.0.1' + checkout TEST-env + merge ROCKY tag:'ROCKY v1.0.1' - checkout CLOUDY-cluster_TEST-env - commit id:'wrong namespace' type: REVERSE + 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:'namespace isolation' - checkout CLOUDY-cluster_TEST-env - merge OPS type: HIGHLIGHT + 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 CLOUDY-cluster_TEST-env + checkout TEST-env merge ROCKY tag:'ROCKY v1.1.1' checkout ROCKY commit id:'add a field' tag:'v1.2' - checkout CLOUDY-cluster_TEST-env + checkout TEST-env merge ROCKY tag:'ROCKY v1.2' checkout OPS commit id:'Kyverno install' commit id:'Kyverno rules' - checkout CLOUDY-cluster_TEST-env + checkout TEST-env merge OPS type: HIGHLIGHT checkout OPS commit id:'Network policies' - checkout CLOUDY-cluster_TEST-env + checkout TEST-env merge OPS type: HIGHLIGHT checkout OPS - branch PROD-cluster order:2 + branch PROD-env order:2 commit id:'FLUX install on PROD' commit id:'PROD cluster configuration' checkout OPS commit id:'Add OpenEBS' - checkout CLOUDY-cluster_TEST-env + checkout TEST-env merge OPS id:'patch dedicated to PROD' type: REVERSE - checkout PROD-cluster + checkout PROD-env merge OPS type: HIGHLIGHT diff --git a/slides/k8s/M6-T02-flux-install.md b/slides/k8s/M6-T02-flux-install.md index 77fb5c4d..1d106b8b 100644 --- a/slides/k8s/M6-T02-flux-install.md +++ b/slides/k8s/M6-T02-flux-install.md @@ -353,3 +353,53 @@ Please, refer to the [`Kustomize` chapter in the High Five M3 module](./3.yml.ht For more info about how Kubernetes resource natures are identified by their `Group / Version / Kind` triplet… … please, refer to the [`Kubernetes API` chapter in the High Five M5 module](./5.yml.html#toc-the-kubernetes-api) + +--- + +### 🗺️ Where are we in our scenario? + +
+%%{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 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 YouRHere
+    commit id:'x'
+    checkout OPS
+    merge YouRHere id:'YOU ARE HERE'
+
+
+    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'
+
diff --git a/slides/k8s/M6-T03-installing-tenants.md b/slides/k8s/M6-T03-installing-tenants.md index d54daa4a..80223ea1 100644 --- a/slides/k8s/M6-T03-installing-tenants.md +++ b/slides/k8s/M6-T03-installing-tenants.md @@ -143,3 +143,52 @@ What the **_⚙️OPS_** team has to do: What the **_🎸ROCKY_** team has to do: - 👨‍💻 Create the `kustomization.yaml` file in the **_🎸ROCKY_** app source code repository on `Github` + +--- + +### 🗺️ Where are we in our scenario? + +
+%%{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 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 YouRHere
+    commit id:'x'
+    checkout OPS
+    merge YouRHere id:'YOU ARE HERE'
+
+    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'
+
diff --git a/slides/k8s/M6-mermaid.md b/slides/k8s/M6-mermaid.md new file mode 100644 index 00000000..3a5e783c --- /dev/null +++ b/slides/k8s/M6-mermaid.md @@ -0,0 +1,111 @@ +%%{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