Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deploy: set gracePeriod on deployer creation rather than when deleting #9854

Merged
merged 1 commit into from
Jul 15, 2016
Merged

deploy: set gracePeriod on deployer creation rather than when deleting #9854

merged 1 commit into from
Jul 15, 2016

Conversation

0xmichalis
Copy link
Contributor

@@ -275,6 +275,8 @@ func (c *DeploymentController) makeDeployerPod(deployment *kapi.ReplicationContr
// Assigning to a variable since its address is required
maxDeploymentDurationSeconds := deployapi.MaxDeploymentDurationSeconds

gracePeriod := int64(10)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the deployer have to wait for child pod hooks to finish?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On deletion I wouldn't think so.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So the controllers will delete those hook pods?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the deployment controller is deleting all hooks and the deployer for the deployment it is reconciling:

selector := deployutil.DeployerPodSelector(deployment.Name)

We also test this in unit tests, eg:
func TestHandle_cleanupPodOkTest(t *testing.T) {

@smarterclayton
Copy link
Contributor

LGTM [merge]

@openshift-bot
Copy link
Contributor

[Test]ing while waiting on the merge queue

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 5312b9b

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 5312b9b

@openshift-bot openshift-bot merged commit 53166d2 into openshift:master Jul 15, 2016
@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/6317/)

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/6316/)

@0xmichalis 0xmichalis deleted the set-gps-on-creation branch July 15, 2016 08:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants