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.

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

Mapr deprecation #441

Merged
merged 14 commits into from
Dec 9, 2024
Merged

Mapr deprecation #441

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9fd0774
Move mapr AFTER idr-gallery in web apps list
will-moore Nov 15, 2024
05fd7dc
Remove mapr ngninx cache
will-moore Nov 15, 2024
775ff70
mapr/api requests return 410 'Gone' response
will-moore Nov 15, 2024
d282d66
410 response regex handles all /mapr/api/ except /mapr/api/config
will-moore Nov 18, 2024
0aba460
Redirect /mapr/api/ to /searchengine/apidocs/
will-moore Nov 18, 2024
439a9b9
Bump ome.iptables_raw to 0.4.1
will-moore Nov 19, 2024
8a5d41c
Merge remote-tracking branch 'origin/master' into mapr_deprecation
will-moore Nov 20, 2024
cba9797
Move searchengine redirect under nginx_proxy_direct_locations
will-moore Nov 21, 2024
ccd0bee
Bump idr-gallery 3.12.0
will-moore Nov 25, 2024
bb4a67f
Bump iviewer 0.15.0
will-moore Nov 26, 2024
630ab9b
Bump idr-gallery 3.12.1
will-moore Nov 26, 2024
cd682d1
Bump omero-mapr 0.5.3
will-moore Nov 27, 2024
9fcdb02
Remove omeromapr from _nginx_proxy_backends_omero in proxy-hosts.yml
will-moore Dec 4, 2024
28e51d4
Bump OMERO.figure 7.1.0
will-moore Dec 9, 2024
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: 4 additions & 4 deletions ansible/group_vars/omero-hosts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,15 +240,15 @@ omero_web_config_set:
# Plugins and additional web configuration

omero_web_apps_packages:
- omero-mapr==0.5.2
- omero-iviewer==0.14.0
- idr-gallery==3.11.0
- omero-mapr==0.5.3
- omero-iviewer==0.15.0
- idr-gallery==3.12.1
- omero-figure==6.2.0
Copy link
Member

Choose a reason for hiding this comment

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

Figure is not used but some libraries bumped happened since and it could potential lead to some dependencies issues down the line

Copy link
Member

Choose a reason for hiding this comment

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

I can see one of three options:

  • do nothing and capture as an issue
  • bump OMERO.figure - if so to which version?
  • remove OMERO.figure
    Which one would you recommend?

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm happy to bump OMERO.figure to latest 7.1.0...

Copy link
Member Author

Choose a reason for hiding this comment

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

@sbesson Could you re-run the deployment just to check that Figure bump doesn't cause any unexpected issues, thx

Copy link
Member

Choose a reason for hiding this comment

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

Deployed on test125

Copy link
Member

Choose a reason for hiding this comment

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

@jburel as discussed at the weekly IDR meeting, leaving you to have a final look at the changes pushed by @will-moore . Once approved, I'll work on updating prod125

omero_web_apps_names:
- omero_mapr
- omero_iviewer
- idr_gallery
- omero_figure
- omero_mapr

omero_web_apps_top_links:
- label: Studies
Expand Down
10 changes: 3 additions & 7 deletions ansible/group_vars/proxy-hosts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ nginx_proxy_cache_match_uri:
- '"~web(client|gateway)/get_thumbnail*"'
- '"~(webclient/)?api/*"'
- '"~static/*"'
- '"~mapr/*"'
# - '"~mapr/*"'
- '"~gallery-api/*"'
- '"~webclient/img_detail/*"'
- '"~iviewer/*"'
Expand Down Expand Up @@ -192,12 +192,6 @@ nginx_proxy_caches:
inactive: 180d
match:
- '"~(webclient/)?api/*"'
- name: omeromapr
maxsize: 5g
keysize: 100m
inactive: 180d
match:
- '"~mapr/*"'
- name: omeroviewers # Metadata for viewers and related UI
maxsize: 1g
keysize: 1m
Expand Down Expand Up @@ -277,6 +271,8 @@ nginx_proxy_direct_locations:
alias: /srv/www/letsencrypt/challenge
- location: "= /submitter-survey"
redirect302: https://forms.gle/beR4vqLrgLgRzgSX9
- location: "~ ^/mapr/api/(?!config).*($|/)"
redirect302: /searchengine/apidocs/


# CORS: basically allow any cross-site since this is public read-only
Expand Down
Loading