Skip to content

Commit

Permalink
Add focus to diagrams
Browse files Browse the repository at this point in the history
Important aspects are red; introduce two arrows to emphasize certain aspects (e.g. CI server pushes config AND creates PR; image AND config are pulled from OCI, etc.)
  • Loading branch information
schnatterer committed Oct 26, 2023
1 parent 436a00c commit bc80d87
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 25 deletions.
13 changes: 6 additions & 7 deletions src/puml/gitops-with-app-repo-ci.puml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,10 @@ skinparam sequenceArrowColor COLOR_ABOVE_TRANSPARENT_BACKGROUND

skinparam actorStyle awesome

together {
actor Developer as user
rectangle "<$git>\nApp Repo" as appRepo
rectangle "<$git>\nConfig Repo" as configRepo
rectangle "<$jenkins>\nCI Server" as ciServer
}
actor Developer as user
rectangle "<$git>\nApp Repo" as appRepo
rectangle "<$git>\nConfig Repo" as configRepo
rectangle "<$jenkins>\nCI Server" as ciServer

rectangle "<$k8s>\nK8s Cluster" as k8s {
rectangle "<$sync>\nGitOps\noperator" as operator
Expand All @@ -36,7 +34,8 @@ rectangle "<$docker>\nOCI Registry" as registry
user -> appRepo : push\ncode\n+config
appRepo -[hidden]> configRepo
appRepo <-- ciServer : pull
configRepo <-- ciServer : push\nconfig\n+create PR
configRepo <-- ciServer : push\nconfig
configRepo <--[#red] ciServer : <color:red>create PR
ciServer -> registry : push
k8s --> registry : pull
configRepo <- k8s : pull
Expand Down
6 changes: 3 additions & 3 deletions src/puml/gitops-with-app-repo-pointer.puml
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ rectangle "<$k8s>\nK8s Cluster" as k8s {
}
rectangle "<$docker>\nOCI Registry" as registry

user -> appRepo : push\ncode\n+config
user -[#red]> appRepo : push\ncode\n<color:red>+config
appRepo -[hidden]> configRepo
appRepo <- configRepo : point to
appRepo <-[#red] configRepo : <color:red>point to
appRepo <-- ciServer : pull
ciServer -> registry : push
k8s --> registry : pull
configRepo <- k8s : pull
appRepo <- k8s : pull
appRepo <-[#red] k8s : <color:red>pull
k8s -> k8s : deploy


Expand Down
14 changes: 7 additions & 7 deletions src/puml/gitops-with-app-repo-replication-oci.puml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,9 @@ skinparam sequenceArrowColor COLOR_ABOVE_TRANSPARENT_BACKGROUND

skinparam actorStyle awesome

together {
actor Developer as user
rectangle "<$git>\nGit" as appRepo
rectangle "<$jenkins>\nCI Server" as ciServer
}
actor Developer as user
rectangle "<$git>\nGit" as appRepo
rectangle "<$jenkins>\nCI Server" as ciServer

rectangle "<$k8s>\nK8s Cluster" as k8s {
rectangle "<$sync>\nGitOps\noperator" as operator
Expand All @@ -34,8 +32,10 @@ rectangle "<$docker>\nOCI Registry" as registry

user -> appRepo : push
appRepo <-- ciServer : pull
ciServer -> registry : push\nimage\n+config
k8s --> registry : pull image+config
ciServer -> registry : push\nimage
ciServer -[#red]> registry : <color:red>push\n<color:red>config
k8s --> registry : pull image
k8s -[#red]-> registry : <color:red>pull\n<color:red>config
k8s -> k8s : deploy

skinparam actor {
Expand Down
5 changes: 2 additions & 3 deletions src/puml/gitops-with-app-repo-replication.puml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,10 @@ rectangle "<$k8s>\nK8s Cluster" as k8s {
}
rectangle "<$docker>\nOCI Registry" as registry

user -> appRepo : push\ncode\n+config
user -[#red]> appRepo : push\ncode\n<color:red>+config
appRepo -[hidden]> configRepo
appRepo <-- ciServer : pull
configRepo <-- ciServer : push\nconfig
ciServer -> registry : push
configRepo <--[#red] ciServer : <color:red>push\n<color:red>config
k8s --> registry : pull
configRepo <- k8s : pull
k8s -> k8s : deploy
Expand Down
2 changes: 1 addition & 1 deletion src/puml/gitops-with-app-repo-separation.puml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ rectangle "<$k8s>\nK8s Cluster" as k8s {
rectangle "<$docker>\nOCI Registry" as registry

user -> appRepo : push\ncode
user -> configRepo : push\nconfig
user -[#red]> configRepo : <color:red>push config
appRepo -[hidden]> configRepo
appRepo <-- ciServer : pull
ciServer -> registry : push\nimage
Expand Down
6 changes: 4 additions & 2 deletions src/puml/gitops-with-image-updater.puml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,10 @@ rectangle "<$docker>\nOCI Registry" as registry
user -> gitRepo : push
gitRepo <-- ciServer : pull
ciServer -> registry : push
k8s --> registry : pull\n+ watch
gitRepo <- k8s : pull\n+ push
k8s --> registry : pull
k8s -[#red]-> registry : <color:red>watch
k8s -> gitRepo : pull
k8s -[#red]> gitRepo : <color:red>push
k8s -> k8s : deploy

skinparam actor {
Expand Down
4 changes: 2 additions & 2 deletions src/puml/gitops-with-renovate.puml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ rectangle "<$k8s>\nK8s Cluster" as k8s {
user -> gitRepo : push
gitRepo <-- ciServer : pull
ciServer -> registry : push
renovate -> registry : watch
renovate -[#red]> registry : <color:red>watch
k8s --> registry : pull
gitRepo <- renovate : create PR
gitRepo <-[#red] renovate : <color:red>create PR
gitRepo <- k8s : pull
k8s -> k8s : deploy

Expand Down

0 comments on commit bc80d87

Please sign in to comment.