This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr-operator.git
The following commit(s) were added to refs/heads/main by this push:
new f494bd4 Bump 'default' Solr version to 9.11.0 (#869)
f494bd4 is described below
commit f494bd4d8215c24e5bf0b3b8e00ff37dd42618f3
Author: Jan Høydahl <[email protected]>
AuthorDate: Tue Oct 27 19:43:13 2026 +0100
Bump 'default' Solr version to 9.11.0 (#869)
---
api/v1beta1/solrcloud_types.go | 2 +-
dev-docs/e2e-testing.md | 2 +-
docs/modules/getting-started/pages/local-tutorial.adoc | 2 +-
docs/modules/upgrade-notes/pages/upgrade-notes.adoc | 11 ++++++-----
example/test_solrcloud.yaml | 2 +-
example/test_solrcloud_backuprepos.yaml | 2 +-
example/test_solrcloud_private_repo.yaml | 2 +-
example/test_solrcloud_toleration_example.yaml | 2 +-
example/test_solrprometheusexporter.yaml | 2 +-
hack/release/smoke_test/test_cluster.sh | 4 ++--
helm/solr-operator/Chart.yaml | 11 +++++++++--
helm/solr/Chart.yaml | 16 +++++++++++++---
helm/solr/README.md | 6 +++---
tests/e2e/suite_test.go | 2 +-
tests/scripts/manage_e2e_tests.sh | 2 +-
15 files changed, 43 insertions(+), 25 deletions(-)
diff --git a/api/v1beta1/solrcloud_types.go b/api/v1beta1/solrcloud_types.go
index 1893026..493d304 100644
--- a/api/v1beta1/solrcloud_types.go
+++ b/api/v1beta1/solrcloud_types.go
@@ -37,7 +37,7 @@ const (
DefaultSolrReplicas = int32(3)
DefaultSolrRepo = "library/solr"
- DefaultSolrVersion = "9.10.0"
+ DefaultSolrVersion = "9.11.0"
DefaultSolrJavaMem = "-Xms1g -Xmx2g"
DefaultSolrOpts = ""
DefaultSolrLogLevel = "INFO"
diff --git a/dev-docs/e2e-testing.md b/dev-docs/e2e-testing.md
index 7360fc2..ae10f90 100644
--- a/dev-docs/e2e-testing.md
+++ b/dev-docs/e2e-testing.md
@@ -47,7 +47,7 @@ $ make e2e-tests TEST_SEED=89724023
SOLR_IMAGE=apache/solr-nightly:10.0.0-SNAPSH
The default parallelism is `3`.
- **SOLR_IMAGE** - The solr docker image label to use in the integration tests.
It is recommended to use only supported versions for the Solr Operator
version being tested.
- Default is `solr:9.10.0`.
+ Default is `solr:9.11.0`.
- **KUBERETES_VERSION** - A full Kubernetes version, starting with `v`, to use
when creating the KinD Cluster.
To find a list of all possible versions, check the [KinD Node Docker
tags](https://hub.docker.com/r/kindest/node/tags).
Default is `v1.26.6`.
diff --git a/docs/modules/getting-started/pages/local-tutorial.adoc
b/docs/modules/getting-started/pages/local-tutorial.adoc
index c1da57b..49ff3f8 100644
--- a/docs/modules/getting-started/pages/local-tutorial.adoc
+++ b/docs/modules/getting-started/pages/local-tutorial.adoc
@@ -226,7 +226,7 @@ curl -s
http://default-example-solrcloud.ing.local.domain/solr/admin/info/system
# Update the solrCloud configuration with the new version, keeping all
previous settings and the number of nodes set by the autoscaler.
helm upgrade example-solr apache-solr/solr --version {operator-version} \
--reuse-values \
- --set image.tag=9.10.0
+ --set image.tag=9.11.0
# Click the 'Show all details" button in Admin UI and start hitting the
"Refresh" button
# See how the operator upgrades one pod at a time. Solr version is in the
'node' column
diff --git a/docs/modules/upgrade-notes/pages/upgrade-notes.adoc
b/docs/modules/upgrade-notes/pages/upgrade-notes.adoc
index e0d5a26..6a6d5f7 100644
--- a/docs/modules/upgrade-notes/pages/upgrade-notes.adoc
+++ b/docs/modules/upgrade-notes/pages/upgrade-notes.adoc
@@ -136,11 +136,12 @@ _Note that the Helm chart version does not contain a `v`
prefix, which the downl
=== v0.10.0
-* *Logging now defaults to JSON format*
-+
-The new default for CLI flag `--zap-devel` is now `false`, causing log
encoding to be `json` and log level to be `info`.
-There is a new helm value `development` that can be set to `true` to switch to
`console` encoding and `debug` level
-that was the default in previous versions.
+* The default Solr version has been upgraded from `8.11` to `9.11.0`.
+This only affects new resources, as default versions are hard-written to the
resources immediately.
+Note that Solr `>=9.10` will not start a node older than any Solr node already
running in the same cluster, so a rolling downgrade of Solr requires setting
the `SOLR_CLOUD_DOWNGRADE_ENABLED` envVar to `true` on the pods.
+
+* Operator logs now default to `json` encoding at `info` level.
+Set the new helm value `development` to `true` (CLI flag `--zap-devel`) for
the previous `console` encoding at `debug` level.
=== v0.8.0
diff --git a/example/test_solrcloud.yaml b/example/test_solrcloud.yaml
index 6e348cc..6d22ed6 100644
--- a/example/test_solrcloud.yaml
+++ b/example/test_solrcloud.yaml
@@ -28,7 +28,7 @@ spec:
storage: "5Gi"
replicas: 3
solrImage:
- tag: "9.10.0"
+ tag: "9.11.0"
solrJavaMem: "-Xms1g -Xmx3g"
solrModules:
- jaegertracer-configurator
diff --git a/example/test_solrcloud_backuprepos.yaml
b/example/test_solrcloud_backuprepos.yaml
index 0213abf..5901fa8 100644
--- a/example/test_solrcloud_backuprepos.yaml
+++ b/example/test_solrcloud_backuprepos.yaml
@@ -20,7 +20,7 @@ metadata:
spec:
replicas: 1
solrImage:
- tag: "9.10.0"
+ tag: "9.11.0"
backupRepositories:
# "Volume" repositories store backup data in a Kubernetes volume.
- name: "volume_repository_1"
diff --git a/example/test_solrcloud_private_repo.yaml
b/example/test_solrcloud_private_repo.yaml
index 73ef1cd..d8a3905 100644
--- a/example/test_solrcloud_private_repo.yaml
+++ b/example/test_solrcloud_private_repo.yaml
@@ -21,5 +21,5 @@ spec:
replicas: 3
solrImage:
repository: myprivate-repo.jfrog.io/solr
- tag: "9.10.0"
+ tag: "9.11.0"
imagePullSecret: "k8s-docker-registry-secret"
diff --git a/example/test_solrcloud_toleration_example.yaml
b/example/test_solrcloud_toleration_example.yaml
index fb4fe6f..e33aa34 100644
--- a/example/test_solrcloud_toleration_example.yaml
+++ b/example/test_solrcloud_toleration_example.yaml
@@ -20,7 +20,7 @@ metadata:
spec:
replicas: 1
solrImage:
- tag: "9.10.0"
+ tag: "9.11.0"
customSolrKubeOptions:
podOptions:
nodeSelector:
diff --git a/example/test_solrprometheusexporter.yaml
b/example/test_solrprometheusexporter.yaml
index 69adc8b..c550918 100644
--- a/example/test_solrprometheusexporter.yaml
+++ b/example/test_solrprometheusexporter.yaml
@@ -23,4 +23,4 @@ spec:
name: "example"
numThreads: 4
image:
- tag: "9.10.0"
+ tag: "9.11.0"
diff --git a/hack/release/smoke_test/test_cluster.sh
b/hack/release/smoke_test/test_cluster.sh
index 4af018e..112c8d0 100755
--- a/hack/release/smoke_test/test_cluster.sh
+++ b/hack/release/smoke_test/test_cluster.sh
@@ -33,7 +33,7 @@ Test the release candidate in a Kind cluster
-i Solr Operator docker image to use (Optional, defaults to
apache/solr-operator:<version>)
-g GPG Key (fingerprint) used to sign the artifacts (Optional, if not
provided then the helm chart will not be verified)
-k Kubernetes Version to test with (full tag, e.g. v1.26.6) (Optional,
defaults to a compatible version)
- -t Full solr image, or image tag (for the official Solr image), to test
with (e.g. apache/solr-nightly:9.0.0, 9.10.0). (Optional, defaults to a
compatible version)
+ -t Full solr image, or image tag (for the official Solr image), to test
with (e.g. apache/solr-nightly:9.0.0, 9.11.0). (Optional, defaults to a
compatible version)
-o OCI registry to install the Helm charts from, e.g.
oci://ghcr.io/apache/solr-operator/helm (Optional)
Use this after a release has been published, to smoke test the
published OCI artifacts.
The CRDs are still taken from LOCATION, since they are not part of the
OCI artifacts.
@@ -82,7 +82,7 @@ if [[ -z "${KUBERNETES_VERSION:-}" ]]; then
KUBERNETES_VERSION="v1.26.6"
fi
if [[ -z "${SOLR_IMAGE:-}" ]]; then
- SOLR_IMAGE="${SOLR_VERSION:-9.10.0}"
+ SOLR_IMAGE="${SOLR_VERSION:-9.11.0}"
fi
if [[ "${SOLR_IMAGE}" != *":"* ]]; then
SOLR_IMAGE="solr:${SOLR_IMAGE}"
diff --git a/helm/solr-operator/Chart.yaml b/helm/solr-operator/Chart.yaml
index 1088131..a4ea21f 100644
--- a/helm/solr-operator/Chart.yaml
+++ b/helm/solr-operator/Chart.yaml
@@ -138,6 +138,13 @@ annotations:
url: https://github.com/apache/solr-operator/issues/535
- name: GitHub PR
url: https://github.com/apache/solr-operator/pull/571
+ - kind: changed
+ description: The default Solr version (`DefaultSolrVersion`) is now
9.11.0, up from 9.10.0, so newly created SolrClouds without an image tag start
on a Solr version carrying the fixes for CVE-2026-22022, CVE-2026-22444 and
CVE-2025-66516. Existing clusters are unaffected; the operator writes the
resolved tag into the spec on first reconcile, so an operator upgrade never
changes a running cluster's Solr version
+ links:
+ - name: Solr 9.11.0 Release Notes
+ url: https://solr.apache.org/docs/9_11_0/changes/Changes.html
+ - name: Solr Security News
+ url: https://solr.apache.org/security-news.html
artifacthub.io/images: |
- name: solr-operator
image: apache/solr-operator:v0.10.0-prerelease
@@ -173,7 +180,7 @@ annotations:
storage: "20Gi"
replicas: 3
solrImage:
- tag: 9.10.0
+ tag: 9.11.0
solrJavaMem: "-Xms4g -Xmx4g"
customSolrKubeOptions:
podOptions:
@@ -214,7 +221,7 @@ annotations:
name: "example"
numThreads: 4
image:
- tag: 9.10.0
+ tag: 9.11.0
- apiVersion: solr.apache.org/v1beta1
kind: SolrBackup
metadata:
diff --git a/helm/solr/Chart.yaml b/helm/solr/Chart.yaml
index 29a4baf..4badee3 100644
--- a/helm/solr/Chart.yaml
+++ b/helm/solr/Chart.yaml
@@ -16,7 +16,7 @@ apiVersion: v2
name: solr
description: A SolrCloud cluster running on Kubernetes via the Solr Operator
version: 0.10.0-prerelease
-appVersion: 9.10.0
+appVersion: 9.11.0
kubeVersion: ">= 1.22.0-0"
home: https://solr.apache.org
sources:
@@ -60,7 +60,17 @@ annotations:
url: https://github.com/apache/solr-operator/issues/338
- name: Github PR
url: https://github.com/apache/solr-operator/pull/832
- artifacthub.io/containsSecurityUpdates: "false"
+ - kind: changed
+ description: The default Solr version is now 9.11.0, up from 9.10.0.
Newly created SolrClouds that do not set `image.tag` start on 9.11.0; existing
clusters keep the tag already written into their spec
+ links:
+ - name: Solr 9.11.0 Release Notes
+ url: https://solr.apache.org/docs/9_11_0/changes/Changes.html
+ - kind: security
+ description: Solr 9.11.0 carries the fixes for CVE-2026-22022,
CVE-2026-22444 and CVE-2025-66516, all of which affect Solr 9.10.0 and earlier.
Existing SolrClouds are not upgraded automatically; set `image.tag` to 9.11.0
to pick the fixes up
+ links:
+ - name: Solr Security News
+ url: https://solr.apache.org/security-news.html
+ artifacthub.io/containsSecurityUpdates: "true"
artifacthub.io/recommendations: |
- url: https://artifacthub.io/packages/helm/apache-solr/solr-operator
artifacthub.io/links: |
@@ -74,7 +84,7 @@ annotations:
url: https://solr.apache.org/operator/resources#tutorials
artifacthub.io/images: |
- name: solr
- image: solr:9.10.0
+ image: solr:9.11.0
whitelisted: true
artifacthub.io/signKey: |
fingerprint: <fingerprint>
diff --git a/helm/solr/README.md b/helm/solr/README.md
index 52eaa4c..02bce33 100644
--- a/helm/solr/README.md
+++ b/helm/solr/README.md
@@ -36,7 +36,7 @@ There may be breaking changes between the version you are
using and the version
To install a SolrCloud for the first time in your cluster, you can use the
latest version or a specific version, run with the following commands:
```bash
-helm install example apache-solr/solr --version 0.10.0-prerelease --set
image.tag=9.10.0
+helm install example apache-solr/solr --version 0.10.0-prerelease --set
image.tag=9.11.0
```
The command deploys a SolrCloud object on the Kubernetes cluster with the
default configuration.
@@ -50,7 +50,7 @@ _Note that the Helm chart version does not contain a `v`
prefix, which the Solr
If you are upgrading your SolrCloud deployment, you should always use a
specific version of the chart and upgrade **after [upgrading the Solr
Operator](https://artifacthub.io/packages/helm/apache-solr/solr-operator#upgrading-the-solr-operator)
to the same version**:
```bash
-helm upgrade example apache-solr/solr --version 0.10.0-prerelease
--reuse-values --set image.tag=9.10.0
+helm upgrade example apache-solr/solr --version 0.10.0-prerelease
--reuse-values --set image.tag=9.11.0
```
The upgrade will be done according to the `upgradeStrategy.method` chosen in
the values.
@@ -82,7 +82,7 @@ Descriptions on how to use these options can be found in the
[SolrCloud document
| nameOverride | string | `""` | |
| replicas | int | `3` | The number of Solr pods to run in the Solr Cloud. If
you want to use autoScaling, do not set this field. |
| image.repository | string | `"solr"` | The repository of the Solr image |
-| image.tag | string | `"9.10.0"` | The tag/version of Solr to run |
+| image.tag | string | `"9.11.0"` | The tag/version of Solr to run |
| image.pullPolicy | string | | PullPolicy for the Solr image, defaults to the
empty Pod behavior |
| image.imagePullSecret | string | | PullSecret for the Solr image |
| busyBoxImage.repository | string | `"busybox"` | The repository of the
BusyBox image |
diff --git a/tests/e2e/suite_test.go b/tests/e2e/suite_test.go
index 053ca6c..6dd5e77 100644
--- a/tests/e2e/suite_test.go
+++ b/tests/e2e/suite_test.go
@@ -76,7 +76,7 @@ var (
logger logr.Logger
defaultOperatorImage = "apache/solr-operator:" + version.FullVersion()
- defaultSolrImage = "solr:9.10.0"
+ defaultSolrImage = "solr:9.11.0"
operatorImage = getEnvWithDefault(operatorImageEnv,
defaultOperatorImage)
solrImage = getEnvWithDefault(solrImageEnv, defaultSolrImage)
diff --git a/tests/scripts/manage_e2e_tests.sh
b/tests/scripts/manage_e2e_tests.sh
index 12fb282..6c73326 100755
--- a/tests/scripts/manage_e2e_tests.sh
+++ b/tests/scripts/manage_e2e_tests.sh
@@ -77,7 +77,7 @@ if [[ -z "${KUBERNETES_VERSION:-}" ]]; then
KUBERNETES_VERSION="v1.33.7"
fi
if [[ -z "${SOLR_IMAGE:-}" ]]; then
- SOLR_IMAGE="${SOLR_VERSION:-9.10.0}"
+ SOLR_IMAGE="${SOLR_VERSION:-9.11.0}"
fi
if [[ "${SOLR_IMAGE}" != *":"* ]]; then
SOLR_IMAGE="solr:${SOLR_IMAGE}"
