Skip to content

Commit 42c78f0

Browse files
committedMar 12, 2024
update future yaml
Signed-off-by: Tao Liu <liutaoaz@amazon.com>
1 parent cc5ecc7 commit 42c78f0

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed
 

‎.github/workflows/trigger-future-deploymnet.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,32 @@ on:
55
branches: [ ec2-runner ]
66
workflow_dispatch:
77
inputs:
8-
deploy-fresh:
8+
deploy_fresh:
99
required: false
1010
type: boolean
1111
description: 'Fresh Deploy OpenSearch and OpenSearch Dashboards'
1212
default: false
13-
deploy-upgrade:
13+
deploy_upgrade:
1414
required: false
1515
type: boolean
1616
description: 'Upgrade OpenSearch and OpenSearch Dashboards'
1717
default: true
18-
osd-image-tag:
18+
osd_image_tag:
1919
required: true
2020
type: string
2121
description: 'Image tag for OpenSearch Dashboards'
2222
default: '3.0.0-8219474312'
23-
osd-image-repo:
23+
osd_image_repo:
2424
required: true
2525
type: string
2626
description: 'Image repo for OpenSearch Dashboards'
2727
default: 'public.ecr.aws/y0r0d3v8/actionrunner'
28-
os-image-tag:
28+
os_image_tag:
2929
required: false
3030
type: string
3131
description: 'Image tag for OpenSearch'
3232
default: '3.0.0'
33-
os-image-repo:
33+
os_image_repo:
3434
required: false
3535
type: string
3636
description: 'Image repo for OpenSearch'
@@ -57,8 +57,8 @@ jobs:
5757
GA_TRACKING_ID: ${{ secrets.GA_TRACKING_ID_FUTURE }}
5858
CERTIFICATE_ARN: ${{ secrets.CERTIFICATE_ARN_FUTURE }}
5959
KIBANASERVER: ${{ secrets.KIBANASERVER }}
60-
OSD-IMAGE-TAG: ${{ inputs.osd-image-tag }}
61-
OSD-IMAGE-REPO: ${{ inputs.osd-image-repo }}
60+
OSD_IMAGE_TAG: ${{ inputs.osd_image_tag }}
61+
OSD_IMAGE_REPO: ${{ inputs.osd_image_repo }}
6262

6363
- name: Replace Token in opensearch.yml
6464
uses: cschleiden/replace-tokens@v1
@@ -70,8 +70,8 @@ jobs:
7070
ESNODE_CERT: ${{ secrets.esnode_cert }}
7171
ESNODE_KEY_CERT: ${{ secrets.esnode_key_cert }}
7272
ROOT_CA_CERT: ${{ secrets.root_ca_cert }}
73-
OS-IMAGE-TAG: ${{ inputs.os-image-tag }}
74-
OS-IMAGE-REPO: ${{ inputs.os-image-repo }}
73+
OS_IMAGE_TAG: ${{ inputs.os_image_tag }}
74+
OS_IMAGE_REPO: ${{ inputs.os_image_repo }}
7575
- name: Configure AWS Credentials
7676
uses: aws-actions/configure-aws-credentials@v2
7777
with:
@@ -80,7 +80,7 @@ jobs:
8080
aws-region: ${{ secrets.AWS_REGION_PINK }}
8181

8282
- name: Fresh Deploy OpenSearch and OpenSearch Dashboards By Helm Chart
83-
if: ${{ inputs.deploy-fresh }}
83+
if: ${{ inputs.deploy_fresh }}
8484
uses: elastic-analytics/dashboards-action@main
8585
env:
8686
KUBE_CONFIG_DATA: ${{ secrets.AWS_ACCESS_KEY_ID_PINK }}
@@ -93,7 +93,7 @@ jobs:
9393
kubectl get nodes
9494
9595
- name: Upgrade Deploy OpenSearch/OpenSearch Dashboards/ML By Helm Chart
96-
if: ${{ inputs.deploy-upgrade }}
96+
if: ${{ inputs.deploy_upgrade }}
9797
uses: elastic-analytics/dashboards-action@main
9898
env:
9999
KUBE_CONFIG_DATA: ${{ secrets.AWS_ACCESS_KEY_ID_PINK }}

‎config/playground/helm/future/helm-opensearch-dashboards.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ opensearchHosts: "https://opensearch-cluster-leader:9200"
99
replicaCount: 2
1010

1111
image:
12-
repository: ${OSD_IMAGE_REPOSITORY}
12+
repository: ${OSD_IMAGE_REPO}
1313
# override image tag, which is .Chart.AppVersion by default
1414
tag: ${OSD_IMAGE_TAG}
1515
pullPolicy: "Always"

‎config/playground/helm/future/helm-opensearch.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ secretMounts: []
110110
hostAliases: []
111111

112112
image:
113-
repository: ${OS_IMAGE_REPOSITORY}
113+
repository: ${OS_IMAGE_REPO}
114114
# override image tag, which is .Chart.AppVersion by default
115115
tag: ${OS_IMAGE_TAG}
116116
pullPolicy: "Always"

0 commit comments

Comments
 (0)