From 4e485e22df07783057604599606ae68d94458cf1 Mon Sep 17 00:00:00 2001 From: Tao Liu Date: Tue, 5 Mar 2024 21:16:18 -0800 Subject: [PATCH] deploy 2.12 to reinvent cluster and searchapps Signed-off-by: Tao Liu --- .github/workflows/deployment-template.yml | 14 ++++++++++---- .github/workflows/os-osd-deployment-manually.yml | 10 ++++++++-- .github/workflows/os-osd-deployment-scheduled.yml | 1 - .../helm/preview/helm-opensearch-dashboards.yaml | 2 +- .../playground/helm/preview/helm-opensearch.yaml | 6 ++++++ .../searchapps/helm-opensearch-dashboards.yaml | 2 +- .../helm/searchapps/helm-opensearch.yaml | 6 ++++++ 7 files changed, 32 insertions(+), 9 deletions(-) diff --git a/.github/workflows/deployment-template.yml b/.github/workflows/deployment-template.yml index fcaf572..07a5e21 100644 --- a/.github/workflows/deployment-template.yml +++ b/.github/workflows/deployment-template.yml @@ -38,8 +38,12 @@ on: required: false kibanaserver: required: true - query_datasources_master_key: - required: false + esnode_cert: + required: false + esnode_key_cert: + required: false + root_ca_cert: + required: false jobs: OS-OSD-Deployment: @@ -64,14 +68,16 @@ jobs: KIBANASERVER: ${{ secrets.kibanaserver }} - name: Step 2 - Replace Token in opensearch.yml - if: ${{ (inputs.deploy-env == 'observability') || (inputs.deploy-env == 'dev') }} + if: ${{ (inputs.deploy-env == 'preview') || (inputs.deploy-env == 'searchapps') }} uses: cschleiden/replace-tokens@v1 with: files: '["${{ github.workspace }}/config/playground/helm/${{inputs.deploy-env}}/helm-opensearch.yaml"]' tokenPrefix: '${' tokenSuffix: '}' env: - QUERY_DATASOURCES_MASTER_KEY: ${{ secrets.query_datasources_master_key }} + ESNODE_CERT: ${{ secrets.esnode_cert }} + ESNODE_KEY_CERT: ${{ secrets.esnode_key_cert }} + ROOT_CA_CERT: ${{ secrets.root_ca_cert }} - name: Step 3 - Replace Tokens for dashboards uses: cschleiden/replace-tokens@v1 diff --git a/.github/workflows/os-osd-deployment-manually.yml b/.github/workflows/os-osd-deployment-manually.yml index 9227fc4..455bc06 100644 --- a/.github/workflows/os-osd-deployment-manually.yml +++ b/.github/workflows/os-osd-deployment-manually.yml @@ -11,7 +11,7 @@ on: jobs: OS-OSD-Preview-Scheduled-Deployment: - uses: opensearch-project/dashboards-anywhere/.github/workflows/deployment-template.yml@main + uses: opensearch-project/dashboards-anywhere/.github/workflows/deployment-template.yml@2023reinvent with: helm-repo: https://opensearch-project.github.io/helm-charts/ deploy-env: preview @@ -30,9 +30,12 @@ jobs: otel_root_ca: ${{ secrets.OTEL_ROOT_CA }} otel_data_prepper_cert: ${{ secrets.OTEL_DATA_PREPPER_CERT }} kibanaserver: ${{ secrets.KIBANASERVER }} + esnode_cert: ${{ secrets.ESNODE_CERT }} + esnode_key_cert: ${{ secrets.ESNODE_KEY_CERT }} + root_ca_cert: ${{ secrets.ROOT_CA_CERT }} OS-OSD-SearchApps-Scheduled-Deployment: - uses: opensearch-project/dashboards-anywhere/.github/workflows/deployment-template.yml@main + uses: opensearch-project/dashboards-anywhere/.github/workflows/deployment-template.yml@2023reinvent with: helm-repo: https://opensearch-project.github.io/helm-charts/ deploy-env: searchapps @@ -51,6 +54,9 @@ jobs: otel_root_ca: ${{ secrets.OTEL_ROOT_CA }} otel_data_prepper_cert: ${{ secrets.OTEL_DATA_PREPPER_CERT }} kibanaserver: ${{ secrets.KIBANASERVER }} + esnode_cert: ${{ secrets.ESNODE_CERT }} + esnode_key_cert: ${{ secrets.ESNODE_KEY_CERT }} + root_ca_cert: ${{ secrets.ROOT_CA_CERT }} OSD-Functional-Test-Preview: needs: OS-OSD-Preview-Scheduled-Deployment diff --git a/.github/workflows/os-osd-deployment-scheduled.yml b/.github/workflows/os-osd-deployment-scheduled.yml index cd0c334..c2480a6 100644 --- a/.github/workflows/os-osd-deployment-scheduled.yml +++ b/.github/workflows/os-osd-deployment-scheduled.yml @@ -74,7 +74,6 @@ jobs: otel_root_ca: ${{ secrets.OTEL_ROOT_CA }} otel_data_prepper_cert: ${{ secrets.OTEL_DATA_PREPPER_CERT }} kibanaserver: ${{ secrets.KIBANASERVER }} - query_datasources_master_key: ${{ secrets.QUERY_DATASOURCES_MASTER_KEY }} OSD-Functional-Test-Preview: needs: OS-OSD-Preview-Scheduled-Deployment diff --git a/config/playground/helm/preview/helm-opensearch-dashboards.yaml b/config/playground/helm/preview/helm-opensearch-dashboards.yaml index 218faa3..ae05e38 100644 --- a/config/playground/helm/preview/helm-opensearch-dashboards.yaml +++ b/config/playground/helm/preview/helm-opensearch-dashboards.yaml @@ -201,4 +201,4 @@ extraObjects: [] # specify the external plugins to install plugins: enabled: true - installList: ["https://github.com/BionIT/google-analytics-plugin/releases/download/2.11.1/googleAnalytics-2.11.1.zip"] + installList: ["https://github.com/BionIT/google-analytics-plugin/releases/download/2.12.0/googleAnalytics-2.12.0.zip"] diff --git a/config/playground/helm/preview/helm-opensearch.yaml b/config/playground/helm/preview/helm-opensearch.yaml index e4e0ffc..3b82097 100644 --- a/config/playground/helm/preview/helm-opensearch.yaml +++ b/config/playground/helm/preview/helm-opensearch.yaml @@ -28,6 +28,12 @@ majorVersion: "7" opensearchHome: /usr/share/opensearch # such as opensearch.yml config: + esnode.pem: |- +${ESNODE_CERT} + esnode-key.pem: |- +${ESNODE_KEY_CERT} + root-ca.pem: |- +${ROOT_CA_CERT} opensearch.yml: | cluster.name: opensearch-cluster # Bind to all interfaces because we don't know what IP address Docker will assign to us. diff --git a/config/playground/helm/searchapps/helm-opensearch-dashboards.yaml b/config/playground/helm/searchapps/helm-opensearch-dashboards.yaml index d0a2f83..658e0f1 100644 --- a/config/playground/helm/searchapps/helm-opensearch-dashboards.yaml +++ b/config/playground/helm/searchapps/helm-opensearch-dashboards.yaml @@ -197,4 +197,4 @@ extraObjects: [] # specify the plugin to install plugins: enabled: false - installList: ["https://github.com/BionIT/google-analytics-plugin/releases/download/2.11.1/googleAnalytics-2.11.1.zip"] + installList: ["https://github.com/BionIT/google-analytics-plugin/releases/download/2.12.0/googleAnalytics-2.12.0.zip"] diff --git a/config/playground/helm/searchapps/helm-opensearch.yaml b/config/playground/helm/searchapps/helm-opensearch.yaml index 471403f..d8b39e2 100644 --- a/config/playground/helm/searchapps/helm-opensearch.yaml +++ b/config/playground/helm/searchapps/helm-opensearch.yaml @@ -28,6 +28,12 @@ majorVersion: "7" opensearchHome: /usr/share/opensearch # such as opensearch.yml config: + esnode.pem: |- +${ESNODE_CERT} + esnode-key.pem: |- +${ESNODE_KEY_CERT} + root-ca.pem: |- +${ROOT_CA_CERT} opensearch.yml: | cluster.name: opensearch-cluster # Bind to all interfaces because we don't know what IP address Docker will assign to us.