Add images to runners output

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>

cmd/runners.go

@@ -29,13 +29,19 @@ func makeRunners() *cobra.Command {
 
 	cmd.RunE = runRunnersE
 
+	cmd.Flags().Bool("images", false, "Show the image being used for the rootfs and Kernel")
 	cmd.Flags().Bool("json", false, "Request output in JSON format")
 
 	return cmd
 }
 
 func runRunnersE(cmd *cobra.Command, args []string) error {
 
+	images, err := cmd.Flags().GetBool("images")
+	if err != nil {
+		return err
+	}
+
 	var owner string
 	if len(args) == 1 {
 		owner = strings.TrimSpace(args[0])
@@ -62,7 +68,7 @@ func runRunnersE(cmd *cobra.Command, args []string) error {
 
 	c := pkg.NewClient(http.DefaultClient, os.Getenv("ACTUATED_URL"))
 
-	res, status, err := c.ListRunners(pat, owner, staff, requestJson)
+	res, status, err := c.ListRunners(pat, owner, staff, images, requestJson)
 
 	if err != nil {
 		return err

cmd/upgrade.go

@@ -85,7 +85,8 @@ func runUpgradeE(cmd *cobra.Command, args []string) error {
 
 	var upgradeHosts []Host
 	if allHosts {
-		hosts, httpStatus, err := c.ListRunners(pat, owner, staff, true)
+		includeImages := false
+		hosts, httpStatus, err := c.ListRunners(pat, owner, staff, includeImages, true)
 		if err != nil {
 			return err
 		}

pkg/client.go

@@ -76,7 +76,7 @@ func (c *Client) ListJobs(patStr string, owner string, staff bool, json bool) (s
 	return string(body), res.StatusCode, nil
 }
 
-func (c *Client) ListRunners(patStr string, owner string, staff bool, json bool) (string, int, error) {
+func (c *Client) ListRunners(patStr string, owner string, staff, images, json bool) (string, int, error) {
 
 	u, _ := url.Parse(c.baseURL)
 	u.Path = "/api/v1/runners"
@@ -86,6 +86,10 @@ func (c *Client) ListRunners(patStr string, owner string, staff bool, json bool)
 		q.Set("staff", "1")
 	}
 
+	if images {
+		q.Set("image", "1")
+	}
+
 	if len(owner) > 0 {
 		q.Set("owner", owner)
 		log.Printf("Requesting runners for owner %s", owner)