Default container name on execPod lifecycle hooks

Makes it easier for a user to use lifecycle hooks for single container
pods.

Author: smarterclayton

pkg/deploy/api/v1/defaults.go

@@ -7,7 +7,7 @@ import (
 	deployapi "github.com/openshift/origin/pkg/deploy/api"
 )
 
-func defaultTagImagesHookContainerName(hook *LifecycleHook, containerName string) {
+func defaultHookContainerName(hook *LifecycleHook, containerName string) {
 	if hook == nil {
 		return
 	}
@@ -16,6 +16,11 @@ func defaultTagImagesHookContainerName(hook *LifecycleHook, containerName string
 			hook.TagImages[i].ContainerName = containerName
 		}
 	}
+	if hook.ExecNewPod != nil {
+		if len(hook.ExecNewPod.ContainerName) == 0 {
+			hook.ExecNewPod.ContainerName = containerName
+		}
+	}
 }
 
 func addDefaultingFuncs(scheme *runtime.Scheme) {
@@ -38,13 +43,13 @@ func addDefaultingFuncs(scheme *runtime.Scheme) {
 			if obj.Template != nil && len(obj.Template.Spec.Containers) == 1 {
 				containerName := obj.Template.Spec.Containers[0].Name
 				if p := obj.Strategy.RecreateParams; p != nil {
-					defaultTagImagesHookContainerName(p.Pre, containerName)
-					defaultTagImagesHookContainerName(p.Mid, containerName)
-					defaultTagImagesHookContainerName(p.Post, containerName)
+					defaultHookContainerName(p.Pre, containerName)
+					defaultHookContainerName(p.Mid, containerName)
+					defaultHookContainerName(p.Post, containerName)
 				}
 				if p := obj.Strategy.RollingParams; p != nil {
-					defaultTagImagesHookContainerName(p.Pre, containerName)
-					defaultTagImagesHookContainerName(p.Post, containerName)
+					defaultHookContainerName(p.Pre, containerName)
+					defaultHookContainerName(p.Post, containerName)
 				}
 			}
 		},

pkg/deploy/api/v1/defaults_test.go

@@ -326,6 +326,80 @@ func TestDeepDefaults(t *testing.T) {
 				return *obj.Spec.Strategy.RecreateParams.TimeoutSeconds == deployapi.DefaultRollingTimeoutSeconds
 			},
 		},
+		{
+			External: &deployv1.DeploymentConfig{
+				Spec: deployv1.DeploymentConfigSpec{
+					Template: &kapiv1.PodTemplateSpec{
+						Spec: kapiv1.PodSpec{
+							Containers: []kapiv1.Container{
+								{Name: "first"},
+							},
+						},
+					},
+					Strategy: deployv1.DeploymentStrategy{
+						Type: deployv1.DeploymentStrategyTypeRecreate,
+						RecreateParams: &deployv1.RecreateDeploymentStrategyParams{
+							Pre: &deployv1.LifecycleHook{
+								TagImages:  []deployv1.TagImageHook{{}},
+								ExecNewPod: &deployv1.ExecNewPodHook{},
+							},
+							Mid: &deployv1.LifecycleHook{
+								TagImages:  []deployv1.TagImageHook{{}},
+								ExecNewPod: &deployv1.ExecNewPodHook{},
+							},
+							Post: &deployv1.LifecycleHook{
+								TagImages:  []deployv1.TagImageHook{{}},
+								ExecNewPod: &deployv1.ExecNewPodHook{},
+							},
+						},
+					},
+				},
+			},
+			Internal: &deployapi.DeploymentConfig{},
+			Ok: func(out runtime.Object) bool {
+				obj := out.(*deployapi.DeploymentConfig)
+				return obj.Spec.Strategy.RecreateParams.Pre.ExecNewPod.ContainerName == "first" &&
+					obj.Spec.Strategy.RecreateParams.Mid.ExecNewPod.ContainerName == "first" &&
+					obj.Spec.Strategy.RecreateParams.Post.ExecNewPod.ContainerName == "first" &&
+					obj.Spec.Strategy.RecreateParams.Pre.TagImages[0].ContainerName == "first" &&
+					obj.Spec.Strategy.RecreateParams.Mid.TagImages[0].ContainerName == "first" &&
+					obj.Spec.Strategy.RecreateParams.Post.TagImages[0].ContainerName == "first"
+			},
+		},
+		{
+			External: &deployv1.DeploymentConfig{
+				Spec: deployv1.DeploymentConfigSpec{
+					Template: &kapiv1.PodTemplateSpec{
+						Spec: kapiv1.PodSpec{
+							Containers: []kapiv1.Container{
+								{Name: "first"},
+							},
+						},
+					},
+					Strategy: deployv1.DeploymentStrategy{
+						Type: deployv1.DeploymentStrategyTypeRecreate,
+						RollingParams: &deployv1.RollingDeploymentStrategyParams{
+							Pre: &deployv1.LifecycleHook{
+								TagImages:  []deployv1.TagImageHook{{}},
+								ExecNewPod: &deployv1.ExecNewPodHook{},
+							},
+							Post: &deployv1.LifecycleHook{
+								TagImages:  []deployv1.TagImageHook{{}},
+								ExecNewPod: &deployv1.ExecNewPodHook{},
+							},
+						},
+					},
+				},
+			},
+			Internal: &deployapi.DeploymentConfig{},
+			Ok: func(out runtime.Object) bool {
+				obj := out.(*deployapi.DeploymentConfig)
+				return obj.Spec.Strategy.RollingParams.Pre.ExecNewPod.ContainerName == "first" &&
+					obj.Spec.Strategy.RollingParams.Post.ExecNewPod.ContainerName == "first" &&
+					obj.Spec.Strategy.RollingParams.Pre.TagImages[0].ContainerName == "first" &&
+					obj.Spec.Strategy.RollingParams.Post.TagImages[0].ContainerName == "first"
+			},
+		},
 		{
 			External: &deployv1.DeploymentConfig{
 				Spec: deployv1.DeploymentConfigSpec{