Merge pull request #3461 from zeborg/clusterawsadm-amilist-ownerid

Added `owner-id` flag for `clusterawsadm ami list`

Author: k8s-ci-robot

cmd/clusterawsadm/ami/list.go

@@ -33,6 +33,7 @@ type ListInput struct {
 	Region            string
 	KubernetesVersion string
 	OperatingSystem   string
+	OwnerID           string
 }
 
 const lastNReleases = 3
@@ -81,7 +82,7 @@ func List(input ListInput) (*amiv1.AWSAMIList, error) {
 		}
 
 		ec2Client := ec2.New(sess)
-		imagesForRegion, err := getAllImages(ec2Client, "")
+		imagesForRegion, err := getAllImages(ec2Client, input.OwnerID)
 		if err != nil {
 			return nil, err
 		}

cmd/clusterawsadm/cmd/ami/list/list.go

@@ -32,6 +32,7 @@ var (
 	kubernetesVersion string
 	opSystem          string
 	outputPrinter     string
+	ownerID           string
 )
 
 // ListAMICmd is a CLI command that will list AMIs from the default AWS account where AMIs are stored.
@@ -67,6 +68,7 @@ func ListAMICmd() *cobra.Command {
 				Region:            region,
 				KubernetesVersion: kubernetesVersion,
 				OperatingSystem:   opSystem,
+				OwnerID:           ownerID,
 			})
 			if err != nil {
 				return err
@@ -87,6 +89,7 @@ func ListAMICmd() *cobra.Command {
 	addOsFlag(newCmd)
 	addKubernetesVersionFlag(newCmd)
 	addOutputFlag(newCmd)
+	addOwnerIDFlag(newCmd)
 	return newCmd
 }
 
@@ -101,3 +104,7 @@ func addKubernetesVersionFlag(c *cobra.Command) {
 func addOutputFlag(c *cobra.Command) {
 	c.Flags().StringVarP(&outputPrinter, "output", "o", "table", "The output format of the results. Possible values: table,json,yaml")
 }
+
+func addOwnerIDFlag(c *cobra.Command) {
+	c.Flags().StringVarP(&ownerID, "owner-id", "", "", "The owner ID of the AWS account to be used for listing AMIs")
+}