Skip to content

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

Merged
mishaschwartz merged 4 commits intomasterfrom
move-canarie-api-template-in-cowbird
Jul 4, 2023
Merged

Move canarie-api configuration for cowbird from proxy to canarie-api config directory#338
mishaschwartz merged 4 commits intomasterfrom
move-canarie-api-template-in-cowbird

Conversation

@mishaschwartz
Copy link
Collaborator

@mishaschwartz mishaschwartz commented Jun 2, 2023

Overview

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.

Changes

Non-breaking changes
None

Breaking changes
None

Related Issue / Discussion

Additional Information

Links to other issues or sources.

@github-actions github-actions bot added component/cowbird Related to https://github.com/Ouranosinc/cowbird documentation Improvements or additions to documentation labels Jun 2, 2023
@crim-jenkins-bot
Copy link
Collaborator

crim-jenkins-bot commented Jun 2, 2023

E2E Test Results

DACCS-iac Pipeline Results

Build URL : http://daccs-jenkins.crim.ca:80/job/DACCS-iac-birdhouse/1605/
Result : failure

BIRDHOUSE_DEPLOY_BRANCH : move-canarie-api-template-in-cowbird
DACCS_CONFIGS_BRANCH : master
PAVICS_E2E_WORKFLOW_TESTS_BRANCH : master
PAVICS_SDI_BRANCH : master

DESTROY_INFRA_ON_EXIT : true
PAVICS_HOST : https://

Infrastructure deployment failed. Instance has not been destroyed. @matprov

@mishaschwartz mishaschwartz requested review from fmigneault and tlvu June 2, 2023 17:34
fmigneault
fmigneault reviewed Jun 3, 2023
View reviewed changes
Copy link
Member

@fmigneault fmigneault left a comment

Choose a reason for hiding this comment

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

The PR is ok, but I suggest we wait until Ouranosinc/CanarieAPI#18 is completed and tagged 1.0.0 to make the version change of the Docker image at the same time.

CHANGES.md
Comment on lines +22 to +24
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.
Copy link
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
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
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.

@crim-jenkins-bot
Copy link
Collaborator

crim-jenkins-bot commented Jun 13, 2023

E2E Test Results

DACCS-iac Pipeline Results

Build URL : http://daccs-jenkins.crim.ca:80/job/DACCS-iac-birdhouse/1633/
Result : failure

BIRDHOUSE_DEPLOY_BRANCH : move-canarie-api-template-in-cowbird
DACCS_CONFIGS_BRANCH : master
PAVICS_E2E_WORKFLOW_TESTS_BRANCH : master
PAVICS_SDI_BRANCH : master

DESTROY_INFRA_ON_EXIT : true
PAVICS_HOST : https://host-140-88.rdext.crim.ca

Infrastructure deployment failed. Instance has not been destroyed. @matprov

@crim-jenkins-bot
Copy link
Collaborator

crim-jenkins-bot commented Jun 13, 2023

E2E Test Results

DACCS-iac Pipeline Results

Build URL : http://daccs-jenkins.crim.ca:80/job/DACCS-iac-birdhouse/1632/
Result : failure

BIRDHOUSE_DEPLOY_BRANCH : move-canarie-api-template-in-cowbird
DACCS_CONFIGS_BRANCH : master
PAVICS_E2E_WORKFLOW_TESTS_BRANCH : master
PAVICS_SDI_BRANCH : master

DESTROY_INFRA_ON_EXIT : true
PAVICS_HOST : https://host-140-88.rdext.crim.ca

Infrastructure deployment failed. Instance has not been destroyed. @matprov

@matprov
Copy link
Collaborator

matprov commented Jun 13, 2023

run tests

@crim-jenkins-bot
Copy link
Collaborator

crim-jenkins-bot commented Jun 13, 2023

E2E Test Results

DACCS-iac Pipeline Results

Build URL : http://daccs-jenkins.crim.ca:80/job/DACCS-iac-birdhouse/1638/
Result : failure

BIRDHOUSE_DEPLOY_BRANCH : move-canarie-api-template-in-cowbird
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

PAVICS-e2e-workflow-tests Pipeline Results

Tests URL : http://daccs-jenkins.crim.ca:80/job/PAVICS-e2e-workflow-tests/job/master/1179/

NOTEBOOK TEST RESULTS 
    
[2023-06-13T21:37:17.315Z] ============================= test session starts ==============================
[2023-06-13T21:37:17.315Z] platform linux -- Python 3.9.16, pytest-7.3.1, pluggy-1.0.0
[2023-06-13T21:37:17.315Z] rootdir: /home/jenkins/agent/workspace/PAVICS-e2e-workflow-tests_master
[2023-06-13T21:37:17.315Z] plugins: anyio-3.6.1, dash-2.10.0, nbval-0.9.6, tornasync-0.6.0.post2, xdist-3.3.1
[2023-06-13T21:37:17.315Z] collected 245 items
[2023-06-13T21:37:17.315Z] 
[2023-06-13T21:37:25.576Z] notebooks-auth/test_thredds.ipynb ...........                            [  4%]
[2023-06-13T21:37:32.827Z] pavics-sdi-master/docs/source/notebooks/WCS_example.ipynb .......        [  7%]
[2023-06-13T21:37:42.560Z] pavics-sdi-master/docs/source/notebooks/WFS_example.ipynb ......         [  9%]
[2023-06-13T21:37:51.770Z] pavics-sdi-master/docs/source/notebooks/WMS_example.ipynb ........       [ 13%]
[2023-06-13T21:37:54.637Z] pavics-sdi-master/docs/source/notebooks/WPS_example.ipynb ..........     [ 17%]
[2023-06-13T21:45:23.687Z] pavics-sdi-master/docs/source/notebooks/climex.ipynb ............        [ 22%]
[2023-06-13T21:45:25.068Z] pavics-sdi-master/docs/source/notebooks/eccc-geoapi-climate-stations.ipynb . [ 22%]
[2023-06-13T21:45:32.737Z] ...............                                                          [ 28%]
[2023-06-13T21:45:42.143Z] pavics-sdi-master/docs/source/notebooks/eccc-geoapi-xclim.ipynb .....    [ 30%]
[2023-06-13T21:45:49.430Z] pavics-sdi-master/docs/source/notebooks/esgf-dap.ipynb .....F            [ 33%]
[2023-06-13T21:46:05.886Z] pavics-sdi-master/docs/source/notebooks/forecasts.ipynb ......           [ 35%]
[2023-06-13T21:46:07.275Z] pavics-sdi-master/docs/source/notebooks/jupyter_extensions.ipynb .       [ 35%]
[2023-06-13T21:46:12.016Z] pavics-sdi-master/docs/source/notebooks/opendap.ipynb .......            [ 38%]
[2023-06-13T21:46:16.978Z] pavics-sdi-master/docs/source/notebooks/pavics_thredds.ipynb .....       [ 40%]
[2023-06-13T21:49:13.939Z] pavics-sdi-master/docs/source/notebooks/regridding.ipynb ............... [ 46%]
[2023-06-13T21:50:23.380Z] .............                                                            [ 52%]
[2023-06-13T21:50:26.665Z] pavics-sdi-master/docs/source/notebooks/rendering.ipynb ....             [ 53%]
[2023-06-13T21:50:29.005Z] pavics-sdi-master/docs/source/notebooks/subset-user-input.ipynb ........ [ 57%]
[2023-06-13T21:50:45.802Z] .................                                                        [ 64%]
[2023-06-13T21:50:51.618Z] pavics-sdi-master/docs/source/notebooks/subsetting.ipynb .....           [ 66%]
[2023-06-13T21:50:53.010Z] pavics-sdi-master/docs/source/notebook-components/weaver_example.ipynb . [ 66%]
[2023-06-13T21:51:08.350Z] .FF......                                                                [ 70%]
[2023-06-13T21:51:17.850Z] finch-master/docs/source/notebooks/dap_subset.ipynb ...........          [ 74%]
[2023-06-13T21:51:27.350Z] finch-master/docs/source/notebooks/finch-usage.ipynb ......              [ 77%]
[2023-06-13T21:51:28.732Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-1DataAccess.ipynb . [ 77%]
[2023-06-13T21:51:31.804Z] ......                                                                   [ 80%]
[2023-06-13T21:51:39.944Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-2Subsetting.ipynb . [ 80%]
[2023-06-13T21:51:54.157Z] .............                                                            [ 85%]
[2023-06-13T21:52:06.380Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-3Climate-Indicators.ipynb . [ 86%]
[2023-06-13T21:52:46.061Z] ....s.                                                                   [ 88%]
[2023-06-13T21:52:54.200Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-4Ensembles.ipynb . [ 88%]
[2023-06-13T21:53:08.964Z] ...                                                                      [ 90%]
[2023-06-13T21:53:21.195Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-5Visualization.ipynb . [ 90%]
[2023-06-13T21:53:43.232Z] ......                                                                   [ 93%]
[2023-06-13T21:53:45.653Z] notebooks/hummingbird.ipynb ............                                 [ 97%]
[2023-06-13T21:56:49.810Z] notebooks/stress-tests.ipynb .....                                       [100%]
[2023-06-13T21:56:49.810Z] 
[2023-06-13T21:56:49.810Z] =================================== FAILURES ===================================

@mishaschwartz
Copy link
Collaborator Author

mishaschwartz commented Jun 23, 2023

@tlvu can I merge this one?

@github-actions github-actions bot added the ci/operations Continuous Integration components label Jul 4, 2023
@mishaschwartz mishaschwartz merged commit bbf8670 into master Jul 4, 2023
@mishaschwartz mishaschwartz deleted the move-canarie-api-template-in-cowbird branch July 4, 2023 12:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@fmigneault fmigneault fmigneault left review comments

@tlvu tlvu tlvu approved these changes

Assignees

No one assigned

Labels

ci/operations Continuous Integration components component/cowbird Related to https://github.com/Ouranosinc/cowbird documentation Improvements or additions to documentation

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@mishaschwartz @crim-jenkins-bot @matprov @tlvu @fmigneault