Skip to content

Move canarie-api configuration for cowbird from proxy to canarie-api config directory #338

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.

Sign up for GitHub

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

Merged
mishaschwartz merged 4 commits into from
Jul 4, 2023
Merged

Move canarie-api configuration for cowbird from proxy to canarie-api config directory #338

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ebd9091
Move canarie-api configuration for cowbird from proxy to canarie-api …
mishaschwartz Jun 2, 2023
0a26cd6
Merge branch 'master' into move-canarie-api-template-in-cowbird
mishaschwartz Jun 13, 2023
731dc6f
Merge branch 'master' into move-canarie-api-template-in-cowbird
mishaschwartz Jul 4, 2023
cdf786a
Bump version: 1.26.9 → 1.26.10
mishaschwartz Jul 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,13 @@
[Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest)
------------------------------------------------------------------------------------------------------------------

[//]: # (list changes here, using '-' for each new entry, remove this when items are added)
## Changes

- Move canarie-api configuration for cowbird from proxy to canarie-api config directory
- The canarie-api configuration for cowbird was being loaded whenever the proxy component was enabled instead
of when the canarie-api component was enabled. Since these components can now be enabled separately, the
configuration has to be moved to ensure that canarie-api configuration files aren't unintentionally mounted
to a container that is just running an nginx proxy.
Comment on lines +27 to +29
Copy link
Copy Markdown
Member

@fmigneault fmigneault Jun 3, 2023

Choose a reason for hiding this comment

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

Add a reference to Ouranosinc/CanarieAPI#18 + mention of requirement CanarieAPI>=1.0.0 to accomplish this.

Copy link
Copy Markdown
Collaborator Author

@mishaschwartz mishaschwartz Jun 5, 2023

Choose a reason for hiding this comment

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

Ok if you want. But this PR has nothing to do with that change. It moves a file that I should have moved in #296 and has been raising warning messages ever since nginx can be run without canarie-api in #310.

My vote would be to merge this now since it is entirely independent of Ouranosinc/CanarieAPI#18

Copy link
Copy Markdown
Member

@fmigneault fmigneault Jun 5, 2023

Choose a reason for hiding this comment

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

Oh. By "Since these components can now be enabled separately", it thought you were refering to the nginx proxy and canarie-api being enabled separately. If you were refering to the service components of birdhouse-deploy, then you can ignore this comment.


[1.26.4](https://github.com/bird-house/birdhouse-deploy/tree/1.26.4) (2023-06-06)
------------------------------------------------------------------------------------------------------------------
Expand Down
0 .../proxy/canarie_api_monitoring.py.template → ...ie-api/canarie_api_monitoring.py.template
View file
Open in desktop
File renamed without changes.
12 changes: 12 additions & 0 deletions birdhouse/components/cowbird/config/canarie-api/docker-compose-extra.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
version: "3.4"

services:
proxy:
volumes:
# NOTE:
# Prefix '0_' to the mounted file name to ensure it is loaded first by 'birdhouse/config/canarie-api/docker_configuration.py'
# This ensures that the alphabetical loading order it defines will first load the default configs, then will load
# the Cowbird config, and then all python configuration within 'optional-components/canarie-api-full-monitoring'.
# It is important to load Cowbird before, as the full monitoring need to know if 'Cowbird' service is added to the
# stack in order to apply the corresponding public endpoint conditionally.
- ./components/cowbird/config/proxy/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/0_cowbird_config.py:ro
7 changes: 0 additions & 7 deletions birdhouse/components/cowbird/config/proxy/docker-compose-extra.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,5 @@ services:
proxy:
volumes:
- ./components/cowbird/config/proxy/conf.extra-service.d:/etc/nginx/conf.extra-service.d/cowbird:ro
# NOTE:
# Prefix '0_' to the mounted file name to ensure it is loaded first by 'birdhouse/config/canarie-api/docker_configuration.py'
# This ensures that the alphabetical loading order it defines will first load the default configs, then will load
# the Cowbird config, and then all python configuration within 'optional-components/canarie-api-full-monitoring'.
# It is important to load Cowbird before, as the full monitoring need to know if 'Cowbird' service is added to the
# stack in order to apply the corresponding public endpoint conditionally.
- ./components/cowbird/config/proxy/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/0_cowbird_config.py:ro
links:
- cowbird