Skip to content

Commit ca9d3c5

Browse files
authored
Bump 'default' Solr version to 9.10.0 (#807)
This leaves a few vistigial bits of operator code that exist in support of 8.11. And this commit doesn't update our documentation to indicate that 8.11 is no longer supported. Those can be handled in a subsequent commit or PR. But otherwise this commit does everything necessary to make 9.10.0 the "default" and the version assumed by our docs. Resolves #806
1 parent a01bf95 commit ca9d3c5

14 files changed

Lines changed: 31 additions & 31 deletions

api/v1beta1/solrcloud_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const (
3737

3838
DefaultSolrReplicas = int32(3)
3939
DefaultSolrRepo = "library/solr"
40-
DefaultSolrVersion = "8.11"
40+
DefaultSolrVersion = "9.10.0"
4141
DefaultSolrJavaMem = "-Xms1g -Xmx2g"
4242
DefaultSolrOpts = ""
4343
DefaultSolrLogLevel = "INFO"

dev-docs/e2e-testing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ $ make e2e-tests TEST_SEED=89724023 SOLR_IMAGE=apache/solr-nightly:10.0.0-SNAPSH
4747
The default parallelism is `3`.
4848
- **SOLR_IMAGE** - The solr docker image label to use in the integration tests.
4949
It is recommended to use only supported versions for the Solr Operator version being tested.
50-
Default is `solr:8.11`.
50+
Default is `solr:9.10.0`.
5151
- **KUBERETES_VERSION** - A full Kubernetes version, starting with `v`, to use when creating the KinD Cluster.
5252
To find a list of all possible versions, check the [KinD Node Docker tags](https://hub.docker.com/r/kindest/node/tags).
5353
Default is `v1.26.6`.

docs/local_tutorial.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@ After inspecting the status of you Kube cluster, you should see a deployment for
122122
To start a Solr Cloud cluster, we will create a yaml that will tell the Solr Operator what version of Solr Cloud to run, and how many nodes, with how much memory etc.
123123

124124
```bash
125-
# Create a 3-node cluster v8.11 with 300m Heap each:
125+
# Create a 3-node cluster v9.10.0 with 300m Heap each:
126126
helm install example-solr apache-solr/solr --version 0.10.0-prerelease \
127-
--set image.tag=8.11 \
127+
--set image.tag=9.10.0 \
128128
--set solrOptions.javaMemory="-Xms300m -Xmx300m" \
129129
--set addressability.external.method=Ingress \
130130
--set addressability.external.domainName="ing.local.domain" \
@@ -207,13 +207,13 @@ By default, the helm chart does not set the `replicas` field, so it is safe to u
207207
So we wish to upgrade to a newer Solr version:
208208

209209
```bash
210-
# Take note of the current version, which is 8.11.2
210+
# Take note of the current version
211211
curl -s http://default-example-solrcloud.ing.local.domain/solr/admin/info/system | grep solr-i
212212
213213
# Update the solrCloud configuration with the new version, keeping all previous settings and the number of nodes set by the autoscaler.
214214
helm upgrade example-solr apache-solr/solr --version 0.10.0-prerelease \
215215
--reuse-values \
216-
--set image.tag=8.7
216+
--set image.tag=9.10.0
217217
218218
# Click the 'Show all details" button in Admin UI and start hitting the "Refresh" button
219219
# See how the operator upgrades one pod at a time. Solr version is in the 'node' column

example/test_solrcloud.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
storage: "5Gi"
2929
replicas: 3
3030
solrImage:
31-
tag: "8.11"
31+
tag: "9.10.0"
3232
solrJavaMem: "-Xms1g -Xmx3g"
3333
solrModules:
3434
- jaegertracer-configurator

example/test_solrcloud_backuprepos.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ metadata:
2020
spec:
2121
replicas: 1
2222
solrImage:
23-
tag: "8.11"
23+
tag: "9.10.0"
2424
backupRepositories:
2525
# "Volume" repositories store backup data in a Kubernetes volume.
2626
- name: "volume_repository_1"

example/test_solrcloud_private_repo.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ spec:
2121
replicas: 3
2222
solrImage:
2323
repository: myprivate-repo.jfrog.io/solr
24-
tag: "8.11"
24+
tag: "9.10.0"
2525
imagePullSecret: "k8s-docker-registry-secret"

example/test_solrcloud_toleration_example.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ metadata:
2020
spec:
2121
replicas: 1
2222
solrImage:
23-
tag: "8.11"
23+
tag: "9.10.0"
2424
customSolrKubeOptions:
2525
podOptions:
2626
nodeSelector:

example/test_solrprometheusexporter.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ spec:
2323
name: "example"
2424
numThreads: 4
2525
image:
26-
tag: "8.11"
26+
tag: "9.10.0"

hack/release/smoke_test/test_cluster.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Test the release candidate in a Kind cluster
3333
-i Solr Operator docker image to use (Optional, defaults to apache/solr-operator:<version>)
3434
-g GPG Key (fingerprint) used to sign the artifacts (Optional, if not provided then the helm chart will not be verified)
3535
-k Kubernetes Version to test with (full tag, e.g. v1.26.6) (Optional, defaults to a compatible version)
36-
-t Full solr image, or image tag (for the official Solr image), to test with (e.g. apache/solr-nightly:9.0.0, 8.11). (Optional, defaults to a compatible version)
36+
-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)
3737
EOF
3838
}
3939

@@ -77,7 +77,7 @@ if [[ -z "${KUBERNETES_VERSION:-}" ]]; then
7777
KUBERNETES_VERSION="v1.26.6"
7878
fi
7979
if [[ -z "${SOLR_IMAGE:-}" ]]; then
80-
SOLR_IMAGE="${SOLR_VERSION:-8.11}"
80+
SOLR_IMAGE="${SOLR_VERSION:-9.10.0}"
8181
fi
8282
if [[ "${SOLR_IMAGE}" != *":"* ]]; then
8383
SOLR_IMAGE="solr:${SOLR_IMAGE}"

helm/solr-operator/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ annotations:
114114
storage: "20Gi"
115115
replicas: 3
116116
solrImage:
117-
tag: 8.11
117+
tag: 9.10.0
118118
solrJavaMem: "-Xms4g -Xmx4g"
119119
customSolrKubeOptions:
120120
podOptions:
@@ -155,7 +155,7 @@ annotations:
155155
name: "example"
156156
numThreads: 4
157157
image:
158-
tag: 8.11
158+
tag: 9.10.0
159159
- apiVersion: solr.apache.org/v1beta1
160160
kind: SolrBackup
161161
metadata:

0 commit comments

Comments
 (0)