Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ INCLUDE_COMPOSE_LOCAL_OPENSEARCH=docker-compose.local-opensearch.yml
INCLUDE_COMPOSE_LOCAL_OPENSEARCH_DASHBOARDS=docker-compose.local-opensearch-dashboards.yml

# TODO: Change to opensearchproject after 3.7.0 official release
# OPENSEARCH_DOCKER_REPO=opensearchstaging
OPENSEARCH_IMAGE=ashisagr32966/opensearch-sql-main:3.7.0-sql-main
OPENSEARCH_DASHBOARDS_IMAGE=joshuali925/opensearch-dashboards:3.7.0-slos-pr-against-main-v2
OPENSEARCH_DOCKER_REPO=opensearchstaging


# OpenSearch Configuration
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/helm-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,11 @@ jobs:

- name: Set up Helm
uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4
with:
version: v3.18.6

- name: Install helm-unittest plugin
run: helm plugin install https://github.com/helm-unittest/helm-unittest.git --verify=false
run: helm plugin install https://github.com/helm-unittest/helm-unittest.git

- name: Run helm lint + unittest
run: ./test/helm-test.sh
8 changes: 4 additions & 4 deletions charts/observability-stack/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ opensearch:
replicas: 3
# TODO: Change to opensearchproject/opensearch after 3.7.0 official release
image:
repository: "ashisagr32966/opensearch-sql-main"
tag: "3.7.0-sql-main"
repository: "opensearchstaging/opensearch"
tag: "3.7.0"
resources:
requests:
memory: "4Gi"
Expand Down Expand Up @@ -79,8 +79,8 @@ opensearch-dashboards:
replicaCount: 3
# TODO: Change to opensearchproject/opensearch-dashboards after 3.7.0 official release
image:
repository: "joshuali925/opensearch-dashboards"
tag: "3.7.0-slos-pr-against-main-v2"
repository: "opensearchstaging/opensearch-dashboards"
tag: "3.7.0"
resources:
requests:
cpu: "500m"
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.local-opensearch-dashboards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ x-default-logging: &logging
services:
# OpenSearch Dashboards - Web UI for visualizing logs and traces
opensearch-dashboards:
image: ${OPENSEARCH_DASHBOARDS_IMAGE}
image: ${OPENSEARCH_DOCKER_REPO}/opensearch-dashboards:${OPENSEARCH_DASHBOARDS_VERSION}
platform: linux/amd64
container_name: opensearch-dashboards
pull_policy: always
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.local-opensearch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ volumes:
services:
# OpenSearch - Stores and indexes logs and traces for search and analysis
opensearch:
image: ${OPENSEARCH_IMAGE}
image: ${OPENSEARCH_DOCKER_REPO}/opensearch:${OPENSEARCH_VERSION}
container_name: opensearch
pull_policy: always
environment:
Expand Down
4 changes: 2 additions & 2 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -849,8 +849,8 @@ run_simulated_installer() {

# Demo image list
local images=(
"opensearchproject/opensearch:3.5.0"
"opensearchproject/opensearch-dashboards:3.5.0"
"opensearchstaging/opensearch:3.7.0"
"opensearchstaging/opensearch-dashboards:3.7.0"
"otel/opentelemetry-collector-contrib:0.143.0"
"opensearchproject/data-prepper:2.13.0"
"prom/prometheus:v3.8.1"
Expand Down
Loading