Update RevisionSpec to use corev1.Container instead of ContainerSpec

pkg/apis/ela/v1alpha1/revision_types.go

@@ -47,10 +47,6 @@ type AppSpec struct {
 	Image string `json:"image,omitempty"`
 }
 
-type ContainerSpec struct {
-	Image string `json:"image,omitempty"`
-}
-
 // RevisionSpec defines the desired state of Revision
 type RevisionSpec struct {
 	// TODO: Generation does not work correctly with CRD. They are scrubbed
@@ -76,13 +72,7 @@ type RevisionSpec struct {
 	FunctionSpec *FunctionSpec `json:"functionSpec,omitempty"`
 	AppSpec      *AppSpec      `json:"appSpec,omitempty"`
 
-	// TODO(mattmoor): Change to corev1.Container
-	ContainerSpec *ContainerSpec `json:"containerSpec,omitempty"`
-
-	// List of environment variables that will be passed to the app container.
-	// TODO: Add merge strategy for this similar to the EnvVar list on the
-	// Container type.
-	Env []corev1.EnvVar `json:"env,omitempty"`
+	ContainerSpec *corev1.Container `json:"containerSpec,omitempty"`
 }
 
 // RevisionConditionType represents an Revision condition value

pkg/apis/ela/v1alpha1/zz_generated.deepcopy.go

@@ -147,22 +147,6 @@ func (in *ConfigurationStatus) DeepCopy() *ConfigurationStatus {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ContainerSpec) DeepCopyInto(out *ContainerSpec) {
-	*out = *in
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ContainerSpec.
-func (in *ContainerSpec) DeepCopy() *ContainerSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(ContainerSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *FunctionSpec) DeepCopyInto(out *FunctionSpec) {
 	*out = *in
@@ -285,15 +269,8 @@ func (in *RevisionSpec) DeepCopyInto(out *RevisionSpec) {
 		if *in == nil {
 			*out = nil
 		} else {
-			*out = new(ContainerSpec)
-			**out = **in
-		}
-	}
-	if in.Env != nil {
-		in, out := &in.Env, &out.Env
-		*out = make([]v1.EnvVar, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
+			*out = new(v1.Container)
+			(*in).DeepCopyInto(*out)
 		}
 	}
 	return

pkg/controller/revision/controller_test.go

@@ -61,7 +61,7 @@ func getTestRevision() *v1alpha1.Revision {
 		},
 		Spec: v1alpha1.RevisionSpec{
 			Service: "test-service",
-			ContainerSpec: &v1alpha1.ContainerSpec{
+			ContainerSpec: &corev1.Container{
 				Image: "test-image",
 			},
 		},

pkg/controller/revision/ela_pod.go

@@ -33,25 +33,22 @@ func MakeElaPodSpec(u *v1alpha1.Revision) *corev1.PodSpec {
 	serviceID := u.Spec.Service
 	nginxConfigMapName := name + "-" + serviceID + "-proxy-configmap"
 
-	elaContainer := corev1.Container{
-		Name:  elaContainerName,
-		Image: u.Spec.ContainerSpec.Image,
-		Resources: corev1.ResourceRequirements{
-			Requests: corev1.ResourceList{
-				corev1.ResourceName("cpu"): resource.MustParse("25m"),
-			},
+	elaContainer := u.Spec.ContainerSpec.DeepCopy()
+	elaContainer.Name = elaContainerName
+	elaContainer.Resources = corev1.ResourceRequirements{
+		Requests: corev1.ResourceList{
+			corev1.ResourceName("cpu"): resource.MustParse("25m"),
 		},
-		Ports: []corev1.ContainerPort{{
-			Name:          elaPortName,
-			ContainerPort: int32(elaPort),
-		}},
-		VolumeMounts: []corev1.VolumeMount{
-			{
-				MountPath: elaContainerLogVolumeMountPath,
-				Name:      elaContainerLogVolumeName,
-			},
+	}
+	elaContainer.Ports = []corev1.ContainerPort{{
+		Name:          elaPortName,
+		ContainerPort: int32(elaPort),
+	}}
+	elaContainer.VolumeMounts = []corev1.VolumeMount{
+		{
+			MountPath: elaContainerLogVolumeMountPath,
+			Name:      elaContainerLogVolumeName,
 		},
-		Env: u.Spec.Env,
 	}
 
 	elaContainerLogVolume := corev1.Volume{
@@ -139,7 +136,7 @@ func MakeElaPodSpec(u *v1alpha1.Revision) *corev1.PodSpec {
 
 	return &corev1.PodSpec{
 		Volumes:    []corev1.Volume{elaContainerLogVolume, nginxConfigVolume, nginxLogVolume},
-		Containers: []corev1.Container{elaContainer, nginxContainer, fluentdContainer},
+		Containers: []corev1.Container{*elaContainer, nginxContainer, fluentdContainer},
 	}
 }
 

pkg/webhook/webhook_test.go

@@ -340,14 +340,12 @@ func createConfiguration(generation int64) v1alpha1.Configuration {
 			Generation: generation,
 			Template: v1alpha1.Revision{
 				Spec: v1alpha1.RevisionSpec{
-					ContainerSpec: &v1alpha1.ContainerSpec{
+					ContainerSpec: &corev1.Container{
 						Image: imageName,
-					},
-					Env: []corev1.EnvVar{
-						corev1.EnvVar{
+						Env: []corev1.EnvVar{{
 							Name:  envVarName,
 							Value: envVarValue,
-						},
+						}},
 					},
 				},
 			},

sample/helloworld/configuration.yaml

@@ -30,8 +30,8 @@ spec:
   template:
     spec:
       serviceType: container
-      env:
-        - name: TARGET
-          value: shiniestnewestversion
       containerSpec:
         image: sample:latest
+        env:
+          - name: TARGET
+            value: shiniestnewestversion

sample/helloworld/updated_configuration.yaml

@@ -30,8 +30,8 @@ spec:
   template:
     spec:
       serviceType: container
-      env:
-        - name: TARGET
-          value: updatedversion
       containerSpec:
         image: sample:latest
+        env:
+          - name: TARGET
+            value: updatedversion

sample/steren-function/configuration.yaml.tpl

@@ -34,6 +34,6 @@ spec:
       serviceType: container
       containerSpec:
         image: *image
-      env:
-      - name: FUNCTION_TRIGGER_TYPE
-        value: HTTP_TRIGGER
+        env:
+        - name: FUNCTION_TRIGGER_TYPE
+          value: HTTP_TRIGGER

sample/thumbnailer/thumbnailer-prebuilt.yaml

@@ -32,8 +32,8 @@ spec:
   template:
     spec:
       serviceType: container
-      env:
-        - name: TARGET
-          value: thumb_v1
       containerSpec:
         image: docker.io/mchmarny/rester-tester:latest
+        env:
+          - name: TARGET
+            value: thumb_v1

sample/thumbnailer/thumbnailer.yaml.tpl

@@ -42,8 +42,8 @@ spec:
   template:
     spec:
       serviceType: container
-      env:
-        - name: TARGET
-          value: thumb_v1
       containerSpec:
         image: *image
+        env:
+          - name: TARGET
+            value: thumb_v1