This is an automated email from the ASF dual-hosted git repository. houston pushed a commit to branch release-0.4 in repository https://gitbox.apache.org/repos/asf/solr-operator.git
commit 16aaa8ff4ce0bb09d0b6898815d37df6f9298c17 Author: Houston Putman <[email protected]> AuthorDate: Mon Sep 13 09:04:39 2021 -0400 Add next patch version v0.4.1 --- docs/local_tutorial.md | 8 +-- docs/running-the-operator.md | 4 +- docs/upgrade-notes.md | 4 +- helm/solr-operator/Chart.yaml | 132 ++++------------------------------------- helm/solr-operator/README.md | 10 ++-- helm/solr-operator/values.yaml | 2 +- helm/solr/Chart.yaml | 25 +++----- helm/solr/README.md | 4 +- version/version.go | 4 +- 9 files changed, 35 insertions(+), 158 deletions(-) diff --git a/docs/local_tutorial.md b/docs/local_tutorial.md index 1620dc6..6cc9568 100644 --- a/docs/local_tutorial.md +++ b/docs/local_tutorial.md @@ -73,9 +73,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.4.0/all-with-dependencies.yaml +$ kubectl create -f https://solr.apache.org/operator/downloads/crds/v0.4.1-prerelease/all-with-dependencies.yaml # Install the Solr operator and Zookeeper Operator -$ helm install solr-operator apache-solr/solr-operator --version 0.4.0 +$ helm install solr-operator apache-solr/solr-operator --version 0.4.1-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._ @@ -106,7 +106,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.3 with 300m Heap each: -helm install example-solr apache-solr/solr --version 0.4.0 \ +helm install example-solr apache-solr/solr --version 0.4.1-prerelease \ --set image.tag=8.3 \ --set solrOptions.javaMemory="-Xms300m -Xmx300m" \ --set addressability.external.method=Ingress \ @@ -193,7 +193,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.4.0 \ +helm upgrade example-solr apache-solr/solr --version 0.4.1-prerelease \ --reuse-values \ --set image.tag=8.7 diff --git a/docs/running-the-operator.md b/docs/running-the-operator.md index 855981c..8a6582f 100644 --- a/docs/running-the-operator.md +++ b/docs/running-the-operator.md @@ -21,8 +21,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.4.0/all-with-dependencies.yaml -$ helm install solr-operator apache-solr/solr-operator --version 0.4.0 +$ kubectl create -f https://solr.apache.org/operator/downloads/crds/v0.4.1-prerelease/all-with-dependencies.yaml +$ helm install solr-operator apache-solr/solr-operator --version 0.4.1-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 86e5e43..ace006d 100644 --- a/docs/upgrade-notes.md +++ b/docs/upgrade-notes.md @@ -68,8 +68,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.4.0/all-with-dependencies.yaml"; -helm upgrade solr-operator apache-solr/solr-operator --version 0.4.0 +kubectl replace -f "http://solr.apache.org/operator/downloads/crds/v0.4.1-prerelease/all-with-dependencies.yaml"; +helm upgrade solr-operator apache-solr/solr-operator --version 0.4.1-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 bb30d14..066c6e7 100644 --- a/helm/solr-operator/Chart.yaml +++ b/helm/solr-operator/Chart.yaml @@ -16,8 +16,8 @@ apiVersion: v2 name: solr-operator description: The Solr Operator enables easy management of Solr resources within Kubernetes. -version: 0.4.0 -appVersion: v0.4.0 +version: 0.4.1-prerelease +appVersion: v0.4.1-prerelease kubeVersion: ">= 1.16.0-0" home: https://solr.apache.org/operator sources: @@ -42,144 +42,31 @@ dependencies: annotations: artifacthub.io/operator: "true" artifacthub.io/operatorCapabilities: Seamless Upgrades - 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: 50E3EE1C91C7E0CB4DFB007B369424FC98F3F6EC + 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 artifacthub.io/changes: | - - kind: changed - description: Zookeeper Operator supported version changed to v0.2.12 - links: - - name: Github Issue - url: https://github.com/apache/solr-operator/issues/271 - - name: Github PR - url: https://github.com/apache/solr-operator/pull/304 - - name: Zookeeper Operator Release Notes - url: https://github.com/pravega/zookeeper-operator/releases/tag/v0.2.12 - - kind: added - description: Ability to schedule automatic restarts for SolrClouds - links: - - name: Github Issue - url: https://github.com/apache/solr-operator/issues/281 - - name: Github PR - url: https://github.com/apache/solr-operator/pull/279 - kind: added - description: Ability to use HostPath volumes for ephemeral Solr storage + description: Addition 1 links: - name: Github Issue - url: https://github.com/apache/solr-operator/issues/266 - - name: Github PR - url: https://github.com/apache/solr-operator/pull/265 - - kind: removed - description: "Removed deprecated Solr Operator Helm chart option `useZkOperator`, use `zookeeper-operator.use` instead" - links: - - name: Github Issue - url: https://github.com/apache/solr-operator/issues/286 - - name: Github PR - url: https://github.com/apache/solr-operator/pull/288 - - name: Deprecating Github PR - url: https://github.com/apache/solr-operator/pull/231 + url: https://github.com/issue-url - kind: changed - description: Default Solr Version upgraded to 8.9, does not affect existing clouds + description: Change 2 links: - - name: Github Issue - url: https://github.com/apache/solr-operator/issues/285 - - name: Github PR - url: https://github.com/apache/solr-operator/pull/287 - - kind: added - description: Customize serviceAccountName for SolrCloud and SolrPrometheusExporter - links: - - name: Github Issue - url: https://github.com/apache/solr-operator/issues/264 - - name: Github PR - url: https://github.com/apache/solr-operator/pull/283 - - kind: added - description: Introduced ephemeral option for Zookeeper storage - links: - - name: Github Issue - url: https://github.com/apache/solr-operator/issues/259 - - name: Github PR - url: https://github.com/apache/solr-operator/pull/284 - - kind: security - description: Changed Solr Operator base Docker image to reduce vulnerabilities. - links: - - name: Github Issue - url: https://github.com/apache/solr-operator/issues/294 - - name: Github PR - url: https://github.com/apache/solr-operator/pull/295 - - kind: added - description: Ability to customize probes for PrometheusExporter - links: - - name: Github Issue - url: https://github.com/apache/solr-operator/issues/282 - - name: Github PR - url: https://github.com/apache/solr-operator/pull/297 - - kind: security - description: Remove users role from the all permission in the initial security.json - links: - - name: Github Issue - url: https://github.com/apache/solr-operator/issues/274 - - name: Github PR - url: https://github.com/apache/solr-operator/pull/299 - - kind: fixed - description: Grant access to the /admin/zookeeper/status path to the k8s role in the initial security.json - links: - - name: Github Issue - url: https://github.com/apache/solr-operator/issues/289 - - name: Github PR - url: https://github.com/apache/solr-operator/pull/299 - - kind: security - description: Add a mountedServerTLSDir config option to support a unique certificate per pod mounted dynamically by an external agent or CSI driver - links: - - name: Github Issue - url: https://github.com/apache/solr-operator/issues/291 - - name: Github PR - url: https://github.com/apache/solr-operator/pull/292 - - kind: added - description: Ability to terminate TLS at Ingress for SolrCloud. - links: - - name: Github Issue - url: https://github.com/apache/solr-operator/issues/268 - - name: Github PR - url: https://github.com/apache/solr-operator/pull/293 - - kind: added - description: Ability to schedule automatic restarts for SolrPrometheusExporters - links: - - name: Github Issue - url: https://github.com/apache/solr-operator/issues/310 - - name: Github PR - url: https://github.com/apache/solr-operator/pull/313 - - kind: added - description: Ability to specify ZK Config properties for provided Zookeeper Clusters. - links: - - name: Github Issue - url: https://github.com/apache/solr-operator/issues/290 - - name: Github PR - url: https://github.com/apache/solr-operator/pull/311 - - kind: added - description: Option to watch for updates to the mTLS client certificate used by the operator to call Solr pods. - links: - - name: Github Issue - url: https://github.com/apache/solr-operator/issues/317 - - name: Github PR - url: https://github.com/apache/solr-operator/pull/318 - - kind: added - description: Configuration options to support an additional client TLS cert in addition to the server certificate - links: - - name: Github Issue - url: https://github.com/apache/solr-operator/issues/300 - name: Github PR - url: https://github.com/apache/solr-operator/pull/312 + url: https://github.com/pr-url artifacthub.io/images: | - name: solr-operator - image: apache/solr-operator:v0.4.0 + image: apache/solr-operator:v0.4.1-prerelease artifacthub.io/crds: | - kind: SolrCloud version: v1beta1 @@ -235,3 +122,4 @@ annotations: numThreads: 4 image: tag: 8.7.0 + artifacthub.io/containsSecurityUpdates: "false" diff --git a/helm/solr-operator/README.md b/helm/solr-operator/README.md index 77c01d7..eb474ee 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.4.0/all-with-dependencies.yaml -helm install solr-operator apache-solr/solr-operator --version 0.4.0 +kubectl create -f https://solr.apache.org/operator/downloads/crds/v0.4.1-prerelease/all-with-dependencies.yaml +helm install solr-operator apache-solr/solr-operator --version 0.4.1-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.4.0/all-with-dependencies.yaml -helm upgrade solr-operator apache-solr/solr-operator --version 0.4.0 +kubectl replace -f https://solr.apache.org/operator/downloads/crds/v0.4.1-prerelease/all-with-dependencies.yaml +helm upgrade solr-operator apache-solr/solr-operator --version 0.4.1-prerelease ``` #### Namespaces @@ -170,7 +170,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.4.0"` | The tag/version of the Solr Operator to run | +| image.tag | string | `"v0.4.1-prerelease"` | The tag/version of the Solr Operator to run | | image.pullPolicy | string | `"IfNotPresent"` | | | fullnameOverride | string | `""` | A custom name for the Solr Operator Deployment | | nameOverride | string | `""` | | diff --git a/helm/solr-operator/values.yaml b/helm/solr-operator/values.yaml index fe6e8f6..28a7275 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.4.0 + tag: v0.4.1-prerelease pullPolicy: IfNotPresent nameOverride: "" diff --git a/helm/solr/Chart.yaml b/helm/solr/Chart.yaml index 42cea3f..a4782a4 100644 --- a/helm/solr/Chart.yaml +++ b/helm/solr/Chart.yaml @@ -16,7 +16,7 @@ apiVersion: v2 name: solr description: A SolrCloud cluser running on Kubernetes via the Solr Operator -version: 0.4.0 +version: 0.4.1-prerelease appVersion: 8.9.0 kubeVersion: ">= 1.16.0-0" home: https://solr.apache.org @@ -36,31 +36,20 @@ maintainers: icon: https://solr.apache.org/theme/images/identity/Solr_Logo_on_white.png annotations: 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: Official Solr Helm chart created. Works with the Solr Operator. + description: Addition 1 links: - name: Github Issue - url: https://github.com/apache/solr-operator/issues/112 - - name: Github PR - url: https://github.com/apache/solr-operator/pull/276 + url: https://github.com/issue-url - kind: changed - description: Default Solr Version upgraded to 8.9, does not affect existing clouds - links: - - name: Github Issue - url: https://github.com/apache/solr-operator/issues/285 - - name: Github PR - url: https://github.com/apache/solr-operator/pull/287 - - kind: added - description: Ability to create serviceAccount for SolrCloud deployment through Helm chart. + description: Change 2 links: - - name: Github Issue - url: https://github.com/apache/solr-operator/issues/264 - name: Github PR - url: https://github.com/apache/solr-operator/pull/283 + url: https://github.com/pr-url artifacthub.io/containsSecurityUpdates: "false" artifacthub.io/recommendations: | - url: https://artifacthub.io/packages/helm/apache-solr/solr-operator @@ -77,5 +66,5 @@ annotations: - name: solr image: apache/solr:8.9 artifacthub.io/signKey: | - fingerprint: 50E3EE1C91C7E0CB4DFB007B369424FC98F3F6EC + 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 58149b0..2f12d67 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.4.0 --set image.tag=8.8.0 +helm install example apache-solr/solr --version 0.4.1-prerelease --set image.tag=8.8.0 ``` 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.4.0 --reuse-values --set image.tag=8.9.0 +helm upgrade example apache-solr/solr --version 0.4.1-prerelease --reuse-values --set image.tag=8.9.0 ``` 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 2ea5c6d..bf463bc 100644 --- a/version/version.go +++ b/version/version.go @@ -19,8 +19,8 @@ package version var ( // Version information for the Solr Operator - Version string = "v0.4.0" - VersionSuffix string = "" + Version string = "v0.4.1" + VersionSuffix string = "prerelease" BuildTime string GitSHA string )
