This is an automated email from the ASF dual-hosted git repository.
houston 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 a48cce5 Change default Solr version to 8.11 (#388)
a48cce5 is described below
commit a48cce506fa4e6b541e0cd3aaddb401ada49fd7b
Author: Houston Putman <[email protected]>
AuthorDate: Tue Jan 4 17:27:49 2022 -0500
Change default Solr version to 8.11 (#388)
---
api/v1beta1/solrcloud_types.go | 2 +-
docs/upgrade-notes.md | 7 ++++++-
helm/solr-operator/Chart.yaml | 26 ++++++--------------------
helm/solr/Chart.yaml | 11 +++++++++--
helm/solr/README.md | 6 +++---
5 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/api/v1beta1/solrcloud_types.go b/api/v1beta1/solrcloud_types.go
index eb37648..f773f6f 100644
--- a/api/v1beta1/solrcloud_types.go
+++ b/api/v1beta1/solrcloud_types.go
@@ -34,7 +34,7 @@ const (
DefaultSolrReplicas = int32(3)
DefaultSolrRepo = "library/solr"
- DefaultSolrVersion = "8.9"
+ DefaultSolrVersion = "8.11"
DefaultSolrJavaMem = "-Xms1g -Xmx2g"
DefaultSolrOpts = ""
DefaultSolrLogLevel = "INFO"
diff --git a/docs/upgrade-notes.md b/docs/upgrade-notes.md
index 770beb2..bd1b0ab 100644
--- a/docs/upgrade-notes.md
+++ b/docs/upgrade-notes.md
@@ -105,6 +105,11 @@ _Note that the Helm chart version does not contain a `v`
prefix, which the downl
## Upgrade Warnings and Notes
+### v0.6.0
+- The default Solr version for the `SolrCloud` and `SolrPrometheusExporter`
resources has been upgraded from `8.9` to `8.11`.
+ This will not affect any existing resources, as default versions are
hard-written to the resources immediately.
+ Only new resources created after the Solr Operator is upgraded to `v0.6.0`
will be affected.
+
### v0.5.0
- Due to the deprecation and removal of `networking.k8s.io/v1beta1` in
Kubernetes v1.22, `networking.k8s.io/v1` will be used for Ingresses.
@@ -150,7 +155,7 @@ _Note that the Helm chart version does not contain a `v`
prefix, which the downl
**Note**: The old option takes a _string_ `"true"`/`"false"`, while the new
option takes a _boolean_ `true`/`false`.
- The default Solr version for `SolrCloud` and `SolrPrometheusExporter`
resources has been upgraded from `7.7.0` to `8.9`.
- This will not effect any existing resources, as default versions are
hard-written to the resources immediately.
+ This will not affect any existing resources, as default versions are
hard-written to the resources immediately.
Only new resources created after the Solr Operator is upgraded to `v0.4.0`
will be affected.
- In previous versions of the Solr Operator, the provided Zookeeper instances
could only use Persistent Storage.
diff --git a/helm/solr-operator/Chart.yaml b/helm/solr-operator/Chart.yaml
index 2f08db6..4a96c67 100644
--- a/helm/solr-operator/Chart.yaml
+++ b/helm/solr-operator/Chart.yaml
@@ -54,16 +54,13 @@ annotations:
# Add change log for a single release here.
# Allowed syntax is described at:
https://artifacthub.io/docs/topics/annotations/helm/#example
artifacthub.io/changes: |
- - kind: added
- description: Addition 1
- links:
- - name: Github Issue
- url: https://github.com/issue-url
- kind: changed
- description: Change 2
+ description: Upgrade the default Solr version to 8.11
links:
+ - name: Github Issue
+ url: https://github.com/apache/solr-operator/issues/387
- name: Github PR
- url: https://github.com/pr-url
+ url: https://github.com/apache/solr-operator/pull/388
artifacthub.io/images: |
- name: solr-operator
image: apache/solr-operator:v0.6.0-prerelease
@@ -99,7 +96,7 @@ annotations:
storage: "20Gi"
replicas: 3
solrImage:
- tag: 8.7.0
+ tag: 8.11
solrJavaMem: "-Xms4g -Xmx4g"
customSolrKubeOptions:
podOptions:
@@ -140,18 +137,7 @@ annotations:
name: "example"
numThreads: 4
image:
- tag: 8.7.0
- - apiVersion: solr.apache.org/v1beta1
- kind: SolrPrometheusExporter
- metadata:
- name: example
- spec:
- solrReference:
- cloud:
- name: "example"
- numThreads: 4
- image:
- tag: 8.7.0
+ tag: 8.11
- apiVersion: solr.apache.org/v1beta1
kind: SolrBackup
metadata:
diff --git a/helm/solr/Chart.yaml b/helm/solr/Chart.yaml
index bff59bb..1726f08 100644
--- a/helm/solr/Chart.yaml
+++ b/helm/solr/Chart.yaml
@@ -17,7 +17,7 @@ apiVersion: v2
name: solr
description: A SolrCloud cluser running on Kubernetes via the Solr Operator
version: 0.6.0-prerelease
-appVersion: 8.9.0
+appVersion: 8.11.1
kubeVersion: ">= 1.19.0-0"
home: https://solr.apache.org
sources:
@@ -40,6 +40,13 @@ annotations:
# Add change log for a single release here.
# Allowed syntax is described at:
https://artifacthub.io/docs/topics/annotations/helm/#example
artifacthub.io/changes: |
+ - kind: changed
+ description: Upgrade the default Solr version to 8.11
+ links:
+ - name: Github Issue
+ url: https://github.com/apache/solr-operator/issues/387
+ - name: Github PR
+ url: https://github.com/apache/solr-operator/pull/388
- kind: fixed
description: Fixed Helm chart value "zk.externalAddress"
links:
@@ -61,7 +68,7 @@ annotations:
url: https://solr.apache.org/operator/resources#tutorials
artifacthub.io/images: |
- name: solr
- image: solr:8.9
+ image: solr:8.11
whitelisted: true
artifacthub.io/signKey: |
fingerprint: <fingerprint>
diff --git a/helm/solr/README.md b/helm/solr/README.md
index 5ae2af5..176d772 100644
--- a/helm/solr/README.md
+++ b/helm/solr/README.md
@@ -38,7 +38,7 @@ There may be breaking changes between the version you are
using and the version
To install the Solr Operator 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.6.0-prerelease --set
image.tag=8.8.0
+helm install example apache-solr/solr --version 0.6.0-prerelease --set
image.tag=8.8
```
The command deploys a SolrCloud object on the Kubernetes cluster with the
default configuration.
@@ -52,7 +52,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.6.0-prerelease
--reuse-values --set image.tag=8.9.0
+helm upgrade example apache-solr/solr --version 0.6.0-prerelease
--reuse-values --set image.tag=8.11
```
The upgrade will be done according to the `upgradeStrategy.method` chosen in
the values.
@@ -84,7 +84,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 | `"8.9"` | The tag/version of Solr to run |
+| image.tag | string | `"8.11"` | 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 |