Add GitOps to Readme

AasSuhendar · Dec 22, 2020 · 54fa063 · 54fa063
1 parent 871bb4a
commit 54fa063
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -25,6 +25,7 @@ Note that the diagrams don't use UML notation. They are rather box and line diag
 - [Role Based Access Control (RBAC) Resources](#role-based-access-control-rbac-resources)
 - [PodSecurityPolicy Activation via RBAC](#podsecuritypolicy-activation-via-rbac)
 - [Troubleshooting Kubernetes PodSecurityPolicies](#troubleshooting-kubernetes-podsecuritypolicies)
+- [GitOps](#gitops)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
@@ -108,3 +109,16 @@ Connection from Pod to PSP via RBAC (Role, RoleBinding, ServiceAccount).
 A diagram to help debugging Kubernetes PodSecurityPolicies.
 
 ![](https://www.plantuml.com/plantuml/proxy?src=https://raw.githubusercontent.com/cloudogu/k8s-diagrams/master/diagrams/troubleshooting-k8s-psps.puml&fmt=svg)
+
+# GitOps
+
+Diagrams describing the general concepts of gitOps and distinguishing it from "ciOps".  
+See also our [GitOps glossary](https://cloudogu.com/en/glossary/gitops/) and [offerings for consulting](https://cloudogu.com/en/consulting/)
+
+![](https://www.plantuml.com/plantuml/proxy?src=https://raw.githubusercontent.com/cloudogu/k8s-diagrams/master/diagrams/ciops.puml&fmt=svg)
+
+![](https://www.plantuml.com/plantuml/proxy?src=https://raw.githubusercontent.com/cloudogu/k8s-diagrams/master/diagrams/gitops-simple.puml&fmt=svg)
+
+![](https://www.plantuml.com/plantuml/proxy?src=https://raw.githubusercontent.com/cloudogu/k8s-diagrams/master/diagrams/gitops-with-image.puml&fmt=svg)
+
+![](https://www.plantuml.com/plantuml/proxy?src=https://raw.githubusercontent.com/cloudogu/k8s-diagrams/master/diagrams/gitops-with-app-repo.puml&fmt=svg)
diff --git a/diagrams/cicd.puml → diagrams/ciops.puml b/diagrams/cicd.puml → diagrams/ciops.puml
@@ -8,10 +8,13 @@
 
 !define CLOUDOGUURL https://raw.githubusercontent.com/cloudogu/plantuml-cloudogu-sprites/master
 !includeurl CLOUDOGUURL/tools/k8s.puml
+!includeurl CLOUDOGUURL/dogus/cloudogu.puml  
 
 !define CLOUDOGU_BLUE #23a3dd
 !define COLOR_ABOVE_TRANSPARENT_BACKGROUND BLACK
 
+title <color:blue><$k8s></color> **"Classic" Continuous Delivery ("CIOps")** <color:blue><$k8s></color>\n
+
 skinparam actorStyle awesome
 
 together {
@@ -26,6 +29,10 @@ gitRepo <- ciServer : pull
 ciServer -> k8s : deploy
 
 
+legend
+<color:#23a3dd><$cloudogu></color> [[https://cloudogu.com cloudogu.com]]
+end legend
+
 skinparam arrow {
     Color COLOR_ABOVE_TRANSPARENT_BACKGROUND
     FontColor COLOR_ABOVE_TRANSPARENT_BACKGROUND
@@ -55,4 +62,9 @@ skinparam note {
     BorderColor #16688d
 }
 
+skinparam legend {
+    BackgroundColor WHITE
+    BorderColor #16688d
+}
+
 @enduml
diff --git a/diagrams/gitops-simple.puml b/diagrams/gitops-simple.puml
@@ -10,10 +10,13 @@
 
 !define CLOUDOGUURL https://raw.githubusercontent.com/cloudogu/plantuml-cloudogu-sprites/master
 !includeurl CLOUDOGUURL/tools/k8s.puml
+!includeurl CLOUDOGUURL/dogus/cloudogu.puml  
 
 !define CLOUDOGU_BLUE #23a3dd
 !define COLOR_ABOVE_TRANSPARENT_BACKGROUND BLACK
 
+title <color:blue><$k8s></color> **GitOps (simple)** <color:blue><$k8s></color>\n
+
 skinparam actorStyle awesome
 
 together {
@@ -29,6 +32,10 @@ user -> gitRepo : push
 gitRepo <- operator : pull
 operator -> apiServer : deploy
 
+legend
+<color:#23a3dd><$cloudogu></color> [[https://cloudogu.com cloudogu.com]]
+end legend
+
 skinparam arrow {
     Color COLOR_ABOVE_TRANSPARENT_BACKGROUND
     FontColor COLOR_ABOVE_TRANSPARENT_BACKGROUND
@@ -58,4 +65,9 @@ skinparam note {
     BorderColor #16688d
 }
 
+skinparam legend {
+    BackgroundColor WHITE
+    BorderColor #16688d
+}
+
 @enduml
diff --git a/diagrams/gitops-with-app-repo.puml b/diagrams/gitops-with-app-repo.puml
@@ -11,10 +11,13 @@
 
 !define CLOUDOGUURL https://raw.githubusercontent.com/cloudogu/plantuml-cloudogu-sprites/master
 !includeurl CLOUDOGUURL/tools/k8s.puml
+!includeurl CLOUDOGUURL/dogus/cloudogu.puml  
 
 !define CLOUDOGU_BLUE #23a3dd
 !define COLOR_ABOVE_TRANSPARENT_BACKGROUND BLACK
 
+title <color:blue><$k8s></color> **GitOps (with Application Repo)**<color:blue><$k8s></color>\n
+
 skinparam actorStyle awesome
 
 actor Developer as user
@@ -42,6 +45,10 @@ operator -> apiServer : deploy
 kubelet -> registry : pull
 apiServer <- kubelet : watch
 
+legend
+<color:#23a3dd><$cloudogu></color> [[https://cloudogu.com cloudogu.com]]
+end legend
+
 skinparam arrow {
     Color COLOR_ABOVE_TRANSPARENT_BACKGROUND
     FontColor COLOR_ABOVE_TRANSPARENT_BACKGROUND
@@ -71,4 +78,9 @@ skinparam note {
     BorderColor #16688d
 }
 
+skinparam legend {
+    BackgroundColor WHITE
+    BorderColor #16688d
+}
+
 @enduml
diff --git a/diagrams/gitops-with-image.puml b/diagrams/gitops-with-image.puml
@@ -11,10 +11,13 @@
 
 !define CLOUDOGUURL https://raw.githubusercontent.com/cloudogu/plantuml-cloudogu-sprites/master
 !includeurl CLOUDOGUURL/tools/k8s.puml
+!includeurl CLOUDOGUURL/dogus/cloudogu.puml  
 
 !define CLOUDOGU_BLUE #23a3dd
 !define COLOR_ABOVE_TRANSPARENT_BACKGROUND BLACK
 
+title <color:blue><$k8s></color> **GitOps (with Image)** <color:blue><$k8s></color>\n
+
 skinparam actorStyle awesome
 
 actor Developer as user
@@ -40,6 +43,10 @@ operator -> apiServer : deploy
 kubelet -> registry : pull
 apiServer <- kubelet : watch
 
+legend
+<color:#23a3dd><$cloudogu></color> [[https://cloudogu.com cloudogu.com]]
+end legend
+
 skinparam arrow {
     Color COLOR_ABOVE_TRANSPARENT_BACKGROUND
     FontColor COLOR_ABOVE_TRANSPARENT_BACKGROUND
@@ -69,4 +76,9 @@ skinparam note {
     BorderColor #16688d
 }
 
+skinparam legend {
+    BackgroundColor WHITE
+    BorderColor #16688d
+}
+
 @enduml