Skip to content

Commit

Permalink
deploy 2.12 to reinvent cluster and searchapps
Browse files Browse the repository at this point in the history
Signed-off-by: Tao Liu <[email protected]>
  • Loading branch information
Flyingliuhub committed Mar 6, 2024
1 parent 9322d0d commit 4e485e2
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 9 deletions.
14 changes: 10 additions & 4 deletions .github/workflows/deployment-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/os-osd-deployment-manually.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/os-osd-deployment-scheduled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
6 changes: 6 additions & 0 deletions config/playground/helm/preview/helm-opensearch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
6 changes: 6 additions & 0 deletions config/playground/helm/searchapps/helm-opensearch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 4e485e2

Please sign in to comment.