feat: InitContainer support for ACI Connector

client/aci/types.go

@@ -72,6 +72,12 @@ type Container struct {
 	ContainerProperties `json:"properties,omitempty"`
 }
 
+// InitContainerDefinition is a initContainer instance.
+type InitContainerDefinition struct {
+	Name                    string `json:"name,omitempty"`
+	InitContainerProperties `json:"properties,omitempty"`
+}
+
 // ContainerGroup is a container group.
 type ContainerGroup struct {
 	api.ResponseMetadata     `json:"-"`
@@ -87,14 +93,15 @@ type ContainerGroup struct {
 type ContainerGroupProperties struct {
 	ProvisioningState        string                               `json:"provisioningState,omitempty"`
 	Containers               []Container                          `json:"containers,omitempty"`
+	InitContainers           []InitContainerDefinition            `json:"initContainers,omitempty"`
 	ImageRegistryCredentials []ImageRegistryCredential            `json:"imageRegistryCredentials,omitempty"`
 	RestartPolicy            ContainerGroupRestartPolicy          `json:"restartPolicy,omitempty"`
 	IPAddress                *IPAddress                           `json:"ipAddress,omitempty"`
 	OsType                   OperatingSystemTypes                 `json:"osType,omitempty"`
 	Volumes                  []Volume                             `json:"volumes,omitempty"`
 	InstanceView             ContainerGroupPropertiesInstanceView `json:"instanceView,omitempty"`
 	Diagnostics              *ContainerGroupDiagnostics           `json:"diagnostics,omitempty"`
-	SubnetIds           	 []*SubnetIdDefinition            `json:"subnetIds,omitempty"`
+	SubnetIds                []*SubnetIdDefinition                `json:"subnetIds,omitempty"`
 	Extensions               []*Extension                         `json:"extensions,omitempty"`
 	DNSConfig                *DNSConfig                           `json:"dnsConfig,omitempty"`
 }
@@ -105,7 +112,7 @@ type ContainerGroupPropertiesInstanceView struct {
 	State  string  `json:"state,omitempty"`
 }
 
-// SubnetIdDefinition is the subnet ID, the format should be 
+// SubnetIdDefinition is the subnet ID, the format should be
 // /subscriptions/{subscriptionID}/resourceGroups/{ResourceGroup}/providers/Microsoft.Network/virtualNetworks/{VNET}/subnets/{Subnet}
 type SubnetIdDefinition struct {
 	ID string `json:"id,omitempty"`
@@ -137,6 +144,15 @@ type ContainerProperties struct {
 	ReadinessProbe       *ContainerProbe                 `json:"readinessProbe,omitempty"`
 }
 
+// InitContainerProperties is the initContainer instance properties.
+type InitContainerProperties struct {
+	Image                string                          `json:"image,omitempty"`
+	Command              []string                        `json:"command,omitempty"`
+	EnvironmentVariables []EnvironmentVariable           `json:"environmentVariables,omitempty"`
+	InstanceView         ContainerPropertiesInstanceView `json:"instanceView,omitempty"`
+	VolumeMounts         []VolumeMount                   `json:"volumeMounts,omitempty"`
+}
+
 // ContainerPropertiesInstanceView is the instance view of the container instance. Only valid in response.
 type ContainerPropertiesInstanceView struct {
 	RestartCount  int32          `json:"restartCount,omitempty"`
@@ -242,7 +258,7 @@ type GPUSKU string
 
 const (
 	// K80 specifies the K80 GPU SKU
-	K80  GPUSKU = "K80"
+	K80 GPUSKU = "K80"
 	// P100 specifies the P100 GPU SKU
 	P100 GPUSKU = "P100"
 	// V100 specifies the V100 GPU SKU
@@ -460,7 +476,7 @@ type ExtensionType string
 
 // Supported extension types
 const (
-	ExtensionTypeKubeProxy ExtensionType = "kube-proxy"
+	ExtensionTypeKubeProxy       ExtensionType = "kube-proxy"
 	ExtensionTypeRealtimeMetrics ExtensionType = "realtime-metrics"
 )
 

provider/aci.go

@@ -667,6 +667,11 @@ func (p *ACIProvider) CreatePod(ctx context.Context, pod *v1.Pod) error {
 	containerGroup.RestartPolicy = aci.ContainerGroupRestartPolicy(pod.Spec.RestartPolicy)
 	containerGroup.ContainerGroupProperties.OsType = aci.OperatingSystemTypes(p.operatingSystem)
 
+	// get initContainers
+	initContainers, err := p.getInitContainers(pod)
+	if err != nil {
+		return err
+	}
 	// get containers
 	containers, err := p.getContainers(pod)
 	if err != nil {
@@ -683,6 +688,7 @@ func (p *ACIProvider) CreatePod(ctx context.Context, pod *v1.Pod) error {
 		return err
 	}
 	// assign all the things
+	containerGroup.ContainerGroupProperties.InitContainers = initContainers
 	containerGroup.ContainerGroupProperties.Containers = containers
 	containerGroup.ContainerGroupProperties.Volumes = volumes
 	containerGroup.ContainerGroupProperties.ImageRegistryCredentials = creds
@@ -1443,45 +1449,112 @@ func readDockerConfigJSONSecret(secret *v1.Secret, ips []aci.ImageRegistryCreden
 	return ips, err
 }
 
+//verify if Container is properly declared for the use on ACI
+//this method is used for both initConainers and containers
+func (p *ACIProvider) verifyContainer(container *v1.Container) error {
+	if len(container.Command) == 0 && len(container.Args) > 0 {
+		return errdefs.InvalidInput("ACI does not support providing args without specifying the command. Please supply both command and args to the pod spec.")
+	}
+	return nil
+}
+
+//get the command declared on Container
+//this method is used for both initConainers and containers
+func (p *ACIProvider) getCommand(container *v1.Container) []string {
+	return append(container.Command, container.Args...)
+}
+
+//get VolumeMounts declared on Container as []aci.VolumeMount
+//this method is used for both initConainers and containers
+func (p *ACIProvider) getVolumeMounts(container *v1.Container) []aci.VolumeMount {
+	volumeMounts := make([]aci.VolumeMount, 0, len(container.VolumeMounts))
+	for _, v := range container.VolumeMounts {
+		volumeMounts = append(volumeMounts, aci.VolumeMount{
+			Name:      v.Name,
+			MountPath: v.MountPath,
+			ReadOnly:  v.ReadOnly,
+		})
+	}
+	return volumeMounts
+}
+
+//get EnvironmentVariables declared on Container as []aci.EnvironmentVariable
+//this method is used for both initConainers and containers
+func (p *ACIProvider) getEnvironmentVariables(container *v1.Container) []aci.EnvironmentVariable {
+	environmentVariable := make([]aci.EnvironmentVariable, 0, len(container.Env))
+	for _, e := range container.Env {
+		if e.Value != "" {
+			envVar := getACIEnvVar(e)
+			environmentVariable = append(environmentVariable, envVar)
+		}
+	}
+	return environmentVariable
+}
+
+//get InitContainers defined in Pod as []aci.InitContainerDefinition
+func (p *ACIProvider) getInitContainers(pod *v1.Pod) ([]aci.InitContainerDefinition, error) {
+	initContainers := make([]aci.InitContainerDefinition, 0, len(pod.Spec.InitContainers))
+	for _, initContainer := range pod.Spec.InitContainers {
+		err := p.verifyContainer(&initContainer)
+		if err != nil {
+			return nil, err
+		}
+
+		if initContainer.Ports != nil {
+			return nil, errdefs.InvalidInput("ACI initContainers does not support ports.")
+		}
+		if initContainer.Resources.Requests != nil {
+			return nil, errdefs.InvalidInput("ACI initContainers does not support resources requests.")
+		}
+		if initContainer.Resources.Limits != nil {
+			return nil, errdefs.InvalidInput("ACI initContainers does not support resources limits.")
+		}
+		if initContainer.LivenessProbe != nil {
+			return nil, errdefs.InvalidInput("ACI initContainers does not support livenessProbe.")
+		}
+		if initContainer.ReadinessProbe != nil {
+			return nil, errdefs.InvalidInput("ACI initContainers does not support readinessProbe.")
+		}
+
+		newInitContainer := aci.InitContainerDefinition{
+			Name: initContainer.Name,
+		}
+		newInitContainer.Image = initContainer.Image
+		newInitContainer.Command = p.getCommand(&initContainer)
+
+		newInitContainer.VolumeMounts = p.getVolumeMounts(&initContainer)
+		newInitContainer.EnvironmentVariables = p.getEnvironmentVariables(&initContainer)
+
+		initContainers = append(initContainers, newInitContainer)
+	}
+	return initContainers, nil
+}
+
+//get Containers defined in Pod as []aci.Container type
 func (p *ACIProvider) getContainers(pod *v1.Pod) ([]aci.Container, error) {
 	containers := make([]aci.Container, 0, len(pod.Spec.Containers))
 	for _, container := range pod.Spec.Containers {
-
-		if len(container.Command) == 0 && len(container.Args) > 0 {
-			return nil, errdefs.InvalidInput("ACI does not support providing args without specifying the command. Please supply both command and args to the pod spec.")
+		err := p.verifyContainer(&container)
+		if err != nil {
+			return nil, err
 		}
+
 		c := aci.Container{
 			Name: container.Name,
-			ContainerProperties: aci.ContainerProperties{
-				Image:   container.Image,
-				Command: append(container.Command, container.Args...),
-				Ports:   make([]aci.ContainerPort, 0, len(container.Ports)),
-			},
 		}
+		c.Image = container.Image
+		c.Command = p.getCommand(&container)
 
+		c.Ports = make([]aci.ContainerPort, 0, len(container.Ports))
 		for _, p := range container.Ports {
 			c.Ports = append(c.Ports, aci.ContainerPort{
 				Port:     p.ContainerPort,
 				Protocol: getProtocol(p.Protocol),
 			})
 		}
 
-		c.VolumeMounts = make([]aci.VolumeMount, 0, len(container.VolumeMounts))
-		for _, v := range container.VolumeMounts {
-			c.VolumeMounts = append(c.VolumeMounts, aci.VolumeMount{
-				Name:      v.Name,
-				MountPath: v.MountPath,
-				ReadOnly:  v.ReadOnly,
-			})
-		}
-
-		c.EnvironmentVariables = make([]aci.EnvironmentVariable, 0, len(container.Env))
-		for _, e := range container.Env {
-			if e.Value != "" {
-				envVar := getACIEnvVar(e)
-				c.EnvironmentVariables = append(c.EnvironmentVariables, envVar)
-			}
-		}
+		c.VolumeMounts = p.getVolumeMounts(&container)
+		c.EnvironmentVariables = p.getEnvironmentVariables(&container)
 
 		// NOTE(robbiezhang): ACI CPU request must be times of 10m
 		cpuRequest := 1.00