Support cluster icon

k1LoW · Jan 10, 2021 · db4d853 · db4d853
1 parent 59fde11
commit db4d853
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/config/build.go b/config/build.go
@@ -255,7 +255,6 @@ func (cfg *Config) buildRelations() error {
 			Attrs:      rel.Attrs,
 		}
 		for _, r := range rel.Components {
-			_, _ = fmt.Fprintf(os.Stderr, "rel.Components %v\n", r)
 			c, err := cfg.FindComponent(r)
 			if err != nil {
 				return err

diff --git a/output/dot/templates/diagram.dot.tmpl b/output/dot/templates/diagram.dot.tmpl
@@ -3,7 +3,7 @@ digraph ndiag {
 
 {{ define "cluster" }}
   subgraph "cluster_{{ .cluster | id }}" {
-    label = "{{ .cluster.Layer }}:{{ .cluster.Name | unesc }}";
+    label = {{ .cluster | cluster_label }};
     style = "rounded,filled,setlinewidth(2)";
     color = "{{ .cluster.Metadata.Color | colorhex }}"
     fillcolor = "{{ .cluster.Metadata.FillColor | colorhex }}"

diff --git a/output/dot/templates/node.dot.tmpl b/output/dot/templates/node.dot.tmpl
@@ -3,7 +3,7 @@ digraph ndiag {
 
 {{ define "cluster" }}
   subgraph "cluster_{{ .cluster | id }}" {
-    label = "{{ .cluster.Layer }}:{{ .cluster.Name | unesc }}";
+    label = {{ .cluster | cluster_label }};
     style = "rounded,filled,setlinewidth(2)";
     color = "{{ .cluster.Metadata.Color | colorhex }}"
     fillcolor = "{{ .cluster.Metadata.FillColor | colorhex }}"

diff --git a/output/output.go b/output/output.go
@@ -53,6 +53,18 @@ func Funcs(cfg *config.Config) map[string]interface{} {
 				return fmt.Sprintf(`<<table border="0" cellborder="0" cellspacing="0" cellpadding="0"><tr><td><img src="%s" /></td></tr><tr><td>%s</td></tr></table>>`, i.Path, label)
 			}
 		},
+		"cluster_label": func(c config.Cluster) string {
+			label := unescRep.Replace(c.FullName())
+			if c.Metadata.Icon == "" {
+				return fmt.Sprintf(`"%s"`, label)
+			} else {
+				i, err := cfg.IconMap().Get(c.Metadata.Icon)
+				if err != nil {
+					panic(err)
+				}
+				return fmt.Sprintf(`<<table border="0" cellborder="0" cellspacing="0" cellpadding="0"><tr><td><img src="%s" /></td></tr><tr><td>%s</td></tr></table>>`, i.Path, label)
+			}
+		},
 		"component": func(c config.Component) string {
 			bc := cfg.BaseColor
 			tc := cfg.TextColor

diff --git a/sample/k8s/input/ndiag.yml b/sample/k8s/input/ndiag.yml
@@ -4,6 +4,7 @@ docPath: ../output
 nodes:
   - name: my-namespace
     clusters:
+      - 'cluster:k8s'
       - 'netpol:a'
       - 'limits:b'
       - 'quota:c'