From a346017292cac8d17bdee546276b6a1313bf8bcd Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Mon, 28 Oct 2024 15:21:33 -0400 Subject: [PATCH] Tweak 2.18/2.19 manifest and move old ones to legacy (#5149) Signed-off-by: Peter Zhu --- .github/workflows/os-increment-plugin-versions.yml | 2 -- .github/workflows/osd-increment-plugin-versions.yml | 2 -- .../1.3.17/opensearch-1.3.17-test.yml | 0 {manifests => legacy-manifests}/1.3.17/opensearch-1.3.17.yml | 0 .../1.3.17/opensearch-dashboards-1.3.17-test.yml | 0 .../1.3.17/opensearch-dashboards-1.3.17.yml | 0 .../2.15.0/opensearch-2.15.0-test.yml | 0 {manifests => legacy-manifests}/2.15.0/opensearch-2.15.0.yml | 0 .../2.15.0/opensearch-dashboards-2.15.0-test.yml | 0 .../2.15.0/opensearch-dashboards-2.15.0.yml | 0 {manifests => legacy-manifests}/2.15.1/opensearch-2.15.1.yml | 0 .../2.16.0/opensearch-2.16.0-test.yml | 0 {manifests => legacy-manifests}/2.16.0/opensearch-2.16.0.yml | 0 .../2.16.0/opensearch-dashboards-2.16.0-test.yml | 0 .../2.16.0/opensearch-dashboards-2.16.0.yml | 0 .../2.16.1/opensearch-2.16.1-test.yml | 0 {manifests => legacy-manifests}/2.16.1/opensearch-2.16.1.yml | 0 manifests/2.18.0/opensearch-2.18.0-test.yml | 2 +- manifests/2.19.0/opensearch-2.19.0-test.yml | 2 +- 19 files changed, 2 insertions(+), 6 deletions(-) rename {manifests => legacy-manifests}/1.3.17/opensearch-1.3.17-test.yml (100%) rename {manifests => legacy-manifests}/1.3.17/opensearch-1.3.17.yml (100%) rename {manifests => legacy-manifests}/1.3.17/opensearch-dashboards-1.3.17-test.yml (100%) rename {manifests => legacy-manifests}/1.3.17/opensearch-dashboards-1.3.17.yml (100%) rename {manifests => legacy-manifests}/2.15.0/opensearch-2.15.0-test.yml (100%) rename {manifests => legacy-manifests}/2.15.0/opensearch-2.15.0.yml (100%) rename {manifests => legacy-manifests}/2.15.0/opensearch-dashboards-2.15.0-test.yml (100%) rename {manifests => legacy-manifests}/2.15.0/opensearch-dashboards-2.15.0.yml (100%) rename {manifests => legacy-manifests}/2.15.1/opensearch-2.15.1.yml (100%) rename {manifests => legacy-manifests}/2.16.0/opensearch-2.16.0-test.yml (100%) rename {manifests => legacy-manifests}/2.16.0/opensearch-2.16.0.yml (100%) rename {manifests => legacy-manifests}/2.16.0/opensearch-dashboards-2.16.0-test.yml (100%) rename {manifests => legacy-manifests}/2.16.0/opensearch-dashboards-2.16.0.yml (100%) rename {manifests => legacy-manifests}/2.16.1/opensearch-2.16.1-test.yml (100%) rename {manifests => legacy-manifests}/2.16.1/opensearch-2.16.1.yml (100%) diff --git a/.github/workflows/os-increment-plugin-versions.yml b/.github/workflows/os-increment-plugin-versions.yml index 801556cee5..33933d3bd3 100644 --- a/.github/workflows/os-increment-plugin-versions.yml +++ b/.github/workflows/os-increment-plugin-versions.yml @@ -55,8 +55,6 @@ jobs: - '1.3' - 2.x - main - - '2.15' - - '2.16' - '2.17' - '2.18' - '2.19' diff --git a/.github/workflows/osd-increment-plugin-versions.yml b/.github/workflows/osd-increment-plugin-versions.yml index 007b99c137..c48fc17ffe 100644 --- a/.github/workflows/osd-increment-plugin-versions.yml +++ b/.github/workflows/osd-increment-plugin-versions.yml @@ -46,8 +46,6 @@ jobs: - '1.3' - 2.x - main - - '2.15' - - '2.16' - '2.17' - '2.18' - '2.19' diff --git a/manifests/1.3.17/opensearch-1.3.17-test.yml b/legacy-manifests/1.3.17/opensearch-1.3.17-test.yml similarity index 100% rename from manifests/1.3.17/opensearch-1.3.17-test.yml rename to legacy-manifests/1.3.17/opensearch-1.3.17-test.yml diff --git a/manifests/1.3.17/opensearch-1.3.17.yml b/legacy-manifests/1.3.17/opensearch-1.3.17.yml similarity index 100% rename from manifests/1.3.17/opensearch-1.3.17.yml rename to legacy-manifests/1.3.17/opensearch-1.3.17.yml diff --git a/manifests/1.3.17/opensearch-dashboards-1.3.17-test.yml b/legacy-manifests/1.3.17/opensearch-dashboards-1.3.17-test.yml similarity index 100% rename from manifests/1.3.17/opensearch-dashboards-1.3.17-test.yml rename to legacy-manifests/1.3.17/opensearch-dashboards-1.3.17-test.yml diff --git a/manifests/1.3.17/opensearch-dashboards-1.3.17.yml b/legacy-manifests/1.3.17/opensearch-dashboards-1.3.17.yml similarity index 100% rename from manifests/1.3.17/opensearch-dashboards-1.3.17.yml rename to legacy-manifests/1.3.17/opensearch-dashboards-1.3.17.yml diff --git a/manifests/2.15.0/opensearch-2.15.0-test.yml b/legacy-manifests/2.15.0/opensearch-2.15.0-test.yml similarity index 100% rename from manifests/2.15.0/opensearch-2.15.0-test.yml rename to legacy-manifests/2.15.0/opensearch-2.15.0-test.yml diff --git a/manifests/2.15.0/opensearch-2.15.0.yml b/legacy-manifests/2.15.0/opensearch-2.15.0.yml similarity index 100% rename from manifests/2.15.0/opensearch-2.15.0.yml rename to legacy-manifests/2.15.0/opensearch-2.15.0.yml diff --git a/manifests/2.15.0/opensearch-dashboards-2.15.0-test.yml b/legacy-manifests/2.15.0/opensearch-dashboards-2.15.0-test.yml similarity index 100% rename from manifests/2.15.0/opensearch-dashboards-2.15.0-test.yml rename to legacy-manifests/2.15.0/opensearch-dashboards-2.15.0-test.yml diff --git a/manifests/2.15.0/opensearch-dashboards-2.15.0.yml b/legacy-manifests/2.15.0/opensearch-dashboards-2.15.0.yml similarity index 100% rename from manifests/2.15.0/opensearch-dashboards-2.15.0.yml rename to legacy-manifests/2.15.0/opensearch-dashboards-2.15.0.yml diff --git a/manifests/2.15.1/opensearch-2.15.1.yml b/legacy-manifests/2.15.1/opensearch-2.15.1.yml similarity index 100% rename from manifests/2.15.1/opensearch-2.15.1.yml rename to legacy-manifests/2.15.1/opensearch-2.15.1.yml diff --git a/manifests/2.16.0/opensearch-2.16.0-test.yml b/legacy-manifests/2.16.0/opensearch-2.16.0-test.yml similarity index 100% rename from manifests/2.16.0/opensearch-2.16.0-test.yml rename to legacy-manifests/2.16.0/opensearch-2.16.0-test.yml diff --git a/manifests/2.16.0/opensearch-2.16.0.yml b/legacy-manifests/2.16.0/opensearch-2.16.0.yml similarity index 100% rename from manifests/2.16.0/opensearch-2.16.0.yml rename to legacy-manifests/2.16.0/opensearch-2.16.0.yml diff --git a/manifests/2.16.0/opensearch-dashboards-2.16.0-test.yml b/legacy-manifests/2.16.0/opensearch-dashboards-2.16.0-test.yml similarity index 100% rename from manifests/2.16.0/opensearch-dashboards-2.16.0-test.yml rename to legacy-manifests/2.16.0/opensearch-dashboards-2.16.0-test.yml diff --git a/manifests/2.16.0/opensearch-dashboards-2.16.0.yml b/legacy-manifests/2.16.0/opensearch-dashboards-2.16.0.yml similarity index 100% rename from manifests/2.16.0/opensearch-dashboards-2.16.0.yml rename to legacy-manifests/2.16.0/opensearch-dashboards-2.16.0.yml diff --git a/manifests/2.16.1/opensearch-2.16.1-test.yml b/legacy-manifests/2.16.1/opensearch-2.16.1-test.yml similarity index 100% rename from manifests/2.16.1/opensearch-2.16.1-test.yml rename to legacy-manifests/2.16.1/opensearch-2.16.1-test.yml diff --git a/manifests/2.16.1/opensearch-2.16.1.yml b/legacy-manifests/2.16.1/opensearch-2.16.1.yml similarity index 100% rename from manifests/2.16.1/opensearch-2.16.1.yml rename to legacy-manifests/2.16.1/opensearch-2.16.1.yml diff --git a/manifests/2.18.0/opensearch-2.18.0-test.yml b/manifests/2.18.0/opensearch-2.18.0-test.yml index 102c347be5..1136375950 100644 --- a/manifests/2.18.0/opensearch-2.18.0-test.yml +++ b/manifests/2.18.0/opensearch-2.18.0-test.yml @@ -147,5 +147,5 @@ components: - with-security - without-security additional-cluster-configs: - cluster.application_templates.enabled: true opensearch.experimental.feature.application_templates.enabled: true + cluster.application_templates.enabled: true diff --git a/manifests/2.19.0/opensearch-2.19.0-test.yml b/manifests/2.19.0/opensearch-2.19.0-test.yml index 102c347be5..1136375950 100644 --- a/manifests/2.19.0/opensearch-2.19.0-test.yml +++ b/manifests/2.19.0/opensearch-2.19.0-test.yml @@ -147,5 +147,5 @@ components: - with-security - without-security additional-cluster-configs: - cluster.application_templates.enabled: true opensearch.experimental.feature.application_templates.enabled: true + cluster.application_templates.enabled: true