Add openshift.io/deployer-pod.type label

Author: legionus

pkg/deploy/api/types.go

@@ -199,6 +199,8 @@ const (
 	// annotation value is the name of the deployer Pod which will act upon the ReplicationController
 	// to implement the deployment behavior.
 	DeploymentPodAnnotation = "openshift.io/deployer-pod.name"
+	// DeploymentPodTypeLabel is a label with which contains a type of deployment pod.
+	DeploymentPodTypeLabel = "openshift.io/deployer-pod.type"
 	// DeployerPodForDeploymentLabel is a label which groups pods related to a
 	// deployment. The value is a deployment name. The deployer pod and hook pods
 	// created by the internal strategies will have this label. Custom

pkg/deploy/api/v1/types.go

@@ -197,6 +197,8 @@ const (
 	// annotation value is the name of the deployer Pod which will act upon the ReplicationController
 	// to implement the deployment behavior.
 	DeploymentPodAnnotation = "openshift.io/deployer-pod.name"
+	// DeploymentPodTypeLabel is a label with which contains a type of deployment pod.
+	DeploymentPodTypeLabel = "openshift.io/deployer-pod.type"
 	// DeployerPodForDeploymentLabel is a label which groups pods related to a
 	// deployment. The value is a deployment name. The deployer pod and hook pods
 	// created by the internal strategies will have this label. Custom

pkg/deploy/api/v1beta3/types.go

@@ -197,6 +197,8 @@ const (
 	// annotation value is the name of the deployer Pod which will act upon the ReplicationController
 	// to implement the deployment behavior.
 	DeploymentPodAnnotation = "openshift.io/deployer-pod.name"
+	// DeploymentPodTypeLabel is a label with which contains a type of deployment pod.
+	DeploymentPodTypeLabel = "openshift.io/deployer-pod.type"
 	// DeployerPodForDeploymentLabel is a label which groups pods related to a
 	// deployment. The value is a deployment name. The deployer pod and hook pods
 	// created by the internal strategies will have this label. Custom

pkg/deploy/strategy/support/lifecycle.go

@@ -303,6 +303,7 @@ func makeHookPod(hook *deployapi.LifecycleHook, deployment *kapi.ReplicationCont
 				deployapi.DeploymentAnnotation: deployment.Name,
 			},
 			Labels: map[string]string{
+				deployapi.DeploymentPodTypeLabel:        label,
 				deployapi.DeployerPodForDeploymentLabel: deployment.Name,
 			},
 		},

pkg/deploy/strategy/support/lifecycle_test.go

@@ -202,6 +202,7 @@ func TestHookExecutor_makeHookPod(t *testing.T) {
 				ObjectMeta: kapi.ObjectMeta{
 					Name: namer.GetPodName(deploymentName, "hook"),
 					Labels: map[string]string{
+						deployapi.DeploymentPodTypeLabel:        "hook",
 						deployapi.DeployerPodForDeploymentLabel: deploymentName,
 					},
 					Annotations: map[string]string{
@@ -274,6 +275,7 @@ func TestHookExecutor_makeHookPod(t *testing.T) {
 				ObjectMeta: kapi.ObjectMeta{
 					Name: namer.GetPodName(deploymentName, "hook"),
 					Labels: map[string]string{
+						deployapi.DeploymentPodTypeLabel:        "hook",
 						deployapi.DeployerPodForDeploymentLabel: deploymentName,
 					},
 					Annotations: map[string]string{
@@ -329,6 +331,7 @@ func TestHookExecutor_makeHookPod(t *testing.T) {
 				ObjectMeta: kapi.ObjectMeta{
 					Name: namer.GetPodName(deploymentName, "hook"),
 					Labels: map[string]string{
+						deployapi.DeploymentPodTypeLabel:        "hook",
 						deployapi.DeployerPodForDeploymentLabel: deploymentName,
 						"label1": "value1",
 					},

test/end-to-end/core.sh

@@ -184,6 +184,12 @@ os::cmd::expect_success_and_text "cat '${LOG_DIR}/kubectl-with-token.log'" 'Usin
 os::cmd::expect_success_and_text "cat '${LOG_DIR}/kubectl-with-token.log'" 'kubectl-with-token'
 
 echo "[INFO] Testing deployment logs and failing pre and mid hooks ..."
+# test hook selectors
+os::cmd::expect_success "oc create -f ${OS_ROOT}/test/fixtures/complete-dc-hooks.yaml"
+os::cmd::try_until_text 'oc get pods -l openshift.io/deployer-pod.type=hook-pre  -o jsonpath={.items[*].status.phase}' '^Succeeded$'
+os::cmd::try_until_text 'oc get pods -l openshift.io/deployer-pod.type=hook-mid  -o jsonpath={.items[*].status.phase}' '^Succeeded$'
+os::cmd::try_until_text 'oc get pods -l openshift.io/deployer-pod.type=hook-post -o jsonpath={.items[*].status.phase}' '^Succeeded$'
+exit
 # test the pre hook on a rolling deployment
 oc create -f test/fixtures/failing-dc.yaml
 tryuntil oc get rc/failing-dc-1

test/fixtures/complete-dc-hooks.yaml

@@ -0,0 +1,43 @@
+apiVersion: v1
+kind: DeploymentConfig
+metadata:
+  name: complete-dc-hooks
+spec:
+  replicas: 2
+  selector:
+    name: complete-dc-hooks
+  strategy:
+    type: Recreate
+    recreateParams:
+      timeoutSeconds: 5
+      pre:
+        failurePolicy: Abort
+        execNewPod:
+          containerName: myapp
+          command:
+          - "/bin/true"
+      mid:
+        failurePolicy: Abort
+        execNewPod:
+          containerName: myapp
+          command:
+          - "/bin/true"
+      post:
+        failurePolicy: Abort
+        execNewPod:
+          containerName: myapp
+          command:
+          - "/bin/true"
+  template:
+    metadata:
+      labels:
+        name: complete-dc-hooks
+    spec:
+      containers:
+      - image: "docker.io/busybox"
+        name: myapp
+        command:
+        - "/bin/sleep"
+        - "60"
+  triggers:
+  - type: ConfigChange