diff --git a/likec4/deployment/kind-edp.c4 b/likec4/deployment/kind-edp.c4 index ed904be..e677b53 100644 --- a/likec4/deployment/kind-edp.c4 +++ b/likec4/deployment/kind-edp.c4 @@ -21,7 +21,7 @@ deployment { namespace gitea { instanceOf edp.forgejo - instanceOf edp.forgejoRunner + instanceOf forgejoRunner } namespace keycloak { diff --git a/likec4/deployment/otc-edp-foundry.c4 b/likec4/deployment/otc-edp-foundry.c4 index c56e506..377e324 100644 --- a/likec4/deployment/otc-edp-foundry.c4 +++ b/likec4/deployment/otc-edp-foundry.c4 @@ -9,7 +9,7 @@ deployment { cluster internalServices 'EDP Foundry Internal Services' { instanceOf edp.argoCD instanceOf edp.forgejo - instanceOf edp.forgejoRunner + instanceOf forgejoRunner instanceOf edp.externalSecrets instanceOf edp.openbao instanceOf edp.ingressNginx diff --git a/likec4/models/components/forgejoRunner.c4 b/likec4/models/components/forgejoRunner.c4 new file mode 100644 index 0000000..4459b3f --- /dev/null +++ b/likec4/models/components/forgejoRunner.c4 @@ -0,0 +1,6 @@ +model { + component forgejoRunner 'Forgejo Runner' { + description 'A runner is a service that runs jobs triggered by Forgejo. A runner can have different technical implementations like a container or a VM.' + + } +} \ No newline at end of file diff --git a/likec4/models/components/forgejoRunnerWorker.c4 b/likec4/models/components/forgejoRunnerWorker.c4 new file mode 100644 index 0000000..4397bd1 --- /dev/null +++ b/likec4/models/components/forgejoRunnerWorker.c4 @@ -0,0 +1,6 @@ +model { + component forgejoRunnerWorker 'Forgejo Runner Worker' { + description 'A worker is a service that runs a job invoked by a runner. A worker typically is a container.' + + } +} \ No newline at end of file diff --git a/likec4/models/components/promtail.c4 b/likec4/models/components/promtail.c4 new file mode 100644 index 0000000..85b8e5e --- /dev/null +++ b/likec4/models/components/promtail.c4 @@ -0,0 +1,6 @@ +model { + component promtail 'Promtail' { + description 'Log shipper agent for Loki' + + } +} \ No newline at end of file diff --git a/likec4/models/containers/forgejo.c4 b/likec4/models/containers/forgejo.c4 index 62fc883..fcaeacd 100644 --- a/likec4/models/containers/forgejo.c4 +++ b/likec4/models/containers/forgejo.c4 @@ -3,7 +3,7 @@ model { extend edp { container forgejo 'Forgejo' { description ' - Fully managed DevOps Platfrom + Fully managed DevOps Platform offering capabilities like code version controling collaboration and ticketing @@ -20,16 +20,13 @@ model { icon tech:github } - forgejoproject -> forgejoRunner 'executes pipelines' } - component forgejoRunner 'Forgejo Actions' { + component forgejoActions 'Forgejo Actions' { description 'Continuous Integration like Github Actions' technology 'Golang' icon tech:go - style { - multiple true - } + -> forgejoRunner 'runs workflows' } component imageregistry 'Forgejo OCI Image Registry' { diff --git a/likec4/models/containers/loki.c4 b/likec4/models/containers/loki.c4 new file mode 100644 index 0000000..f49070a --- /dev/null +++ b/likec4/models/containers/loki.c4 @@ -0,0 +1,8 @@ +model { + + extend edp { + container loki 'Loki' { + description 'Log aggregation system' + } + } +} \ No newline at end of file diff --git a/likec4/models/containers/prometheus.c4 b/likec4/models/containers/prometheus.c4 new file mode 100644 index 0000000..5da49e8 --- /dev/null +++ b/likec4/models/containers/prometheus.c4 @@ -0,0 +1,9 @@ +model { + + extend edp { + container prometheus 'Prometheus' { + description 'Monitoring and alerting toolkit' + icon tech:prometheus + } + } +} \ No newline at end of file diff --git a/likec4/views/deployment/kind.c4 b/likec4/views/deployment/kind.c4 index 9090e60..a6d12f3 100644 --- a/likec4/views/deployment/kind.c4 +++ b/likec4/views/deployment/kind.c4 @@ -1,6 +1,6 @@ views { deployment view index { - title 'Local Deployment' + title 'Local Kind Deployment' include *, diff --git a/likec4/views/deployment/otc/edp-foundry-central-service.c4 b/likec4/views/deployment/otc/edp-foundry-central-service.c4 new file mode 100644 index 0000000..391ed32 --- /dev/null +++ b/likec4/views/deployment/otc/edp-foundry-central-service.c4 @@ -0,0 +1,13 @@ +views { + deployment view edp-foundry-central-service { + title 'EDP Foundry Central Service' + + include + otc-edpFoundry.internalServices, + otc-edpFoundry.internalServices.*, + otc-edpFoundry.centralObservability, + otc-edpFoundry.centralObservability.*, + otc-edpFoundry.centralObservability.monitoring, + } +} + diff --git a/likec4/views/deployment/otc/edp-foundry-internal-services.c4 b/likec4/views/deployment/otc/edp-foundry-internal-services.c4 deleted file mode 100644 index a841e1a..0000000 --- a/likec4/views/deployment/otc/edp-foundry-internal-services.c4 +++ /dev/null @@ -1,10 +0,0 @@ -views { - deployment view edp-foundry-internal-services { - title 'EDP Foundry Internal Services' - - include - otc-edpFoundry.internalServices, - otc-edpFoundry.centralObservability - } -} - diff --git a/likec4/views/dynamic/cicd/gitops-inner-outer-loop.c4 b/likec4/views/dynamic/cicd/gitops-inner-outer-loop.c4 index 7ba319b..d6f60f2 100644 --- a/likec4/views/dynamic/cicd/gitops-inner-outer-loop.c4 +++ b/likec4/views/dynamic/cicd/gitops-inner-outer-loop.c4 @@ -13,10 +13,10 @@ views { } localbox.git -> edp.forgejogit 'git push' - edp.forgejogit -> edp.forgejoRunner 'on push' + edp.forgejogit -> forgejoRunner 'on push' - edp.forgejoRunner -> edp.imageregistry 'pushes new image' - edp.forgejoRunner -> edp.forgejogit 'pushes new appspec' + forgejoRunner -> edp.imageregistry 'pushes new image' + forgejoRunner -> edp.forgejogit 'pushes new appspec' edp.forgejogit -> edp.argoCD 'triggers deployment' edp.argoCD -> cloud 'deploys application' diff --git a/likec4/views/edp/edp-as-idp.c4 b/likec4/views/edp/edp-as-idp.c4 index 2e69006..684368d 100644 --- a/likec4/views/edp/edp-as-idp.c4 +++ b/likec4/views/edp/edp-as-idp.c4 @@ -12,13 +12,13 @@ views { global style text_large - include developer + include developer exclude element.tag = #internal style * { opacity 25% } - group 'EDP' { + group 'EDP' { group 'Developer Control Plane' { group 'Frontend' { include backstage, api @@ -39,6 +39,6 @@ views { include keycloak, kyverno, externalSecrets, openbao } } - autoLayout TopBottom - } + autoLayout TopBottom + } } \ No newline at end of file