This is an automated email from the ASF dual-hosted git repository. gerlowskija pushed a commit to branch release-0.9 in repository https://gitbox.apache.org/repos/asf/solr-operator.git
commit 9e424308cd175b3defb882d2c8b3f4b818407cbb Author: Jason Gerlowski <[email protected]> AuthorDate: Tue Mar 25 11:11:34 2025 -0400 Add next patch version v0.9.2 --- config/crd/bases/solr.apache.org_solrbackups.yaml | 2 +- config/crd/bases/solr.apache.org_solrclouds.yaml | 2 +- .../solr.apache.org_solrprometheusexporters.yaml | 2 +- docs/local_tutorial.md | 8 ++-- docs/running-the-operator.md | 4 +- docs/upgrade-notes.md | 4 +- helm/solr-operator/Chart.yaml | 47 +++++----------------- helm/solr-operator/README.md | 10 ++--- helm/solr-operator/crds/crds.yaml | 6 +-- helm/solr-operator/values.yaml | 2 +- helm/solr/Chart.yaml | 16 ++++++-- helm/solr/README.md | 4 +- version/version.go | 4 +- 13 files changed, 47 insertions(+), 64 deletions(-) diff --git a/config/crd/bases/solr.apache.org_solrbackups.yaml b/config/crd/bases/solr.apache.org_solrbackups.yaml index d8c2a2f..f64a1b5 100644 --- a/config/crd/bases/solr.apache.org_solrbackups.yaml +++ b/config/crd/bases/solr.apache.org_solrbackups.yaml @@ -17,7 +17,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - operator.solr.apache.org/version: v0.9.1 + operator.solr.apache.org/version: v0.9.2-prerelease argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.16.4 name: solrbackups.solr.apache.org diff --git a/config/crd/bases/solr.apache.org_solrclouds.yaml b/config/crd/bases/solr.apache.org_solrclouds.yaml index 4f4cda6..1194c58 100644 --- a/config/crd/bases/solr.apache.org_solrclouds.yaml +++ b/config/crd/bases/solr.apache.org_solrclouds.yaml @@ -17,7 +17,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - operator.solr.apache.org/version: v0.9.1 + operator.solr.apache.org/version: v0.9.2-prerelease argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.16.4 name: solrclouds.solr.apache.org diff --git a/config/crd/bases/solr.apache.org_solrprometheusexporters.yaml b/config/crd/bases/solr.apache.org_solrprometheusexporters.yaml index 8f435f3..30192a0 100644 --- a/config/crd/bases/solr.apache.org_solrprometheusexporters.yaml +++ b/config/crd/bases/solr.apache.org_solrprometheusexporters.yaml @@ -17,7 +17,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - operator.solr.apache.org/version: v0.9.1 + operator.solr.apache.org/version: v0.9.2-prerelease argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.16.4 name: solrprometheusexporters.solr.apache.org diff --git a/docs/local_tutorial.md b/docs/local_tutorial.md index a70d1c4..0e9b1f9 100644 --- a/docs/local_tutorial.md +++ b/docs/local_tutorial.md @@ -90,9 +90,9 @@ This will install the [Zookeeper Operator](https://github.com/pravega/zookeeper- ```bash # Install the Solr & Zookeeper CRDs -$ kubectl create -f https://solr.apache.org/operator/downloads/crds/v0.9.1/all-with-dependencies.yaml +$ kubectl create -f https://solr.apache.org/operator/downloads/crds/v0.9.2-prerelease/all-with-dependencies.yaml # Install the Solr operator and Zookeeper Operator -$ helm install solr-operator apache-solr/solr-operator --version 0.9.1 +$ helm install solr-operator apache-solr/solr-operator --version 0.9.2-prerelease ``` _Note that the Helm chart version does not contain a `v` prefix, which the downloads version does. The Helm chart version is the only part of the Solr Operator release that does not use the `v` prefix._ @@ -123,7 +123,7 @@ To start a Solr Cloud cluster, we will create a yaml that will tell the Solr Ope ```bash # Create a 3-node cluster v8.11 with 300m Heap each: -helm install example-solr apache-solr/solr --version 0.9.1 \ +helm install example-solr apache-solr/solr --version 0.9.2-prerelease \ --set image.tag=8.11 \ --set solrOptions.javaMemory="-Xms300m -Xmx300m" \ --set addressability.external.method=Ingress \ @@ -211,7 +211,7 @@ So we wish to upgrade to a newer Solr version: curl -s http://default-example-solrcloud.ing.local.domain/solr/admin/info/system | grep solr-i # 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 0.9.1 \ +helm upgrade example-solr apache-solr/solr --version 0.9.2-prerelease \ --reuse-values \ --set image.tag=8.7 diff --git a/docs/running-the-operator.md b/docs/running-the-operator.md index 256c358..bb594cd 100644 --- a/docs/running-the-operator.md +++ b/docs/running-the-operator.md @@ -38,8 +38,8 @@ Next, install the Solr Operator chart. Note this is using Helm v3, use the offic This will install the [Zookeeper Operator](https://github.com/pravega/zookeeper-operator) by default. ```bash -$ kubectl create -f https://solr.apache.org/operator/downloads/crds/v0.9.1/all-with-dependencies.yaml -$ helm install solr-operator apache-solr/solr-operator --version 0.9.1 +$ kubectl create -f https://solr.apache.org/operator/downloads/crds/v0.9.2-prerelease/all-with-dependencies.yaml +$ helm install solr-operator apache-solr/solr-operator --version 0.9.2-prerelease ``` _Note that the Helm chart version does not contain a `v` prefix, which the downloads version does. The Helm chart version is the only part of the Solr Operator release that does not use the `v` prefix._ diff --git a/docs/upgrade-notes.md b/docs/upgrade-notes.md index e18ca4d..efbaa19 100644 --- a/docs/upgrade-notes.md +++ b/docs/upgrade-notes.md @@ -115,8 +115,8 @@ If you are using the Solr Helm chart to deploy the Zookeeper operator, then you ```bash # Just replace the Solr CRDs and all CRDs it might depend on (e.g. ZookeeperCluster) -kubectl replace -f "http://solr.apache.org/operator/downloads/crds/v0.9.1/all-with-dependencies.yaml"; -helm upgrade solr-operator apache-solr/solr-operator --version 0.9.1 +kubectl replace -f "http://solr.apache.org/operator/downloads/crds/v0.9.2-prerelease/all-with-dependencies.yaml"; +helm upgrade solr-operator apache-solr/solr-operator --version 0.9.2-prerelease ``` _Note that the Helm chart version does not contain a `v` prefix, which the downloads version does. The Helm chart version is the only part of the Solr Operator release that does not use the `v` prefix._ diff --git a/helm/solr-operator/Chart.yaml b/helm/solr-operator/Chart.yaml index f23d0e7..862aee1 100644 --- a/helm/solr-operator/Chart.yaml +++ b/helm/solr-operator/Chart.yaml @@ -15,8 +15,8 @@ apiVersion: v2 name: solr-operator description: The Solr Operator enables easy management of Solr resources within Kubernetes. -version: 0.9.1 -appVersion: v0.9.1 +version: 0.9.2-prerelease +appVersion: v0.9.2-prerelease kubeVersion: ">= 1.22.0-0" home: https://solr.apache.org/operator sources: @@ -42,57 +42,32 @@ annotations: artifacthub.io/category: "database" artifacthub.io/operator: "true" artifacthub.io/operatorCapabilities: Full Lifecycle - artifacthub.io/prerelease: "false" + artifacthub.io/prerelease: "true" artifacthub.io/recommendations: | - url: https://artifacthub.io/packages/helm/apache-solr/solr artifacthub.io/links: | - name: "Tutorials" url: https://solr.apache.org/operator/resources#tutorials artifacthub.io/signKey: | - fingerprint: E05FDF113D89E7FB4A2DF4B2684D544160392455 + fingerprint: <fingerprint> url: https://dist.apache.org/repos/dist/release/solr/KEYS # Add change log for a single release here. # Allowed syntax is described at: https://artifacthub.io/docs/topics/annotations/helm/#example # 'kind' accepts values: "added", "changed", "deprecated", "removed", "fixed" and "security" artifacthub.io/changes: | - - kind: fixed - description: "initContainers can once again connect to ZooKeeper when Solr 9.8.x images are used" + - kind: added + description: Addition 1 links: - name: Github Issue - url: https://github.com/apache/solr-operator/issues/762 - - name: JIRA Issue - url: https://issues.apache.org/jira/browse/SOLR-17690 - - name: Github PR - url: https://github.com/apache/solr-operator/pull/756 - - kind: fixed - description: "Fix upgrade to v0.9 by updating pod readiness gates for existing clouds" - links: - - name: Github Issue - url: https://github.com/apache/solr-operator/issues/761 - - name: Github PR - url: https://github.com/apache/solr-operator/pull/766 - - kind: fixed - description: "Fix `setup-zk` initContainer no-such-file-or-directory warning" - links: - - name: Github Issue - url: https://github.com/apache/solr-operator/issues/759 - - name: Github PR - url: https://github.com/apache/solr-operator/pull/769 - - kind: fixed - description: "Fix default bootstrapped permissions for replica balancing" - links: - - name: Github Issue - url: https://github.com/apache/solr-operator/issues/653 - - name: Github PR - url: https://github.com/apache/solr-operator/pull/770 - - kind: fixed - description: "Fix unneeded ERROR logging for non-existent resources" + url: https://github.com/issue-url + - kind: changed + description: Change 2 links: - name: Github PR - url: https://github.com/apache/solr-operator/pull/773 + url: https://github.com/pr-url artifacthub.io/images: | - name: solr-operator - image: apache/solr-operator:v0.9.1 + image: apache/solr-operator:v0.9.2-prerelease artifacthub.io/crds: | - kind: SolrCloud version: v1beta1 diff --git a/helm/solr-operator/README.md b/helm/solr-operator/README.md index 15899fb..1f38f55 100644 --- a/helm/solr-operator/README.md +++ b/helm/solr-operator/README.md @@ -43,8 +43,8 @@ helm repo add apache-solr https://solr.apache.org/charts 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 -kubectl create -f https://solr.apache.org/operator/downloads/crds/v0.9.1/all-with-dependencies.yaml -helm install solr-operator apache-solr/solr-operator --version 0.9.1 +kubectl create -f https://solr.apache.org/operator/downloads/crds/v0.9.2-prerelease/all-with-dependencies.yaml +helm install solr-operator apache-solr/solr-operator --version 0.9.2-prerelease ``` The command deploys the solr-operator on the Kubernetes cluster with the default configuration. @@ -57,8 +57,8 @@ _Note that the Helm chart version does not contain a `v` prefix, which the downl If you are upgrading your Solr Operator deployment, you should always use a specific version of the chart and pre-install the Solr CRDS: ```bash -kubectl replace -f https://solr.apache.org/operator/downloads/crds/v0.9.1/all-with-dependencies.yaml -helm upgrade solr-operator apache-solr/solr-operator --version 0.9.1 +kubectl replace -f https://solr.apache.org/operator/downloads/crds/v0.9.2-prerelease/all-with-dependencies.yaml +helm upgrade solr-operator apache-solr/solr-operator --version 0.9.2-prerelease ``` #### Namespaces @@ -172,7 +172,7 @@ The command removes all the Kubernetes components associated with the chart and | Key | Type | Default | Description | |-----|------|---------|-------------| | image.repository | string | `"apache/solr-operator"` | The repository of the Solr Operator image | -| image.tag | string | `"v0.9.1"` | The tag/version of the Solr Operator to run | +| image.tag | string | `"v0.9.2-prerelease"` | The tag/version of the Solr Operator to run | | image.pullPolicy | string | `"IfNotPresent"` | | | image.imagePullSecret | string | `""` | PullSecret for the Solr Operator image | | fullnameOverride | string | `""` | A custom name for the Solr Operator Deployment | diff --git a/helm/solr-operator/crds/crds.yaml b/helm/solr-operator/crds/crds.yaml index dcbdb07..48423a7 100644 --- a/helm/solr-operator/crds/crds.yaml +++ b/helm/solr-operator/crds/crds.yaml @@ -17,7 +17,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - operator.solr.apache.org/version: v0.9.1 + operator.solr.apache.org/version: v0.9.2-prerelease argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.16.4 name: solrbackups.solr.apache.org @@ -275,7 +275,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - operator.solr.apache.org/version: v0.9.1 + operator.solr.apache.org/version: v0.9.2-prerelease argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.16.4 name: solrclouds.solr.apache.org @@ -17870,7 +17870,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - operator.solr.apache.org/version: v0.9.1 + operator.solr.apache.org/version: v0.9.2-prerelease argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.16.4 name: solrprometheusexporters.solr.apache.org diff --git a/helm/solr-operator/values.yaml b/helm/solr-operator/values.yaml index 434c546..6548e96 100644 --- a/helm/solr-operator/values.yaml +++ b/helm/solr-operator/values.yaml @@ -21,7 +21,7 @@ replicaCount: 1 image: repository: apache/solr-operator - tag: v0.9.1 + tag: v0.9.2-prerelease pullPolicy: IfNotPresent imagePullSecret: "" diff --git a/helm/solr/Chart.yaml b/helm/solr/Chart.yaml index 51f8fda..9801acd 100644 --- a/helm/solr/Chart.yaml +++ b/helm/solr/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v2 name: solr description: A SolrCloud cluster running on Kubernetes via the Solr Operator -version: 0.9.1 +version: 0.9.2-prerelease appVersion: 8.11.1 kubeVersion: ">= 1.22.0-0" home: https://solr.apache.org @@ -37,12 +37,20 @@ annotations: artifacthub.io/alternativeName: "solrcloud" artifacthub.io/category: "database" artifacthub.io/operator: "false" - artifacthub.io/prerelease: "false" + artifacthub.io/prerelease: "true" # 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: "Requires version v0.9.1 of the solr-operator helm chart" + description: Addition 1 + links: + - name: Github Issue + url: https://github.com/issue-url + - kind: changed + description: Change 2 + links: + - name: Github PR + url: https://github.com/pr-url artifacthub.io/containsSecurityUpdates: "false" artifacthub.io/recommendations: | - url: https://artifacthub.io/packages/helm/apache-solr/solr-operator @@ -60,5 +68,5 @@ annotations: image: solr:8.11 whitelisted: true artifacthub.io/signKey: | - fingerprint: E05FDF113D89E7FB4A2DF4B2684D544160392455 + fingerprint: <fingerprint> url: https://dist.apache.org/repos/dist/release/solr/KEYS diff --git a/helm/solr/README.md b/helm/solr/README.md index 2a2fd3b..d6cce7a 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.9.1 --set image.tag=8.8 +helm install example apache-solr/solr --version 0.9.2-prerelease --set image.tag=8.8 ``` 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.9.1 --reuse-values --set image.tag=8.11 +helm upgrade example apache-solr/solr --version 0.9.2-prerelease --reuse-values --set image.tag=8.11 ``` The upgrade will be done according to the `upgradeStrategy.method` chosen in the values. diff --git a/version/version.go b/version/version.go index 20681b7..aeabcfa 100644 --- a/version/version.go +++ b/version/version.go @@ -19,8 +19,8 @@ package version var ( // Version information for the Solr Operator - Version = "v0.9.1" - VersionSuffix = "" + Version = "v0.9.2" + VersionSuffix = "prerelease" BuildTime string GitSHA string )
