diff --git a/hack/test-cmd.sh b/hack/test-cmd.sh index 9502b59ba52..e94c3de506f 100755 --- a/hack/test-cmd.sh +++ b/hack/test-cmd.sh @@ -678,7 +678,7 @@ runTests() { kube::test::get_object_assert deployment "{{range.items}}{{$id_field}}:{{end}}" 'nginx:' # Clean up kubectl delete deployment nginx "${kube_flags[@]}" - kubectl delete rc -l deployment.kubernetes.io/podTemplateHash "${kube_flags[@]}" + kubectl delete rc -l pod-template-hash "${kube_flags[@]}" ############## # Namespaces # @@ -1102,7 +1102,7 @@ __EOF__ # Clean up kubectl delete hpa nginx-deployment "${kube_flags[@]}" kubectl delete deployment nginx-deployment "${kube_flags[@]}" - kubectl delete rc -l deployment.kubernetes.io/podTemplateHash "${kube_flags[@]}" + kubectl delete rc -l pod-template-hash "${kube_flags[@]}" ### Rollback a deployment # Pre-condition: no deployment exists @@ -1131,7 +1131,7 @@ __EOF__ kube::test::get_object_assert deployment "{{range.items}}{{$deployment_image_field}}:{{end}}" 'nginx:latest:' # Clean up kubectl delete deployment nginx-deployment "${kube_flags[@]}" - kubectl delete rc -l deployment.kubernetes.io/podTemplateHash "${kube_flags[@]}" + kubectl delete rc -l pod-template-hash "${kube_flags[@]}" ###################### # ConfigMap # diff --git a/pkg/controller/deployment/deployment_controller.go b/pkg/controller/deployment/deployment_controller.go index 7cb3dc90f6f..508d6f58de4 100644 --- a/pkg/controller/deployment/deployment_controller.go +++ b/pkg/controller/deployment/deployment_controller.go @@ -695,7 +695,7 @@ func (dc *DeploymentController) getNewRC(deployment extensions.Deployment, maxOl namespace := deployment.ObjectMeta.Namespace podTemplateSpecHash := podutil.GetPodTemplateSpecHash(deployment.Spec.Template) newRCTemplate := deploymentutil.GetNewRCTemplate(deployment) - // Add podTemplateHash label to selector. + // Add pod-template-hash label to selector. newRCSelector := labelsutil.CloneAndAddLabel(deployment.Spec.Selector, extensions.DefaultDeploymentUniqueLabelKey, podTemplateSpecHash) // Set RC expectations (1 rc should be created)