-
Notifications
You must be signed in to change notification settings - Fork 6
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
Deprecated unused/unmaintained components #311
Conversation
Can one of the admins verify this patch? |
E2E Test ResultsDACCS-iac Pipeline ResultsBuild URL : http://daccs-jenkins.crim.ca:80/job/DACCS-iac-birdhouse/1427/Result : failure BIRDHOUSE_DEPLOY_BRANCH : deprecate-components DACCS_CONFIGS_BRANCH : master PAVICS_E2E_WORKFLOW_TESTS_BRANCH : master PAVICS_SDI_BRANCH : master DESTROY_INFRA_ON_EXIT : true PAVICS_HOST : https://host-140-118.rdext.crim.ca Infrastructure deployment failed. Instance has not been destroyed. @matprov |
I'm going to turn this into one part of a larger PR that moves around all current components |
no longer part of a larger PR. reopening... |
E2E Test ResultsDACCS-iac Pipeline ResultsBuild URL : http://daccs-jenkins.crim.ca:80/job/DACCS-iac-birdhouse/1558/Result : failure BIRDHOUSE_DEPLOY_BRANCH : deprecate-components DACCS_CONFIGS_BRANCH : master PAVICS_E2E_WORKFLOW_TESTS_BRANCH : master PAVICS_SDI_BRANCH : master DESTROY_INFRA_ON_EXIT : true PAVICS_HOST : https://host-140-118.rdext.crim.ca Infrastructure deployment failed. Instance has not been destroyed. @matprov |
E2E Test ResultsDACCS-iac Pipeline ResultsBuild URL : http://daccs-jenkins.crim.ca:80/job/DACCS-iac-birdhouse/1559/Result : failure BIRDHOUSE_DEPLOY_BRANCH : deprecate-components DACCS_CONFIGS_BRANCH : master PAVICS_E2E_WORKFLOW_TESTS_BRANCH : master PAVICS_SDI_BRANCH : master DESTROY_INFRA_ON_EXIT : true PAVICS_HOST : https://host-140-92.rdext.crim.ca Infrastructure deployment failed. Instance has not been destroyed. @matprov |
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.
LGTM. I have not tried to deploy this but looks like this is just a big rename, then change any ./config/
path to ./deprecated-components/
.
I am a bit surprised you added a few new files or it's git that displayed the renamed files wrong?
Since you have a test server now, have you tried to autodeploy from master
branch to this branch then trigger an autodeploy again? This is basically the way to test autodeploy is still working. I can show you how to simulate/trigger autodeploy if you want.
It's weird the pipeline failed.
@@ -1,2 +1,10 @@ | |||
# Old paths. Keep these so that old config files remain uncommittable after updates. | |||
postgres-magpie/ | |||
catalog/ |
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 remembering this to not break autodeploy !
@@ -14,7 +14,7 @@ services: | |||
ports: | |||
- "8086:80" | |||
volumes: | |||
- ./config/catalog/catalog.cfg:/home/catalog.cfg | |||
- ./deprecated-components/catalog/catalog.cfg:/home/catalog.cfg |
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.
Nice ! These deprecated should still work !
# Only crawl the subset enough to pass canarie-api monitoring | ||
# see config/canarie-api/docker_configuration.py.template | ||
$THIS_DIR/trigger-pavicscrawler target_files=birdhouse/testdata/flyingpigeon/cmip5 | ||
if [ -n "$(docker ps --filter name=solr)" ]; then |
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.
Oh nice, this also still run !
E2E Test ResultsDACCS-iac Pipeline ResultsBuild URL : http://daccs-jenkins.crim.ca:80/job/DACCS-iac-birdhouse/1563/Result : failure BIRDHOUSE_DEPLOY_BRANCH : deprecate-components DACCS_CONFIGS_BRANCH : master PAVICS_E2E_WORKFLOW_TESTS_BRANCH : master PAVICS_SDI_BRANCH : master DESTROY_INFRA_ON_EXIT : true PAVICS_HOST : https://host-140-133.rdext.crim.ca Infrastructure deployment failed. Instance has not been destroyed. @matprov |
E2E Test ResultsDACCS-iac Pipeline ResultsBuild URL : http://daccs-jenkins.crim.ca:80/job/DACCS-iac-birdhouse/1564/Result : failure BIRDHOUSE_DEPLOY_BRANCH : deprecate-components DACCS_CONFIGS_BRANCH : master PAVICS_E2E_WORKFLOW_TESTS_BRANCH : master PAVICS_SDI_BRANCH : master DESTROY_INFRA_ON_EXIT : true PAVICS_HOST : https://host-140-46.rdext.crim.ca Infrastructure deployment failed. Instance has not been destroyed. @matprov |
There are some changes to paths inside the files (e.g.
Yes please, if you can point me to instructions that would be very helpful. Thanks
I agree, it deploys fine on my test instance |
E2E Test ResultsDACCS-iac Pipeline ResultsBuild URL : http://daccs-jenkins.crim.ca:80/job/DACCS-iac-birdhouse/1575/Result : failure BIRDHOUSE_DEPLOY_BRANCH : deprecate-components DACCS_CONFIGS_BRANCH : master PAVICS_E2E_WORKFLOW_TESTS_BRANCH : master PAVICS_SDI_BRANCH : master DESTROY_INFRA_ON_EXIT : true PAVICS_HOST : https://host-140-69.rdext.crim.ca Infrastructure deployment failed. Instance has not been destroyed. @matprov |
E2E Test ResultsDACCS-iac Pipeline ResultsBuild URL : http://daccs-jenkins.crim.ca:80/job/DACCS-iac-birdhouse/1576/Result : failure BIRDHOUSE_DEPLOY_BRANCH : deprecate-components DACCS_CONFIGS_BRANCH : master PAVICS_E2E_WORKFLOW_TESTS_BRANCH : master PAVICS_SDI_BRANCH : master DESTROY_INFRA_ON_EXIT : true PAVICS_HOST : https://host-140-20.rdext.crim.ca Infrastructure deployment failed. Instance has not been destroyed. @matprov |
E2E Test ResultsDACCS-iac Pipeline ResultsBuild URL : http://daccs-jenkins.crim.ca:80/job/DACCS-iac-birdhouse/1577/Result : failure BIRDHOUSE_DEPLOY_BRANCH : deprecate-components DACCS_CONFIGS_BRANCH : master PAVICS_E2E_WORKFLOW_TESTS_BRANCH : master PAVICS_SDI_BRANCH : master DESTROY_INFRA_ON_EXIT : true PAVICS_HOST : https://host-140-101.rdext.crim.ca PAVICS-e2e-workflow-tests Pipeline ResultsTests URL : http://daccs-jenkins.crim.ca:80/job/PAVICS-e2e-workflow-tests/job/master/1136/NOTEBOOK TEST RESULTS |
This PR (bird-house/birdhouse-deploy#311) deprecates the catalog and malleefowl components. These components should therefore be removed from all tests scripts since they are no longer actively maintained.
@mishaschwartz I've documented Autodeploy testing instuctions: https://github.com/bird-house/birdhouse-deploy/blob/document-autodeploy-testing-procedure/birdhouse/components/README.rst#how-to-test-platform-autodeploy-is-not-broken-by-a-pr Let me know if unclear or you can even push directly instruction updates there. |
@fmigneault no worries! I hope you had a good vacation! |
Missing |
Document in CHANGES.md
|
It's not missing here. It's only relevant in #331. My guess is that you were switching between that branch and this one |
Oh right ! I was testing between branches on the same VM. |
If I understand correctly, what's left in this PR is to ensure all the deprecated components still work after the move to folder I think it's a useful thing since this will provide a working baseline if ever we need to re-surrect those deprecated components and now is the best time to do it since we know they are working currently. If quick to do this let's try do it and merge this PR? If more complicated, how about fixing all the deprecated components in another PR and merge this one? By the way, this PR deserve a minor bump and not patch bump once merged. |
By the way, we do not want to remove |
It wasn't on the list of components to remove with this PR. If you think it should be removed then let's make an issue for it and remove it in a different PR.
I'm happy with that, but again, let's do it in a different PR |
I've tested this locally and run my own checks. If you want to run some of your own tests as well please go ahead and let me know if you find anything else that needs changing. |
...omponents/canarie-api-full-monitoring/config/thredds/canarie_api_full_monitoring.py.template
Outdated
Show resolved
Hide resolved
...components/canarie-api-full-monitoring/config/weaver/canarie_api_full_monitoring.py.template
Outdated
Show resolved
Hide resolved
...omponents/canarie-api-full-monitoring/config/cowbird/canarie_api_full_monitoring.py.template
Outdated
Show resolved
Hide resolved
birdhouse/optional-components/wps-healthchecks/config/catalog/docker-compose-extra.yml
Outdated
Show resolved
Hide resolved
birdhouse/optional-components/wps-healthchecks/config/malleefowl/docker-compose-extra.yml
Outdated
Show resolved
Hide resolved
@mishaschwartz you forgot to push the tag :D Congrats for finally merging this one. |
## Overview Docker compose no longer exposes any container ports outside the default network except for ports 80 and 443 from the proxy container. This ensures that ports that are not intended for external access are not exposed to the wider internet even if firewall rules are not set correctly. Note that if the `monitoring` component is used then port 9100 will be exposed from the `node-exporter` container. This is because this container must be run on the host machine's network and unfortunately there is no known workaround that would not require this port to be exposed on the host machine. ## Changes **Non-breaking changes** - Changes all internal URL references to components **Breaking changes** - removes the lb_flyingpigeon endpoint because it requires direct access to an exposed port ## Related Issue / Discussion - Resolves #222 ## Additional Information Links to other issues or sources. - This does not make any changes to the components that are deprecated in #311
- Delete unused Dockerfiles, fixes #349 and fixes #352 * birdhouse/docker/geoserver: not used since 3-4 years, replaced by https://github.com/kartoza/docker-geoserver * birdhouse/config/geoserver/Dockerfile: was introduced in commit f3b9896 (PR #233, merge commit d1ecc63) as a temporary solution only, not needed with newer kartoza docker images. - Move birdhouse/docker/solr to birdhouse/deprecated-components/solr/docker to group related files together. Solr has been deprecated since PR #311 (merge commit a8d3612).
Overview
Move unused and unmaintained components to a separate
deprecated-components/
subdirectory and removethem from the DEFAULT_CONF_DIRS list if required.
Changes
Non-breaking changes
Breaking changes
Related Issue / Discussion
Additional Information