Galactic CNI is now using host-device internally (#2)

Author: wnagele

internal/cniconfig/cniconfig.go

@@ -21,19 +21,14 @@ type PluginConfGalactic struct {
 	VPCAttachment string        `json:"vpcattachment"`
 	MTU           int           `json:"mtu,omitempty"`
 	Terminations  []Termination `json:"terminations,omitempty"`
+	IPAM          IPAM          `json:"ipam,omitempty"`
 }
 
 type Termination struct {
 	Network string `json:"network"`
 	Via     string `json:"via,omitempty"`
 }
 
-type PluginConfHostDevice struct {
-	Type   string `json:"type"`
-	Device string `json:"device"`
-	IPAM   IPAM   `json:"ipam,omitempty"`
-}
-
 type IPAM struct {
 	Type      string    `json:"type"`
 	Routes    []Route   `json:"routes,omitempty"`
@@ -112,10 +107,6 @@ func CNIConfigForVPCAttachment(vpc galacticv1alpha.VPC, vpcAttachment galacticv1
 				VPCAttachment: vpcAttachmentIdentifierBase62,
 				MTU:           1300,
 				Terminations:  terminations,
-			},
-			PluginConfHostDevice{
-				Type:   "host-device",
-				Device: fmt.Sprintf("G%09s%03sG", vpcIdentifierBase62, vpcAttachmentIdentifierBase62),
 				IPAM: IPAM{
 					Type:      "static",
 					Addresses: addresses,

internal/cniconfig/cniconfig_test.go

@@ -27,10 +27,6 @@ func TestCNIConfigForVPCAttachment(t *testing.T) {
 					{Network: "192.168.1.0/24", Via: "10.1.1.1"},
 					{Network: "2001:1::/64", Via: "2001:10:1:1::1"},
 				},
-			},
-			cniconfig.PluginConfHostDevice{
-				Type:   "host-device",
-				Device: "G1hVwxnaA7h31G",
 				IPAM: cniconfig.IPAM{
 					Type: "static",
 					Addresses: []cniconfig.Address{