merge main

adwk67 · adwk67 · commit 095ff3aab68a · 2026-07-22T17:10:35.000+02:00
diff --git a/.github/ISSUE_TEMPLATE/new_version.md b/.github/ISSUE_TEMPLATE/new_version.md
diff --git a/.github/ISSUE_TEMPLATE/normal-issue.md b/.github/ISSUE_TEMPLATE/normal-issue.md
diff --git a/.github/PULL_REQUEST_TEMPLATE/pre-release-rust-deps.md b/.github/PULL_REQUEST_TEMPLATE/pre-release-rust-deps.md
@@ -32,5 +32,4 @@ Part of <https://github.com/stackabletech/issues/issues/TRACKING_ISSUE>
 ### Bump Rust Dependencies
 
 - [ ] Bump `stackable-operator` and friends
-- [ ] Bump `product-config`
 - [ ] Bump all other dependencies
diff --git a/.github/workflows/general_daily_security.yml b/.github/workflows/general_daily_security.yml
@@ -20,5 +20,10 @@ jobs:
         with:
           persist-credentials: false
       - uses: rustsec/audit-check@69366f33c96575abad1ee0dba8212993eecbe998 # v2.0.0
+        # Build against stable because cargo-audit sometimes depends on things
+        # that require a newer Rust version than our pinned toolchain. This does
+        # not influence the result, so it should be safe.
+        env:
+          RUSTUP_TOOLCHAIN: stable
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.readme/partials/main.md.j2 b/.readme/partials/main.md.j2
@@ -1,3 +1,10 @@
+> [!WARNING]
+> **Stackable support for Apache Druid is deprecated and will be removed from the Stackable Data Platform (SDP).**
+> This concerns only the Apache Druid integration in the SDP (this operator); Apache Druid itself is an independent, actively maintained project and is not affected.
+> Stackable's support is deprecated as of SDP 26.7 and is planned for removal in SDP 27.11; SDP 27.7 is planned to be the last release that includes it.
+> We have taken this decision because we have not seen adoption of Apache Druid among our customers.
+> There is no direct replacement within the SDP. If you rely on this integration — or would be willing to fund its continued development — please contact us via our [homepage](https://stackable.tech/) or the [Discussions forum](https://github.com/orgs/stackabletech/discussions).
+
 This is a Kubernetes operator to manage [Apache Druid](https://druid.apache.org/) ensembles.
 
 {% filter trim %}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -37,6 +37,13 @@ All notable changes to this project will be documented in this file.
 - BREAKING: Removed product-config machinery. This is a breaking change in terms of configuration.
   Users relying on the product-config `properties.yaml` file have to set these properties via the CRD ([#830]).
 
+### Deprecated
+
+- Stackable's support for Apache Druid is deprecated and is planned for removal from the SDP in SDP 27.11.
+  This concerns only the Apache Druid integration in the SDP (this operator); Apache Druid itself is not affected.
+  SDP 27.7 is planned to be the last release that includes Apache Druid.
+  We have not seen adoption of Apache Druid among our customers; if you rely on it, please [contact us](https://stackable.tech/) ([#853]).
+
 ### Deleted
 
 - Remove all metadata storage related properties from product config ([#814]).
@@ -51,6 +58,7 @@ All notable changes to this project will be documented in this file.
 [#830]: https://github.com/stackabletech/druid-operator/pull/830
 [#832]: https://github.com/stackabletech/druid-operator/pull/832
 [#840]: https://github.com/stackabletech/druid-operator/pull/840
+[#853]: https://github.com/stackabletech/druid-operator/pull/853
 
 ## [26.3.0] - 2026-03-16
 
diff --git a/Makefile b/Makefile
@@ -28,22 +28,15 @@ docker-build:
 	docker build --force-rm --build-arg VERSION=${VERSION} -t "${OCI_REGISTRY_HOSTNAME}/${OCI_REGISTRY_PROJECT_IMAGES}/${OPERATOR_NAME}:${VERSION}-${ARCH}" -f docker/Dockerfile .
 
 ## Chart related targets
-compile-chart: version crds config
+compile-chart: version crds
 
 chart-clean:
-	rm -rf "deploy/helm/${OPERATOR_NAME}/configs"
 	rm -rf "deploy/helm/${OPERATOR_NAME}/crds"
 
 version:
 	cat "deploy/helm/${OPERATOR_NAME}/Chart.yaml" | yq ".version = \"${VERSION}\" | .appVersion = \"${VERSION}\"" > "deploy/helm/${OPERATOR_NAME}/Chart.yaml.new"
 	mv "deploy/helm/${OPERATOR_NAME}/Chart.yaml.new" "deploy/helm/${OPERATOR_NAME}/Chart.yaml"
 
-config:
-	if [ -d "deploy/config-spec/" ]; then\
-		mkdir -p "deploy/helm/${OPERATOR_NAME}/configs";\
-		cp -r deploy/config-spec/* "deploy/helm/${OPERATOR_NAME}/configs";\
-	fi
-
 # We generate a crds.yaml, so that the effect of code changes are visible.
 # The operator will take care of the CRD rollout itself.
 crds:
diff --git a/README.md b/README.md
@@ -12,6 +12,13 @@
 
 [Documentation](https://docs.stackable.tech/home/stable/druid) | [Stackable Data Platform](https://stackable.tech/) | [Platform Docs](https://docs.stackable.tech/) | [Discussions](https://github.com/orgs/stackabletech/discussions) | [Discord](https://discord.gg/7kZ3BNnCAF)
 
+> [!WARNING]
+> **Stackable support for Apache Druid is deprecated and will be removed from the Stackable Data Platform (SDP).**
+> This concerns only the Apache Druid integration in the SDP (this operator); Apache Druid itself is an independent, actively maintained project and is not affected.
+> Stackable's support is deprecated as of SDP 26.7 and is planned for removal in SDP 27.11; SDP 27.7 is planned to be the last release that includes it.
+> We have taken this decision because we have not seen adoption of Apache Druid among our customers.
+> There is no direct replacement within the SDP. If you rely on this integration — or would be willing to fund its continued development — please contact us via our [homepage](https://stackable.tech/) or the [Discussions forum](https://github.com/orgs/stackabletech/discussions).
+
 This is a Kubernetes operator to manage [Apache Druid](https://druid.apache.org/) ensembles.
 
 <!-- markdownlint-disable MD041 MD051 -->
diff --git a/default.nix b/default.nix
@@ -151,12 +151,6 @@ rec {
       pkgsTarget.util-linuxMinimal
     ];
     config = {
-      Env =
-        let
-          fileRefVars = {
-            PRODUCT_CONFIG = deploy/config-spec/properties.yaml;
-          };
-        in lib.concatLists (lib.mapAttrsToList (env: path: lib.optional (lib.pathExists path) "${env}=${path}") fileRefVars);
       Entrypoint = [ entrypoint ];
       Cmd = [ "run" ];
     };
diff --git a/deploy/config-spec/properties.yaml b/deploy/config-spec/properties.yaml
diff --git a/deploy/helm/druid-operator/configs/properties.yaml b/deploy/helm/druid-operator/configs/properties.yaml
diff --git a/deploy/helm/druid-operator/templates/configmap.yaml b/deploy/helm/druid-operator/templates/configmap.yaml
diff --git a/deploy/helm/druid-operator/templates/deployment.yaml b/deploy/helm/druid-operator/templates/deployment.yaml
@@ -16,7 +16,6 @@ spec:
     metadata:
       annotations:
         internal.stackable.tech/image: {{ include "operator.image" . }}
-        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
         {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
@@ -41,9 +40,6 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
-          volumeMounts:
-            - mountPath: /etc/stackable/{{ include "operator.appname" . }}/config-spec
-              name: config-spec
           env:
             # The following env vars are passed as clap (think CLI) arguments to the operator.
             # They are picked up by clap using the structs defied in the operator.
@@ -88,10 +84,6 @@ spec:
 
             {{- include "telemetry.envVars" . | nindent 12 }}
             {{- include "maintenance.envVars" . | nindent 12 }}
-      volumes:
-        - name: config-spec
-          configMap:
-            name: {{ include "operator.fullname" . }}-configmap
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -191,8 +191,6 @@ COPY LICENSE /licenses/LICENSE
 
 COPY --from=builder --chown=${STACKABLE_USER_UID}:0 /app/* /usr/local/bin/
 
-COPY deploy/config-spec/properties.yaml /etc/stackable/druid-operator/config-spec/properties.yaml
-
 USER ${STACKABLE_USER_UID}
 
 ENTRYPOINT ["stackable-druid-operator"]
diff --git a/docs/modules/druid/examples/getting_started/druid.yaml b/docs/modules/druid/examples/getting_started/druid.yaml
@@ -5,7 +5,7 @@ metadata:
   name: simple-druid
 spec:
   image:
-    productVersion: 35.0.1
+    productVersion: 37.0.0
   clusterConfig:
     zookeeperConfigMapName: simple-druid-znode
     deepStorage:
diff --git a/docs/modules/druid/examples/getting_started/druid.yaml.j2 b/docs/modules/druid/examples/getting_started/druid.yaml.j2
@@ -5,7 +5,7 @@ metadata:
   name: simple-druid
 spec:
   image:
-    productVersion: 35.0.1
+    productVersion: 37.0.0
   clusterConfig:
     zookeeperConfigMapName: simple-druid-znode
     deepStorage:
diff --git a/docs/modules/druid/examples/getting_started/hdfs.yaml b/docs/modules/druid/examples/getting_started/hdfs.yaml
@@ -5,7 +5,7 @@ metadata:
   name: simple-hdfs
 spec:
   image:
-    productVersion: 3.4.2
+    productVersion: 3.5.0
   clusterConfig:
     dfsReplication: 1
     zookeeperConfigMapName: simple-hdfs-znode
diff --git a/docs/modules/druid/examples/getting_started/hdfs.yaml.j2 b/docs/modules/druid/examples/getting_started/hdfs.yaml.j2
@@ -5,7 +5,7 @@ metadata:
   name: simple-hdfs
 spec:
   image:
-    productVersion: 3.4.2
+    productVersion: 3.5.0
   clusterConfig:
     dfsReplication: 1
     zookeeperConfigMapName: simple-hdfs-znode
diff --git a/docs/modules/druid/pages/index.adoc b/docs/modules/druid/pages/index.adoc
@@ -15,6 +15,25 @@
 * {feature-tracker}[Feature Tracker {external-link-icon}^]
 * {crd}[CRD documentation {external-link-icon}^]
 
+[WARNING]
+.Stackable support for Apache Druid is deprecated
+====
+Stackable's support for Apache Druid is deprecated as of SDP 26.7 and is planned for removal in SDP 27.11.
+This concerns only the Apache Druid integration in the Stackable Data Platform (SDP) — that is, this operator.
+Apache Druid itself is an independent, actively maintained project and is not affected; only its inclusion in the SDP is being discontinued.
+We have taken this decision because we have not seen adoption of Apache Druid among our customers.
+
+The planned timeline is:
+
+* SDP 26.7 ships Apache Druid 37.0.0, the final LTS version we plan to provide, with approximately one year of support.
+* SDP 27.7 is planned to be the last release that includes Apache Druid.
+* Apache Druid is planned to be removed in SDP 27.11.
+
+There is no direct replacement for Apache Druid within the SDP.
+If you rely on Apache Druid, please contact us via our https://stackable.tech/[homepage] or the https://github.com/orgs/stackabletech/discussions[Discussions forum] to discuss your options.
+If you are willing to fund its continued development and support, we are open to reconsidering this decision.
+====
+
 The Stackable operator for Apache Druid deploys and manages {druid}[Apache Druid] clusters on Kubernetes.
 Apache Druid is an open-source, distributed data store designed to quickly process large amounts of data in real-time.
 It enables users to ingest, store, and query massive amounts of data in real-time, a great tool for handling high-volume data processing and analysis.
diff --git a/docs/modules/druid/partials/supported-versions.adoc b/docs/modules/druid/partials/supported-versions.adoc
@@ -2,6 +2,13 @@
 // This is a separate file, since it is used by both the direct Druid documentation, and the overarching
 // Stackable Platform documentation.
 
+[NOTE]
+====
+Stackable's support for Apache Druid is deprecated and is planned for removal from the SDP in SDP 27.11.
+The last SDP release to include Apache Druid is planned to be 27.7.
+Apache Druid itself is not affected; only its inclusion in the SDP is being discontinued.
+====
+
 - 37.0.0 (LTS)
 - 35.0.1 (Deprecated)
 - 30.0.1 (Deprecated)
