From b18fb35cef2a37ad53a8fc944be2681119fc64ce Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Mon, 23 May 2022 18:57:36 -0400 Subject: [PATCH 1/4] 2.x only have 2.x opensearch/dashboards apps #64 Signed-off-by: Peter Zhu --- README.md | 10 ++++++++++ inventories/opensearch/group_vars/all/all.yml | 8 ++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 2bb6373..fca1dd1 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,16 @@ A community repository for Ansible Playbook of OpenSearch Project. +## Version and Branching +As of now, this helm-charts repository maintains 3 branches: +* _main_ (Version is 2.x.x for both `os_version` and `os_dashboards_version` in `inventories/opensearch/group_vars/all/all.yml`) +* _1.x_ (Version is 1.x.x for both `os_version` and `os_dashboards_version` in `inventories/opensearch/group_vars/all/all.yml`) +
+ +Contributors should choose the corresponding branch(es) when commiting their change(s): +* If you have a change for a specific version, only open PR to specific branch +* If you have a change for all available versions, first open a PR on `main`, then open a backport PR with `[backport 1.x]` in the title, with label `backport 1.x`, etc. + ## OpenSearch Installation with Dashboards This ansible playbook supports the following, diff --git a/inventories/opensearch/group_vars/all/all.yml b/inventories/opensearch/group_vars/all/all.yml index 4975cd5..9b117c8 100644 --- a/inventories/opensearch/group_vars/all/all.yml +++ b/inventories/opensearch/group_vars/all/all.yml @@ -6,16 +6,12 @@ os_cluster_name: development-cluster os_download_url: https://artifacts.opensearch.org/releases/bundle/opensearch # opensearch version -# 1.x Latest Version -os_version: "1.3.2" # 2.x Latest Version -# os_version: "2.0.0-rc1" +os_version: "2.0.0" # opensearch dashboards version -# 1.x Latest Version -os_dashboards_version: "1.3.2" # 2.x Latest Version -# os_dashboards_version: "2.0.0-rc1" +os_dashboards_version: "2.0.0" # Configure hostnames for opensearch nodes # It is required to configure SSL From 1f5555010eafc377644bd792c26c170b99b21507 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Tue, 24 May 2022 21:14:31 -0400 Subject: [PATCH 2/4] Update readme Signed-off-by: Peter Zhu --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fca1dd1..afb51e3 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ A community repository for Ansible Playbook of OpenSearch Project. ## Version and Branching -As of now, this helm-charts repository maintains 3 branches: +As of now, this ansible-playbook repository maintains 3 branches: * _main_ (Version is 2.x.x for both `os_version` and `os_dashboards_version` in `inventories/opensearch/group_vars/all/all.yml`) * _1.x_ (Version is 1.x.x for both `os_version` and `os_dashboards_version` in `inventories/opensearch/group_vars/all/all.yml`)
From 094d99379d05ae9f330c6e84c9ddd4a79e4a85e7 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Tue, 24 May 2022 21:19:45 -0400 Subject: [PATCH 3/4] Remove dco Signed-off-by: Peter Zhu --- .github/workflows/dco.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .github/workflows/dco.yml diff --git a/.github/workflows/dco.yml b/.github/workflows/dco.yml deleted file mode 100644 index 0a30f2f..0000000 --- a/.github/workflows/dco.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Developer Certificate of Origin Check - -on: [pull_request] - -jobs: - check: - runs-on: ubuntu-latest - - steps: - - name: Get PR Commits - id: 'get-pr-commits' - uses: tim-actions/get-pr-commits@v1.1.0 - with: - token: ${{ secrets.GITHUB_TOKEN }} - - name: DCO Check - uses: tim-actions/dco@v1.1.0 - with: - commits: ${{ steps.get-pr-commits.outputs.commits }} From 16c8fcbf8251b7cf723dee07129cd78fb9f800e2 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Tue, 24 May 2022 21:22:25 -0400 Subject: [PATCH 4/4] Small Tweaks Signed-off-by: Peter Zhu --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index afb51e3..30312de 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ A community repository for Ansible Playbook of OpenSearch Project. ## Version and Branching -As of now, this ansible-playbook repository maintains 3 branches: +As of now, this ansible-playbook repository maintains 2 branches: * _main_ (Version is 2.x.x for both `os_version` and `os_dashboards_version` in `inventories/opensearch/group_vars/all/all.yml`) * _1.x_ (Version is 1.x.x for both `os_version` and `os_dashboards_version` in `inventories/opensearch/group_vars/all/all.yml`)