From 03dbfd7d75e1159a79134740e6a91072eff9009c Mon Sep 17 00:00:00 2001 From: ps48 Date: Thu, 28 May 2026 16:15:01 -0700 Subject: [PATCH 1/3] fix: use opensearchstaging/opensearch:3.7.0 images for OS and OSD Revert to the original OPENSEARCH_DOCKER_REPO pattern where the compose files construct image references from the repo + version variables, replacing the temporary per-developer image overrides. Updated across .env, docker-compose, Helm values, and install.sh. Signed-off-by: ps48 --- .env | 4 +--- charts/observability-stack/values.yaml | 8 ++++---- docker-compose.local-opensearch-dashboards.yml | 2 +- docker-compose.local-opensearch.yml | 2 +- install.sh | 4 ++-- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.env b/.env index 942bb049..8d55c11a 100644 --- a/.env +++ b/.env @@ -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 diff --git a/charts/observability-stack/values.yaml b/charts/observability-stack/values.yaml index 5f192a2c..3087c0fd 100644 --- a/charts/observability-stack/values.yaml +++ b/charts/observability-stack/values.yaml @@ -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" @@ -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" diff --git a/docker-compose.local-opensearch-dashboards.yml b/docker-compose.local-opensearch-dashboards.yml index 92e17f8b..587e5972 100644 --- a/docker-compose.local-opensearch-dashboards.yml +++ b/docker-compose.local-opensearch-dashboards.yml @@ -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 diff --git a/docker-compose.local-opensearch.yml b/docker-compose.local-opensearch.yml index 2e181168..27621150 100644 --- a/docker-compose.local-opensearch.yml +++ b/docker-compose.local-opensearch.yml @@ -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: diff --git a/install.sh b/install.sh index 18a3b038..efa13e98 100755 --- a/install.sh +++ b/install.sh @@ -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" From 10366059320c6dc0b9786632b61be6fb4563cd3a Mon Sep 17 00:00:00 2001 From: ps48 Date: Thu, 28 May 2026 17:10:43 -0700 Subject: [PATCH 2/3] fix(ci): remove unsupported --verify flag from helm plugin install The --verify flag was removed in newer Helm versions, causing CI failure. Signed-off-by: ps48 --- .github/workflows/helm-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/helm-test.yml b/.github/workflows/helm-test.yml index 3b3b1313..41808219 100644 --- a/.github/workflows/helm-test.yml +++ b/.github/workflows/helm-test.yml @@ -24,7 +24,7 @@ jobs: uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4 - 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 From a06aa596053e265adec026bc36a4c1b380a19d3a Mon Sep 17 00:00:00 2001 From: ps48 Date: Thu, 28 May 2026 17:12:39 -0700 Subject: [PATCH 3/3] fix(ci): pin Helm to v3.18.6 for compatible plugin install Helm v3.18+ supports the platformHooks plugin.yaml field and does not require --verify flag. Pinning avoids version drift across CI runs. Signed-off-by: ps48 --- .github/workflows/helm-test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/helm-test.yml b/.github/workflows/helm-test.yml index 41808219..74e9a474 100644 --- a/.github/workflows/helm-test.yml +++ b/.github/workflows/helm-test.yml @@ -22,6 +22,8 @@ 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