Skip to content

Commit c6f8eb4

Browse files
feat(opensearch): Add the repository-azure plugin (#1689)
* feat(opensearch): Add the repository-azure plugin * chore: Update changelog
1 parent ebc2f64 commit c6f8eb4

9 files changed

Lines changed: 26 additions & 22 deletions

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ All notable changes to this project will be documented in this file.
1818
- stats-exporter: Add `0.31.0` ([#1664]).
1919
- airflow: Add `3.3.1`, deprecate `3.2.2` ([#1665]).
2020
- opensearch: Add `3.8.0` ([#1669]).
21+
- opensearch: Add the `repository-azure` plugin ([#1689]).
2122
- opensearch-dashboards: Add `3.8.0` ([#1675]).
2223
- nifi: Ship `QueryNiFiReportingTask` with the image ([#1676]).
2324
- nifi: Add `2.12.0` ([#1667]).
@@ -120,6 +121,7 @@ All notable changes to this project will be documented in this file.
120121
[#1680]: https://github.com/stackabletech/docker-images/pull/1680
121122
[#1681]: https://github.com/stackabletech/docker-images/pull/1681
122123
[#1683]: https://github.com/stackabletech/docker-images/pull/1683
124+
[#1689]: https://github.com/stackabletech/docker-images/pull/1689
123125

124126
## [26.7.0] - 2026-07-21
125127

‎opensearch/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ tar -xzf "artifacts/dist/opensearch-min-${PRODUCT_VERSION}-linux-${ARCH}.tar.gz"
6767
# (stackable/patches/<version>/0005-Scope-CycloneDX-SBOM-to-shipped-components-only.patch)
6868
# to include them in the shippedPlugins list, otherwise their dependencies will
6969
# be missing from the SBOM.
70+
unzip artifacts/core-plugins/repository-azure-${PRODUCT_VERSION}.zip -d /stackable/opensearch-${PRODUCT_VERSION}/plugins/repository-azure/
7071
unzip artifacts/core-plugins/repository-s3-${PRODUCT_VERSION}.zip -d /stackable/opensearch-${PRODUCT_VERSION}/plugins/repository-s3/
7172
mv /stackable/opensearch-${PRODUCT_VERSION}/plugins/repository-s3/config /stackable/opensearch-${PRODUCT_VERSION}/config/repository-s3
7273
unzip artifacts/core-plugins/telemetry-otel-${PRODUCT_VERSION}.zip -d /stackable/opensearch-${PRODUCT_VERSION}/plugins/telemetry-otel/

‎opensearch/stackable/patches/3.1.0/0005-Scope-CycloneDX-SBOM-to-shipped-components-only.patch‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
1-
From 7469915d465acd03e09cc6400941b20713e4f4d2 Mon Sep 17 00:00:00 2001
1+
From 12860d8c0cbcbc9019895f09b125cc49cd75fc60 Mon Sep 17 00:00:00 2001
22
From: dervoeti <lukas.krug@stackable.tech>
33
Date: Thu, 26 Mar 2026 20:51:26 +0000
44
Subject: Scope CycloneDX SBOM to shipped components only
55

66
Exclude plugin subprojects that are not included in the opensearch-min
7-
distribution from the CycloneDX BOM generation. Only repository-s3 and
8-
telemetry-otel are shipped from the local build. Other plugins like
9-
ingest-attachment (which pulls in tika-core) are not installed in the
10-
Stackable image and should not appear in the runtime SBOM.
7+
distribution from the CycloneDX BOM generation. Only repository-azure,
8+
repository-s3 and telemetry-otel are shipped from the local build. Other
9+
plugins like ingest-attachment (which pulls in tika-core) are not
10+
installed in the Stackable image and should not appear in the runtime
11+
SBOM.
1112
---
1213
build.gradle | 34 ++++++++++++++++++++++++++++++++++
1314
1 file changed, 34 insertions(+)
1415

1516
diff --git a/build.gradle b/build.gradle
16-
index 78a15b418e7..b8cbb13be3d 100644
17+
index 78a15b418e7..1770e1afec9 100644
1718
--- a/build.gradle
1819
+++ b/build.gradle
1920
@@ -78,6 +78,40 @@ allprojects {
@@ -22,7 +23,7 @@ index 78a15b418e7..b8cbb13be3d 100644
2223
cyclonedxBom {
2324
+ // Only include subprojects that are part of the opensearch-min distribution
2425
+ // (server, libs, modules) plus the core plugins shipped in the Stackable
25-
+ // image (repository-s3 and telemetry-otel). This prevents build-only plugin
26+
+ // image (repository-azure, repository-s3 and telemetry-otel). This prevents build-only plugin
2627
+ // dependencies (e.g. tika-core from ingest-attachment) from appearing in the
2728
+ // runtime SBOM as false positives.
2829
+ // The test framework, the test fixtures, the QA projects and the benchmarks are not
@@ -35,7 +36,7 @@ index 78a15b418e7..b8cbb13be3d 100644
3536
+ // ends up asserting versions that are not in the image.
3637
+ // Note that :distribution must not be excluded. The launchers and CLI tools under
3738
+ // :distribution:tools are shipped in lib/tools.
38-
+ def shippedPlugins = ['repository-s3', 'telemetry-otel'] as Set
39+
+ def shippedPlugins = ['repository-azure', 'repository-s3', 'telemetry-otel'] as Set
3940
+ skipProjects = subprojects.findAll { sub ->
4041
+ (sub.path.startsWith(':plugins:') && !(sub.name in shippedPlugins)) ||
4142
+ sub.path.startsWith(':example-plugins') ||

opensearch/stackable/patches/3.6.0/0002-Add-CyclonDX-plugin.patch renamed to opensearch/stackable/patches/3.6.0/0002-Add-CycloneDX-plugin.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 7e1d87238369e4e4546df1dc25a6e6f019122cc6 Mon Sep 17 00:00:00 2001
1+
From 149b20962fba02568a0630576ab569ca29b14fe5 Mon Sep 17 00:00:00 2001
22
From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
33
Date: Mon, 22 Jun 2026 16:46:43 +0200
44
Subject: Add CycloneDX plugin
@@ -9,7 +9,7 @@ Subject: Add CycloneDX plugin
99
2 files changed, 37 insertions(+), 2 deletions(-)
1010

1111
diff --git a/build.gradle b/build.gradle
12-
index 252d1ed553a..dc520b0acf6 100644
12+
index 252d1ed553a..399af9f0625 100644
1313
--- a/build.gradle
1414
+++ b/build.gradle
1515
@@ -59,6 +59,7 @@ plugins {
@@ -36,10 +36,10 @@ index 252d1ed553a..dc520b0acf6 100644
3636
+
3737
+ // Only include subprojects that are part of the opensearch-min distribution
3838
+ // (server, libs, modules) plus the core plugins shipped in the Stackable
39-
+ // image (repository-s3 and telemetry-otel). This prevents build-only
39+
+ // image (repository-azure, repository-s3 and telemetry-otel). This prevents build-only
4040
+ // dependencies (e.g. tika-core from ingest-attachment, or test fixtures such
4141
+ // as hdfs-fixture) from appearing in the runtime SBOM as false positives.
42-
+ def shippedPlugins = ['repository-s3', 'telemetry-otel'] as Set
42+
+ def shippedPlugins = ['repository-azure', 'repository-s3', 'telemetry-otel'] as Set
4343
+ def isShipped = project.path == ':server' ||
4444
+ project.path.startsWith(':libs:') ||
4545
+ project.path.startsWith(':modules:') ||

‎opensearch/stackable/patches/3.6.0/0003-Use-the-Nexus-Build-Repo.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From da1488197ea92be58b0daffa30e442d93ed2e5f4 Mon Sep 17 00:00:00 2001
1+
From f02d4dca13a435458798f6b62032ff1eb6036034 Mon Sep 17 00:00:00 2001
22
From: Siegfried Weber <mail@siegfriedweber.net>
33
Date: Wed, 6 Aug 2025 13:12:12 +0200
44
Subject: Use the Nexus Build Repo

‎opensearch/stackable/patches/3.6.0/0004-stop-applying-formatting-plugin.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 52b4fd3f084400a89f4e9acfc62caa2941356809 Mon Sep 17 00:00:00 2001
1+
From a471e40a574b1cdb5d6b4227b12fa6877955dcc2 Mon Sep 17 00:00:00 2001
22
From: Benedikt Labrenz <benedikt@labrenz.org>
33
Date: Tue, 2 Sep 2025 12:01:22 +0200
44
Subject: stop applying formatting plugin
@@ -30,7 +30,7 @@ index 732e77934b4..47a7c1b1066 100644
3030
// Add support for incubator modules on supported Java versions.
3131
run.jvmArgs += ['--add-modules=jdk.incubator.vector']
3232
diff --git a/build.gradle b/build.gradle
33-
index dc520b0acf6..9c6f1475781 100644
33+
index 399af9f0625..a86e4557f12 100644
3434
--- a/build.gradle
3535
+++ b/build.gradle
3636
@@ -66,7 +66,6 @@ apply from: 'gradle/build-complete.gradle'

‎opensearch/stackable/patches/3.8.0/0002-Add-CycloneDX-plugin.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 88acf360a467f9dca7c36f0a6c5b0dffe3daeb3c Mon Sep 17 00:00:00 2001
1+
From c3124bcacad46e5be3b28c1a27b110dc3b3bd086 Mon Sep 17 00:00:00 2001
22
From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
33
Date: Mon, 22 Jun 2026 16:46:43 +0200
44
Subject: Add CycloneDX plugin
@@ -9,7 +9,7 @@ Subject: Add CycloneDX plugin
99
2 files changed, 36 insertions(+), 1 deletion(-)
1010

1111
diff --git a/build.gradle b/build.gradle
12-
index 667bc41b438..2546b0344e6 100644
12+
index 667bc41b438..2c6e9684175 100644
1313
--- a/build.gradle
1414
+++ b/build.gradle
1515
@@ -58,6 +58,7 @@ plugins {
@@ -27,10 +27,10 @@ index 667bc41b438..2546b0344e6 100644
2727
+
2828
+ // Only include subprojects that are part of the opensearch-min distribution
2929
+ // (server, libs, modules) plus the core plugins shipped in the Stackable
30-
+ // image (repository-s3 and telemetry-otel). This prevents build-only
30+
+ // image (repository-azure, repository-s3 and telemetry-otel). This prevents build-only
3131
+ // dependencies (e.g. tika-core from ingest-attachment, or test fixtures such
3232
+ // as hdfs-fixture) from appearing in the runtime SBOM as false positives.
33-
+ def shippedPlugins = ['repository-s3', 'telemetry-otel'] as Set
33+
+ def shippedPlugins = ['repository-azure', 'repository-s3', 'telemetry-otel'] as Set
3434
+ def isShipped = project.path == ':server' ||
3535
+ project.path.startsWith(':libs:') ||
3636
+ project.path.startsWith(':modules:') ||

‎opensearch/stackable/patches/3.8.0/0003-Use-the-Nexus-Build-Repo.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From f73f15cc82915affc3d2b7f6c6902ecddefe3a04 Mon Sep 17 00:00:00 2001
1+
From df70d2fc17390042c8d9cb42f3a084f2e5dcb939 Mon Sep 17 00:00:00 2001
22
From: Siegfried Weber <mail@siegfriedweber.net>
33
Date: Wed, 6 Aug 2025 13:12:12 +0200
44
Subject: Use the Nexus Build Repo

‎opensearch/stackable/patches/3.8.0/0004-stop-applying-formatting-plugin.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 800e5834414c0adbd5f2ce24f414c7b9d385348b Mon Sep 17 00:00:00 2001
1+
From 3341a03dcabf217b4e16bed3372d1422914f7227 Mon Sep 17 00:00:00 2001
22
From: Benedikt Labrenz <benedikt@labrenz.org>
33
Date: Tue, 2 Sep 2025 12:01:22 +0200
44
Subject: stop applying formatting plugin
@@ -31,7 +31,7 @@ index 732e77934b4..47a7c1b1066 100644
3131
// Add support for incubator modules on supported Java versions.
3232
run.jvmArgs += ['--add-modules=jdk.incubator.vector']
3333
diff --git a/build.gradle b/build.gradle
34-
index 2546b0344e6..9eadead35f5 100644
34+
index 2c6e9684175..d36f458331b 100644
3535
--- a/build.gradle
3636
+++ b/build.gradle
3737
@@ -65,7 +65,6 @@ apply from: 'gradle/build-complete.gradle'

0 commit comments

Comments
 (0)