Merge pull request #10208 from Luap99/play-kube-mac

add --mac-address to podman play kube

1 files changed, 25 insertions, 12 deletions

diff --git a/pkg/api/handlers/libpod/play.go b/pkg/api/handlers/libpod/play.go
index 96f572a8b..90332924c 100644
--- a/pkg/api/handlers/libpod/play.go
+++ b/pkg/api/handlers/libpod/play.go
@@ -21,11 +21,12 @@ func PlayKube(w http.ResponseWriter, r *http.Request) {
 	runtime := r.Context().Value("runtime").(*libpod.Runtime)
 	decoder := r.Context().Value("decoder").(*schema.Decoder)
 	query := struct {
-		Network   string   `schema:"network"`
-		TLSVerify bool     `schema:"tlsVerify"`
-		LogDriver string   `schema:"logDriver"`
-		Start     bool     `schema:"start"`
-		StaticIPs []string `schema:"staticIPs"`
+		Network    string   `schema:"network"`
+		TLSVerify  bool     `schema:"tlsVerify"`
+		LogDriver  string   `schema:"logDriver"`
+		Start      bool     `schema:"start"`
+		StaticIPs  []string `schema:"staticIPs"`
+		StaticMACs []string `schema:"staticMACs"`
 	}{
 		TLSVerify: true,
 		Start:     true,
@@ -48,6 +49,17 @@ func PlayKube(w http.ResponseWriter, r *http.Request) {
 		staticIPs = append(staticIPs, ip)
 	}
 
+	staticMACs := make([]net.HardwareAddr, 0, len(query.StaticMACs))
+	for _, macString := range query.StaticMACs {
+		mac, err := net.ParseMAC(macString)
+		if err != nil {
+			utils.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest,
+				err)
+			return
+		}
+		staticMACs = append(staticMACs, mac)
+	}
+
 	// Fetch the K8s YAML file from the body, and copy it to a temp file.
 	tmpfile, err := ioutil.TempFile("", "libpod-play-kube.yml")
 	if err != nil {
@@ -78,13 +90,14 @@ func PlayKube(w http.ResponseWriter, r *http.Request) {
 
 	containerEngine := abi.ContainerEngine{Libpod: runtime}
 	options := entities.PlayKubeOptions{
-		Authfile:  authfile,
-		Username:  username,
-		Password:  password,
-		Network:   query.Network,
-		Quiet:     true,
-		LogDriver: query.LogDriver,
-		StaticIPs: staticIPs,
+		Authfile:   authfile,
+		Username:   username,
+		Password:   password,
+		Network:    query.Network,
+		Quiet:      true,
+		LogDriver:  query.LogDriver,
+		StaticIPs:  staticIPs,
+		StaticMACs: staticMACs,
 	}
 	if _, found := r.URL.Query()["tlsVerify"]; found {
 		options.SkipTLSVerify = types.NewOptionalBool(!query.TLSVerify)