-
Notifications
You must be signed in to change notification settings - Fork 31
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
proposal for multiple configmaps #112 #113
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the contribution! Overall, this looks pretty good.
There should be some docs about this feature in https://github.com/fiaas/fiaas-deploy-daemon/blob/master/docs/v3_spec.md
I would also like to see some tests verifying the behaviour with 0, 1 and multiple configmaps defined for an app
Finally a small nit: I would like to see all occurences of config_maps
renamed into configmaps
, as that is how it is usually written when all lowercase
The integration tests seem flaky on my machine if anyone could try to run them and give me feedback I would appreciate it! |
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I like the idea, and it mostly looks good with just a couple of things I think should be clarified.
I also think Morten's comment from the issue, about also exposing them via volume-mounts makes sense - is there a reason not to do that?
Co-authored-by: Greg Jones <[email protected]>
I was not aware of the volume-mounts, but yeah i should add those aswell! |
…as-deploy-daemon into proposal-multiple-config-maps
@mortenlj pushed some changes now, what do you think? |
Starting to look good. The only thing I'd like to change is expanding the documentation with detailing of how precedence works for the added configmaps as we have discussed. |
@skogie : Any chance you could sort out the documentation and maybe this can be merged? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
+1 on the docs, and an extra thing I think should be included. We should also make sure CI runs, right?
I will try to get the remaining changes out tomorrow. Missing some tests and documentation. |
What's the state of this PR, any movement? |
@mortenlj I have been working on getting the tests to work locally but rn i have a round-trip of around 20 minutes per integration_test-run and its still not passing here, I think everything should be correct but could you try to run it on your end? |
@skogie : The last run seems to fail because of codestyle issues. Should be enough to fix those. To just run the codestyle tests, use |
@mortenlj I also have failing tests with |
tests seems to be running but the |
@mortenlj is it possible for you to run it locally to see if they actually pass, or if there is anything else i need to fix? I don't think they are working correctly on my machine |
Fixed most of the tests now, but I still don't understand why these 2 are failing if someone could help me out: https://gist.github.com/skogie/4a786ff9ceec17a26466a3221819dbab and https://gist.github.com/skogie/0b480f01f46fd438e033134ef7a86de5 |
It is on my list, but haven't been able to look into it further yet unfortunately. The only "workaround" I'm aware of to get the e2e tests to run before that issue is fixed, is to push the branch from the fork to a new branch on the source repository, which admittedly isn't a great solution |
Would be nice to try to run it on the CI-server now if possible. |
/sem-approve |
I triggered a build directly in Semaphore after changing some settings which I hope doesn't expose our docker secrets to all PRs... 🙂 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks very nice now 👍
I noticed the copyright years in the new files aren't updated though, sorry to be picky. I've added the suggested changes with this review.
tests/fiaas_deploy_daemon/e2e_expected/v3-multiple-configmap-deployment.yml
Outdated
Show resolved
Hide resolved
tests/fiaas_deploy_daemon/e2e_expected/v3-no-extra-configmap-deployment.yml
Outdated
Show resolved
Hide resolved
tests/fiaas_deploy_daemon/e2e_expected/v3-single-extra-configmap-deployment.yml
Outdated
Show resolved
Hide resolved
tests/fiaas_deploy_daemon/specs/v3/data/examples/multiple_config_maps.yml
Outdated
Show resolved
Hide resolved
tests/fiaas_deploy_daemon/specs/v3/data/examples/single_extra_config_map.yml
Outdated
Show resolved
Hide resolved
Co-authored-by: Greg Jones <[email protected]>
Co-authored-by: Greg Jones <[email protected]>
Co-authored-by: Greg Jones <[email protected]>
Co-authored-by: Greg Jones <[email protected]>
Co-authored-by: Greg Jones <[email protected]>
@gregjones : This looks good now, doesn't it? We still haven't figured out how to get Semaphore to build from forks automatically I guess, but I'll see if I can trigger something... |
/sem-approve |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
@mortenlj looks like the build is failing now because some of the tasks are not running, can we try to trigger a new build and see if we can merge it? |
/sem-approve |
…oposal-multiple-config-maps
…oposal-multiple-config-maps
/sem-approve |
I have a feeling this PR can be closed ... ? |
WIP for issue #112
860 tests passed with
tox -e test
Wasnt able to run the integration-test module it kept crashing so if there is more to be done here let me know.