diff --git a/slides/k8s/M6-R01-flux_configure-ROCKY-deployment.md b/slides/k8s/M6-R01-flux_configure-ROCKY-deployment.md index a59eb021..5001eb30 100644 --- a/slides/k8s/M6-R01-flux_configure-ROCKY-deployment.md +++ b/slides/k8s/M6-R01-flux_configure-ROCKY-deployment.md @@ -352,7 +352,7 @@ gitGraph commit id:'FLUX install on TEST' tag:'T02' type: HIGHLIGHT checkout OPS - commit id:'ROCKY config.' tag:'T03' + commit id:'Flux config. for TEST tenant' tag:'T03' commit id:'namespace isolation by RBAC' checkout TEST-env merge OPS id:'ROCKY tenant creation' tag:'T04' @@ -361,7 +361,7 @@ gitGraph commit id:'ROCKY deploy. config.' tag:'R01' checkout TEST-env - merge OPS id:'FLUX ready to deploy ROCKY' type: HIGHLIGHT tag:'R02' + merge OPS id:'TEST ready to deploy ROCKY' type: HIGHLIGHT tag:'R02' checkout ROCKY commit id:'ROCKY' tag:'v1.0.0' @@ -374,16 +374,16 @@ gitGraph 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 OPS + commit id:'ROCKY patch for ingress config.' tag:'R03' + checkout TEST-env + merge OPS id:'ingress config. for ROCKY app' + checkout ROCKY commit id:'blue color' tag:'v1.0.1' checkout TEST-env @@ -393,4 +393,19 @@ gitGraph commit id:'pink color' tag:'v1.0.2' checkout TEST-env merge ROCKY tag:'ROCKY v1.0.2' + + checkout OPS + commit id:'FLUX config for MOVY deployment' tag:'M01' + checkout TEST-env + merge OPS id:'FLUX ready to deploy MOVY' type: HIGHLIGHT tag:'M02' + + checkout MOVY + commit id:'MOVY' tag:'v1.0.3' + 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 diff --git a/slides/k8s/M6-R03-adding-PROD-env.md b/slides/k8s/M6-R03-adding-PROD-env.md new file mode 100644 index 00000000..e69de29b diff --git a/slides/k8s/M6-START-a-company-scenario.md b/slides/k8s/M6-START-a-company-scenario.md index d95cafb5..f57a1640 100644 --- a/slides/k8s/M6-START-a-company-scenario.md +++ b/slides/k8s/M6-START-a-company-scenario.md @@ -251,6 +251,12 @@ 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' @@ -258,7 +264,7 @@ gitGraph commit id:'FLUX install on TEST' tag:'T02' type: HIGHLIGHT checkout OPS - commit id:'ROCKY config.' tag:'T03' + commit id:'Flux config. for TEST tenant' tag:'T03' commit id:'namespace isolation by RBAC' checkout TEST-env merge OPS id:'ROCKY tenant creation' tag:'T04' @@ -267,7 +273,7 @@ gitGraph commit id:'ROCKY deploy. config.' tag:'R01' checkout TEST-env - merge OPS id:'FLUX ready to deploy ROCKY' type: HIGHLIGHT tag:'R02' + merge OPS id:'TEST ready to deploy ROCKY' type: HIGHLIGHT tag:'R02' checkout ROCKY commit id:'ROCKY' tag:'v1.0.0' @@ -275,16 +281,16 @@ gitGraph 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 OPS + commit id:'ROCKY patch for ingress config.' tag:'R03' + checkout TEST-env + merge OPS id:'ingress config. for ROCKY app' + checkout ROCKY commit id:'blue color' tag:'v1.0.1' checkout TEST-env @@ -295,47 +301,48 @@ gitGraph checkout TEST-env merge ROCKY tag:'ROCKY v1.0.2' + checkout OPS + commit id:'FLUX config for MOVY deployment' tag:'M01' + checkout TEST-env + merge OPS id:'FLUX ready to deploy MOVY' type: HIGHLIGHT tag:'M02' + 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 MOVY + commit id:'MOVY HELM chart' tag:'M03' + + checkout TEST-env + merge MOVY tag:'MOVY v1.0' + checkout OPS + commit id:'Flux config. for PROD tenant' tag:'P01' branch PROD-env order:2 - commit id:'FLUX install on PROD' - commit id:'PROD cluster configuration' + commit id:'ROCKY tenant on PROD' + checkout OPS + commit id:'ROCKY patch for PROD' tag:'R04' + checkout PROD-env + merge OPS id:'PROD ready to deploy ROCKY' type: HIGHLIGHT + 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' diff --git a/slides/k8s/M6-T02-flux-install.md b/slides/k8s/M6-T02-flux-install.md index 1d106b8b..4d6cb10e 100644 --- a/slides/k8s/M6-T02-flux-install.md +++ b/slides/k8s/M6-T02-flux-install.md @@ -384,9 +384,8 @@ gitGraph checkout OPS merge YouRHere id:'YOU ARE HERE' - checkout OPS - commit id:'ROCKY config.' tag:'T03' + commit id:'Flux config. for TEST tenant' tag:'T03' commit id:'namespace isolation by RBAC' checkout TEST-env merge OPS id:'ROCKY tenant creation' tag:'T04' @@ -395,7 +394,7 @@ gitGraph commit id:'ROCKY deploy. config.' tag:'R01' checkout TEST-env - merge OPS id:'FLUX ready to deploy ROCKY' type: HIGHLIGHT tag:'R02' + merge OPS id:'TEST ready to deploy ROCKY' type: HIGHLIGHT tag:'R02' checkout ROCKY commit id:'ROCKY' tag:'v1.0.0' diff --git a/slides/k8s/M6-T03-installing-tenants.md b/slides/k8s/M6-T03-installing-tenants.md index 48523e28..45418c74 100644 --- a/slides/k8s/M6-T03-installing-tenants.md +++ b/slides/k8s/M6-T03-installing-tenants.md @@ -170,7 +170,7 @@ gitGraph commit id:'FLUX install on TEST' tag:'T02' type: HIGHLIGHT checkout OPS - commit id:'ROCKY config.' tag:'T03' + commit id:'Flux config. for TEST tenant' tag:'T03' commit id:'namespace isolation by RBAC' checkout TEST-env merge OPS id:'ROCKY tenant creation' tag:'T04' @@ -184,7 +184,7 @@ gitGraph commit id:'ROCKY deploy. config.' tag:'R01' checkout TEST-env - merge OPS id:'FLUX ready to deploy ROCKY' type: HIGHLIGHT tag:'R02' + merge OPS id:'TEST ready to deploy ROCKY' type: HIGHLIGHT tag:'R02' checkout ROCKY commit id:'ROCKY' tag:'v1.0.0' diff --git a/slides/k8s/M6-T05-ingress-config.md b/slides/k8s/M6-T05-ingress-config.md index db7489f6..ee479257 100644 --- a/slides/k8s/M6-T05-ingress-config.md +++ b/slides/k8s/M6-T05-ingress-config.md @@ -211,7 +211,7 @@ gitGraph commit id:'FLUX install on TEST' tag:'T02' type: HIGHLIGHT checkout OPS - commit id:'ROCKY config.' tag:'T03' + commit id:'Flux config. for TEST tenant' tag:'T03' commit id:'namespace isolation by RBAC' checkout TEST-env merge OPS id:'ROCKY tenant creation' tag:'T04' @@ -220,7 +220,7 @@ gitGraph commit id:'ROCKY deploy. config.' tag:'R01' checkout TEST-env - merge OPS id:'FLUX ready to deploy ROCKY' type: HIGHLIGHT tag:'R02' + merge OPS id:'TEST ready to deploy ROCKY' type: HIGHLIGHT tag:'R02' checkout ROCKY commit id:'ROCKY' tag:'v1.0.0' @@ -238,14 +238,6 @@ gitGraph checkout TEST-env merge OPS id:'ingress config. for ROCKY app' -<<<<<<< HEAD - checkout YouRHere - commit id:'x' - checkout OPS - merge YouRHere id:'YOU ARE HERE' - -======= ->>>>>>> a0dc6a2d (📝 Add Ingress chapter) checkout ROCKY commit id:'blue color' tag:'v1.0.1' checkout TEST-env @@ -255,12 +247,24 @@ gitGraph commit id:'pink color' tag:'v1.0.2' checkout TEST-env merge ROCKY tag:'ROCKY v1.0.2' -<<<<<<< HEAD -======= checkout YouRHere commit id:'x' checkout OPS merge YouRHere id:'YOU ARE HERE' ->>>>>>> a0dc6a2d (📝 Add Ingress chapter) + + checkout OPS + commit id:'FLUX config for MOVY deployment' tag:'M01' + checkout TEST-env + merge OPS id:'FLUX ready to deploy MOVY' type: HIGHLIGHT tag:'M02' + + checkout MOVY + commit id:'MOVY' tag:'v1.0.3' + 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