Minor simplification of getCluster()

This make the code easier to read.
pull/45/head
Andy Zhou 5 years ago
parent 953578ed11
commit 6292c89ec4
  1. 10
      cli/config.go

@ -129,6 +129,7 @@ func getClusters() (map[string]cluster, error) {
// for all servers created by k3d, get workers and cluster information // for all servers created by k3d, get workers and cluster information
for _, server := range k3dServers { for _, server := range k3dServers {
filters.Add("label", fmt.Sprintf("cluster=%s", server.Labels["cluster"])) filters.Add("label", fmt.Sprintf("cluster=%s", server.Labels["cluster"]))
clusterName := server.Labels["cluster"]
// get workers // get workers
workers, err := docker.ContainerList(ctx, types.ContainerListOptions{ workers, err := docker.ContainerList(ctx, types.ContainerListOptions{
@ -136,7 +137,7 @@ func getClusters() (map[string]cluster, error) {
Filters: filters, Filters: filters,
}) })
if err != nil { if err != nil {
log.Printf("WARNING: couldn't get worker containers for cluster %s\n%+v", server.Labels["cluster"], err) log.Printf("WARNING: couldn't get worker containers for cluster %s\n%+v", clusterName, err)
} }
// save cluster information // save cluster information
@ -144,8 +145,8 @@ func getClusters() (map[string]cluster, error) {
for _, port := range server.Ports { for _, port := range server.Ports {
serverPorts = append(serverPorts, strconv.Itoa(int(port.PublicPort))) serverPorts = append(serverPorts, strconv.Itoa(int(port.PublicPort)))
} }
clusters[server.Labels["cluster"]] = cluster{ clusters[clusterName] = cluster{
name: server.Labels["cluster"], name: clusterName,
image: server.Image, image: server.Image,
status: server.State, status: server.State,
serverPorts: serverPorts, serverPorts: serverPorts,
@ -153,8 +154,9 @@ func getClusters() (map[string]cluster, error) {
workers: workers, workers: workers,
} }
// clear label filters before searching for next cluster // clear label filters before searching for next cluster
filters.Del("label", fmt.Sprintf("cluster=%s", server.Labels["cluster"])) filters.Del("label", fmt.Sprintf("cluster=%s", clusterName))
} }
return clusters, nil return clusters, nil
} }

Loading…
Cancel
Save