diff --git a/wiki-resources/topology/__main__.py b/wiki-resources/topology/__main__.py index 6e9e3de..da7d325 100644 --- a/wiki-resources/topology/__main__.py +++ b/wiki-resources/topology/__main__.py @@ -9,23 +9,25 @@ from diagrams.k8s.compute import Pod from diagrams.k8s.network import Service from diagrams.k8s.network import Ingress from diagrams.generic.compute import Rack -from diagrams.generic.blank import Blank -from personal import Gitea -from personal import StaticSite +from custom import Gitea +from custom import StaticSite +from custom import Internet if __name__ == '__main__': with Diagram('Public Infrastructure', show=False): - with Cluster('Randy Random Host'): - nginx = Rack('Nginx LB') - git = Gitea('Gitea') >> nginx - tmp = StaticSite('Temper Blog') >> nginx - dev = StaticSite('Dev Blog') >> nginx - _ = nginx >> Blank() + # Internet node :) + inet = Internet() with Cluster('Namespace - playground'): ingress = Ingress('Nginx Controller') s = Pod('Sanity') >> Service('sanity.shockrah.xyz') >> ingress u = Pod('Uptime') >> Service('uptime.shockrah.xyz') >> ingress p = Pod('Wiki') >> Service('wiki.shockrah.xyz') >> ingress - _ = ingress >> Blank() + _ = ingress >> inet + with Cluster('Randy Random Host'): + nginx = Rack('Nginx LB') + git = Gitea('Gitea') >> nginx + tmp = StaticSite('Temper Blog') >> nginx + dev = StaticSite('Dev Blog') >> nginx + _ = nginx >> inet diff --git a/wiki-resources/topology/personal.py b/wiki-resources/topology/custom.py similarity index 72% rename from wiki-resources/topology/personal.py rename to wiki-resources/topology/custom.py index 1a6bba6..f4466f6 100644 --- a/wiki-resources/topology/personal.py +++ b/wiki-resources/topology/custom.py @@ -6,3 +6,5 @@ def Gitea(name: str) -> Custom: def StaticSite(name: str) -> Custom: return Custom(name, './images/website.png') +def Internet() -> Custom: + return Custom('Internet', './images/www.png')