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

interesting: fix defaulting of dc integration test and conversion for triggers #18

Merged
merged 1 commit into from
Nov 13, 2017

Conversation

mfojtik
Copy link
Collaborator

@mfojtik mfojtik commented Nov 13, 2017

No description provided.

@@ -75,7 +75,9 @@ func setEssentialDefaults(dc *deployapi.DeploymentConfig) *deployapi.DeploymentC
MaxSurge: intstr.FromString("25%"),
}
dc.Spec.Strategy.ActiveDeadlineSeconds = int64ptr(21600)
dc.Spec.Triggers = []deployapi.DeploymentTriggerPolicy{}
dc.Spec.Triggers = []deployapi.DeploymentTriggerPolicy{
{Type: deployapi.DeploymentTriggerOnConfigChange},
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

this reflects the reality... if you send an DC with nil triggers to server it will be defaulted to have config change trigger and send back...

@tnozicka @Kargakis probably interesting for you.

@mfojtik mfojtik force-pushed the rebase_1.8.1-mfojtik-dc-int branch from 6bc1219 to 70b3d34 Compare November 13, 2017 17:19
@mfojtik
Copy link
Collaborator Author

mfojtik commented Nov 13, 2017

@soltysh fixed dc integration

1 similar comment
@mfojtik
Copy link
Collaborator Author

mfojtik commented Nov 13, 2017

@soltysh fixed dc integration

@mfojtik mfojtik merged commit 586b063 into soltysh:rebase_1.8.1 Nov 13, 2017
soltysh pushed a commit that referenced this pull request Feb 12, 2018
Automatic merge from submit-queue.

CLI: add support for deployments in oc status

@smarterclayton this is a long overdue...

current state:
```
$ oc status
In project My Project (myproject) on server https://127.0.0.1:8443

svc/ruby-deploy - 172.30.174.234:8080
  deployment/ruby-deploy deploys istag/ruby-deploy:latest <-
    bc/ruby-deploy source builds https://github.com/openshift/ruby-ex.git on istag/ruby-22-centos7:latest
      build #1 failed 5 hours ago - bbb6701: Merge pull request #18 from durandom/master (Ben Parees <[email protected]>)
    deployment #2 running for 4 hours - 0/1 pods (warning: 53 restarts)
    deployment #1 deployed 5 hours ago
```

TODO:

- [x] Add rollouts similar to deployment configs
- [x] Fix unit tests / Add unit tests
- [x] Deal with HPA
@mfojtik mfojtik deleted the rebase_1.8.1-mfojtik-dc-int branch September 5, 2018 21:23
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.

1 participant