Multi namespace #26
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,11 @@ | ||
| bin/ | ||
| lib/ | ||
| /out/* | ||
| /k8sviz.iml | ||
| service-account-key.json | ||
| config-k8sviz | ||
| /*.png | ||
| /merged.gv-e | ||
| /global.dot | ||
| /config-k8sviz.json | ||
| /service-account-key2.json |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,24 +6,23 @@ package main | |
| import ( | ||
| "flag" | ||
| "fmt" | ||
| "github.com/mkimuram/k8sviz/pkg/graph" | ||
| "github.com/mkimuram/k8sviz/pkg/resources" | ||
| "k8s.io/client-go/kubernetes" | ||
| "k8s.io/client-go/tools/clientcmd" | ||
| "os" | ||
| "path/filepath" | ||
| "strings" | ||
|
|
||
| _ "k8s.io/client-go/plugin/pkg/client/auth" | ||
| ) | ||
|
|
||
| const ( | ||
| defaultNamespace = "namespace" | ||
| defaultOutDir = "out" | ||
| defaultOutType = "dot" | ||
| descNamespaceOpt = "namespace to visualize" | ||
| descOutDirOpt = "output dir" | ||
| descOutTypeOpt = "type of output" | ||
| descShortOptSuffix = " (shorthand)" | ||
| ) | ||
|
|
@@ -33,7 +32,7 @@ var ( | |
| dir string | ||
| // Flags | ||
| namespace string | ||
| outDir string | ||
| outType string | ||
| ) | ||
|
|
||
|
|
@@ -49,8 +48,8 @@ func init() { | |
| } | ||
| flag.StringVar(&namespace, "namespace", defaultNamespace, descNamespaceOpt) | ||
| flag.StringVar(&namespace, "n", defaultNamespace, descNamespaceOpt+descShortOptSuffix) | ||
| flag.StringVar(&outDir, "outDir", defaultOutDir, descOutDirOpt) | ||
| flag.StringVar(&outDir, "o", defaultOutDir, descOutDirOpt+descShortOptSuffix) | ||
| flag.StringVar(&outType, "type", defaultOutType, descOutTypeOpt) | ||
| flag.StringVar(&outType, "t", defaultOutType, descOutTypeOpt+descShortOptSuffix) | ||
| flag.Parse() | ||
|
|
@@ -70,11 +69,13 @@ func init() { | |
| } | ||
|
|
||
| // test connectivity for k8s cluster and the namespace | ||
| //if !strings.Contains(namespace,",") { | ||
|
There was a problem hiding this comment. If namespaces are parsed into the slice(see below), we will be able to check for all the namespaces here. There was a problem hiding this comment. By "below", I meant this comment. It appeared above this comment :) |
||
| // _, err = clientset.CoreV1().Namespaces().Get(namespace, metav1.GetOptions{}) | ||
| // if err != nil { | ||
| // fmt.Fprintf(os.Stderr, "Failed to get namespace %q: %v\n", namespace, err) | ||
| // os.Exit(1) | ||
| // } | ||
| //} | ||
|
|
||
| dir, err = getBinDir() | ||
| if err != nil { | ||
|
|
@@ -85,23 +86,25 @@ func init() { | |
|
|
||
| func main() { | ||
| // Get all resources in the namespace | ||
| words := strings.Split(namespace, ",") | ||
|
There was a problem hiding this comment. To parse comma separated strings to a slice of string, https://golang.org/src/flag/example_test.go might be a good reference. |
||
| for _, ns := range words { | ||
| res, err := resources.NewResources(clientset, ns) | ||
| if err != nil { | ||
| fmt.Fprintf(os.Stderr, "Failed to get k8s resources: %v\n", err) | ||
| os.Exit(1) | ||
| } | ||
|
|
||
| g := graph.NewGraph(res, dir) | ||
|
There was a problem hiding this comment. Let's make |
||
| if outType == "dot" { | ||
| if err := g.WriteDotFile(outDir + "/" + ns + "." + outType); err != nil { | ||
| fmt.Fprintf(os.Stderr, "Failed to output %q file with format %q for namespace %q: %v\n", outDir, outType, namespace, err) | ||
| os.Exit(1) | ||
| } | ||
| } else { | ||
| if err := g.PlotDotFile(outDir+"/"+ns+"."+outType, outType); err != nil { | ||
| fmt.Fprintf(os.Stderr, "Failed to output %q file with format %q for namespace %q: %v\n", outDir, outType, namespace, err) | ||
| os.Exit(1) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, you don't need to modify Makefile. Instead, Just call below: