From d9639f05c86be497fd426c77c124d7d2b006d4e3 Mon Sep 17 00:00:00 2001 From: Bartosz Bezak Date: Fri, 27 Sep 2024 09:28:35 +0000 Subject: [PATCH] Revert "Pin OpenSearch Dashboards to 2.15" This reverts commit a58a7f88dea997a2a98ce4f5d1894b13d1f0d4d5. Reason for revert: bug fixed upstream https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8097 Change-Id: Ib22a7ffaecc97408dcffe351232abbfdf7122c7c --- .../opensearch-dashboards/Dockerfile.j2 | 15 +-------------- .../apt_preferences_opensearch_dashboards | 3 --- .../notes/bug-2077319-a47a06175a589a1a.yaml | 9 --------- 3 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 docker/opensearch/opensearch-dashboards/apt_preferences_opensearch_dashboards delete mode 100644 releasenotes/notes/bug-2077319-a47a06175a589a1a.yaml diff --git a/docker/opensearch/opensearch-dashboards/Dockerfile.j2 b/docker/opensearch/opensearch-dashboards/Dockerfile.j2 index ee3ffa41b9..a4bbd29f44 100644 --- a/docker/opensearch/opensearch-dashboards/Dockerfile.j2 +++ b/docker/opensearch/opensearch-dashboards/Dockerfile.j2 @@ -10,20 +10,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='opensearch-dashboards', shell='/bin/bash', homedir='/usr/share/opensearch-dashboards') }} {{ macros.enable_extra_repos(['opensearch-dashboards']) }} -# NOTE(mgoddard): Pinning to 2.15 due to https://bugs.launchpad.net/kolla/+bug/2077319 -{% if base_package_type == 'deb' %} -COPY apt_preferences_opensearch_dashboards /etc/apt/preferences.d/opensearch_dashboards -{% endif %} - -{% if base_package_type == 'rpm' %} - {% set opensearch_dashboards_packages = [ - 'opensearch-dashboards-2.15.*' - ] %} -{% elif base_package_type == 'deb' %} - {% set opensearch_dashboards_packages = [ - 'opensearch-dashboards' - ] %} -{% endif %} +{% set opensearch_dashboards_packages = ['opensearch-dashboards'] %} {{ macros.install_packages(opensearch_dashboards_packages | customizable("packages")) }} diff --git a/docker/opensearch/opensearch-dashboards/apt_preferences_opensearch_dashboards b/docker/opensearch/opensearch-dashboards/apt_preferences_opensearch_dashboards deleted file mode 100644 index 78bcda585b..0000000000 --- a/docker/opensearch/opensearch-dashboards/apt_preferences_opensearch_dashboards +++ /dev/null @@ -1,3 +0,0 @@ -Package: opensearch-dashboards -Pin: version 2.15.* -Pin-Priority: 1000 diff --git a/releasenotes/notes/bug-2077319-a47a06175a589a1a.yaml b/releasenotes/notes/bug-2077319-a47a06175a589a1a.yaml deleted file mode 100644 index 7a259609f6..0000000000 --- a/releasenotes/notes/bug-2077319-a47a06175a589a1a.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -fixes: - - | - Fixes an `issue - `__ - in the OpenSearch Dashboards image where the discover page would hang after - initial deployment when there is no index pattern. This has been resolved - by reverting OpenSearch Dashboards to version 2.15. - `LP#2077319 `__