diff --git a/sample/k8s/input/ndiag.descriptions/_diagram-nodes.md b/sample/k8s/input/ndiag.descriptions/_cluster-k8s_my-cluster.md similarity index 100% rename from sample/k8s/input/ndiag.descriptions/_diagram-nodes.md rename to sample/k8s/input/ndiag.descriptions/_cluster-k8s_my-cluster.md diff --git a/sample/k8s/input/ndiag.descriptions/_diagram-overview.md b/sample/k8s/input/ndiag.descriptions/_diagram-overview.md new file mode 100644 index 00000000..e69de29b diff --git a/sample/k8s/input/ndiag.descriptions/_layer-k8s.md b/sample/k8s/input/ndiag.descriptions/_layer-k8s.md new file mode 100644 index 00000000..e69de29b diff --git a/sample/k8s/input/ndiag.yml b/sample/k8s/input/ndiag.yml index 08ca054a..794b550d 100644 --- a/sample/k8s/input/ndiag.yml +++ b/sample/k8s/input/ndiag.yml @@ -1,9 +1,13 @@ --- name: Exposed Pod with 3 replicas docPath: ../output +diagrams: + - name: overview + layers: ["k8s"] nodes: - name: my-namespace clusters: + - 'k8s:my-cluster?icon=k8s-logo' - 'netpol:a' - 'limits:b' - 'quota:c' diff --git a/sample/k8s/output/README.md b/sample/k8s/output/README.md index db92fb2a..78c420ad 100644 --- a/sample/k8s/output/README.md +++ b/sample/k8s/output/README.md @@ -1,6 +1,6 @@ # Exposed Pod with 3 replicas -![diagram](diagram-nodes.svg) +![diagram](diagram-overview.svg) See https://github.com/kubernetes/community/tree/master/icons#usage-example @@ -14,13 +14,14 @@ See https://github.com/kubernetes/community/tree/master/icons#usage-example | Name | Description | | --- | --- | -| [Nodes](diagram-nodes.md) | :pencil2: | +| [overview](diagram-overview.md) | :pencil2: | ## Layers | Name | Description | | --- | --- | +| [k8s](layer-k8s.md) | :pencil2: | | [netpol](layer-netpol.md) | :pencil2: | | [limits](layer-limits.md) | :pencil2: | | [quota](layer-quota.md) | :pencil2: | diff --git a/sample/k8s/output/diagram-nodes.svg b/sample/k8s/output/diagram-nodes.svg deleted file mode 100644 index cd74b9ee..00000000 --- a/sample/k8s/output/diagram-nodes.svg +++ /dev/null @@ -1,2 +0,0 @@ -ndiagcluster_my-namespacemy-namespacemy-namespace:your.domain.comyour.domain.commy-namespace:my-svcmy-svcmy-namespace:your.domain.com->my-namespace:my-svcmy-namespace:pod-apod-amy-namespace:my-svc->my-namespace:pod-amy-namespace:pod-bpod-bmy-namespace:my-svc->my-namespace:pod-bmy-namespace:pod-cpod-cmy-namespace:my-svc->my-namespace:pod-cmy-namespace:my-hpamy-hpamy-namespace:my-deploymy-deploymy-namespace:my-hpa->my-namespace:my-deploymy-namespace:my-rsmy-rsmy-namespace:my-deploy->my-namespace:my-rsmy-namespace:my-rs->my-namespace:pod-amy-namespace:my-rs->my-namespace:pod-bmy-namespace:my-rs->my-namespace:pod-cbrowserbrowserbrowser->my-namespace:your.domain.com \ No newline at end of file diff --git a/sample/k8s/output/diagram-nodes.md b/sample/k8s/output/diagram-overview.md similarity index 60% rename from sample/k8s/output/diagram-nodes.md rename to sample/k8s/output/diagram-overview.md index 80561680..46cfdfb4 100644 --- a/sample/k8s/output/diagram-nodes.md +++ b/sample/k8s/output/diagram-overview.md @@ -1,11 +1,11 @@ -# Nodes +# overview -![diagram](diagram-nodes.svg) +![diagram](diagram-overview.svg)

- [ :pencil2: Edit description ] + [ :pencil2: Edit description ]

@@ -13,6 +13,7 @@ | Name | Description | | --- | --- | +| [k8s](layer-k8s.md) | :pencil2: | ## Nodes diff --git a/sample/k8s/output/diagram-overview.svg b/sample/k8s/output/diagram-overview.svg new file mode 100644 index 00000000..aa412c02 --- /dev/null +++ b/sample/k8s/output/diagram-overview.svg @@ -0,0 +1,2 @@ +ndiagcluster_k8s:my-clusterk8s:my-clustercluster_my-namespacemy-namespacemy-namespace:your.domain.comyour.domain.commy-namespace:my-svcmy-svcmy-namespace:your.domain.com->my-namespace:my-svcmy-namespace:pod-apod-amy-namespace:my-svc->my-namespace:pod-amy-namespace:pod-bpod-bmy-namespace:my-svc->my-namespace:pod-bmy-namespace:pod-cpod-cmy-namespace:my-svc->my-namespace:pod-cmy-namespace:my-hpamy-hpamy-namespace:my-deploymy-deploymy-namespace:my-hpa->my-namespace:my-deploymy-namespace:my-rsmy-rsmy-namespace:my-deploy->my-namespace:my-rsmy-namespace:my-rs->my-namespace:pod-amy-namespace:my-rs->my-namespace:pod-bmy-namespace:my-rs->my-namespace:pod-cbrowserbrowserbrowser->my-namespace:your.domain.com \ No newline at end of file diff --git a/sample/k8s/output/layer-k8s.md b/sample/k8s/output/layer-k8s.md new file mode 100644 index 00000000..786227fb --- /dev/null +++ b/sample/k8s/output/layer-k8s.md @@ -0,0 +1,29 @@ +# k8s + +![diagram](layer-k8s.svg) + + + +

+ [ :pencil2: Edit description ] +

+ + +## k8s:my-cluster + + + +

+ [ :pencil2: Edit description ] +

+ + +### Nodes + +| Name | Description | +| --- | --- | +| [my-namespace](node-my-namespace.md) | :pencil2: | + +--- + +> Generated by [ndiag](https://github.com/k1LoW/ndiag) diff --git a/sample/k8s/output/layer-k8s.svg b/sample/k8s/output/layer-k8s.svg new file mode 100644 index 00000000..dfbaa253 --- /dev/null +++ b/sample/k8s/output/layer-k8s.svg @@ -0,0 +1,2 @@ +ndiagcluster_k8s:my-clusterk8s:my-clustercluster_my-namespacemy-namespacemy-namespace:your.domain.comyour.domain.commy-namespace:my-svcmy-svcmy-namespace:your.domain.com->my-namespace:my-svcmy-namespace:pod-apod-amy-namespace:my-svc->my-namespace:pod-amy-namespace:pod-bpod-bmy-namespace:my-svc->my-namespace:pod-bmy-namespace:pod-cpod-cmy-namespace:my-svc->my-namespace:pod-cmy-namespace:my-hpamy-hpamy-namespace:my-deploymy-deploymy-namespace:my-hpa->my-namespace:my-deploymy-namespace:my-rsmy-rsmy-namespace:my-deploy->my-namespace:my-rsmy-namespace:my-rs->my-namespace:pod-amy-namespace:my-rs->my-namespace:pod-bmy-namespace:my-rs->my-namespace:pod-c \ No newline at end of file diff --git a/sample/k8s/output/layer-limits.svg b/sample/k8s/output/layer-limits.svg index 5b10ab1c..314b3024 100644 --- a/sample/k8s/output/layer-limits.svg +++ b/sample/k8s/output/layer-limits.svg @@ -1,2 +1,2 @@ ndiagcluster_limits:blimits:bcluster_my-namespacemy-namespacemy-namespace:your.domain.comyour.domain.commy-namespace:my-svcmy-svcmy-namespace:your.domain.com->my-namespace:my-svcmy-namespace:pod-apod-amy-namespace:my-svc->my-namespace:pod-amy-namespace:pod-bpod-bmy-namespace:my-svc->my-namespace:pod-bmy-namespace:pod-cpod-cmy-namespace:my-svc->my-namespace:pod-cmy-namespace:my-hpamy-hpamy-namespace:my-deploymy-deploymy-namespace:my-hpa->my-namespace:my-deploymy-namespace:my-rsmy-rsmy-namespace:my-deploy->my-namespace:my-rsmy-namespace:my-rs->my-namespace:pod-amy-namespace:my-rs->my-namespace:pod-bmy-namespace:my-rs->my-namespace:pod-c \ No newline at end of file + -->ndiagcluster_limits:blimits:bcluster_my-namespacemy-namespacemy-namespace:your.domain.comyour.domain.commy-namespace:my-svcmy-svcmy-namespace:your.domain.com->my-namespace:my-svcmy-namespace:pod-apod-amy-namespace:my-svc->my-namespace:pod-amy-namespace:pod-bpod-bmy-namespace:my-svc->my-namespace:pod-bmy-namespace:pod-cpod-cmy-namespace:my-svc->my-namespace:pod-cmy-namespace:my-hpamy-hpamy-namespace:my-deploymy-deploymy-namespace:my-hpa->my-namespace:my-deploymy-namespace:my-rsmy-rsmy-namespace:my-deploy->my-namespace:my-rsmy-namespace:my-rs->my-namespace:pod-amy-namespace:my-rs->my-namespace:pod-bmy-namespace:my-rs->my-namespace:pod-c \ No newline at end of file diff --git a/sample/k8s/output/layer-netpol.svg b/sample/k8s/output/layer-netpol.svg index a5b7ff36..e4f08339 100644 --- a/sample/k8s/output/layer-netpol.svg +++ b/sample/k8s/output/layer-netpol.svg @@ -1,2 +1,2 @@ ndiagcluster_netpol:anetpol:acluster_my-namespacemy-namespacemy-namespace:your.domain.comyour.domain.commy-namespace:my-svcmy-svcmy-namespace:your.domain.com->my-namespace:my-svcmy-namespace:pod-apod-amy-namespace:my-svc->my-namespace:pod-amy-namespace:pod-bpod-bmy-namespace:my-svc->my-namespace:pod-bmy-namespace:pod-cpod-cmy-namespace:my-svc->my-namespace:pod-cmy-namespace:my-hpamy-hpamy-namespace:my-deploymy-deploymy-namespace:my-hpa->my-namespace:my-deploymy-namespace:my-rsmy-rsmy-namespace:my-deploy->my-namespace:my-rsmy-namespace:my-rs->my-namespace:pod-amy-namespace:my-rs->my-namespace:pod-bmy-namespace:my-rs->my-namespace:pod-c \ No newline at end of file + -->ndiagcluster_netpol:anetpol:acluster_my-namespacemy-namespacemy-namespace:your.domain.comyour.domain.commy-namespace:my-svcmy-svcmy-namespace:your.domain.com->my-namespace:my-svcmy-namespace:pod-apod-amy-namespace:my-svc->my-namespace:pod-amy-namespace:pod-bpod-bmy-namespace:my-svc->my-namespace:pod-bmy-namespace:pod-cpod-cmy-namespace:my-svc->my-namespace:pod-cmy-namespace:my-hpamy-hpamy-namespace:my-deploymy-deploymy-namespace:my-hpa->my-namespace:my-deploymy-namespace:my-rsmy-rsmy-namespace:my-deploy->my-namespace:my-rsmy-namespace:my-rs->my-namespace:pod-amy-namespace:my-rs->my-namespace:pod-bmy-namespace:my-rs->my-namespace:pod-c \ No newline at end of file diff --git a/sample/k8s/output/layer-quota.svg b/sample/k8s/output/layer-quota.svg index 11a15f2c..818c7f53 100644 --- a/sample/k8s/output/layer-quota.svg +++ b/sample/k8s/output/layer-quota.svg @@ -1,2 +1,2 @@ ndiagcluster_quota:cquota:ccluster_my-namespacemy-namespacemy-namespace:your.domain.comyour.domain.commy-namespace:my-svcmy-svcmy-namespace:your.domain.com->my-namespace:my-svcmy-namespace:pod-apod-amy-namespace:my-svc->my-namespace:pod-amy-namespace:pod-bpod-bmy-namespace:my-svc->my-namespace:pod-bmy-namespace:pod-cpod-cmy-namespace:my-svc->my-namespace:pod-cmy-namespace:my-hpamy-hpamy-namespace:my-deploymy-deploymy-namespace:my-hpa->my-namespace:my-deploymy-namespace:my-rsmy-rsmy-namespace:my-deploy->my-namespace:my-rsmy-namespace:my-rs->my-namespace:pod-amy-namespace:my-rs->my-namespace:pod-bmy-namespace:my-rs->my-namespace:pod-c \ No newline at end of file + -->ndiagcluster_quota:cquota:ccluster_my-namespacemy-namespacemy-namespace:your.domain.comyour.domain.commy-namespace:my-svcmy-svcmy-namespace:your.domain.com->my-namespace:my-svcmy-namespace:pod-apod-amy-namespace:my-svc->my-namespace:pod-amy-namespace:pod-bpod-bmy-namespace:my-svc->my-namespace:pod-bmy-namespace:pod-cpod-cmy-namespace:my-svc->my-namespace:pod-cmy-namespace:my-hpamy-hpamy-namespace:my-deploymy-deploymy-namespace:my-hpa->my-namespace:my-deploymy-namespace:my-rsmy-rsmy-namespace:my-deploy->my-namespace:my-rsmy-namespace:my-rs->my-namespace:pod-amy-namespace:my-rs->my-namespace:pod-bmy-namespace:my-rs->my-namespace:pod-c \ No newline at end of file