From fae48c193d24950fa682a72a00e43579c3b8de04 Mon Sep 17 00:00:00 2001 From: Houston Putman Date: Tue, 7 Sep 2021 10:58:06 -0400 Subject: [PATCH] Solr Operator v0.4.0 Release --- docs/local_tutorial.md | 8 ++++---- docs/running-the-operator.md | 4 ++-- docs/upgrade-notes.md | 4 ++-- helm/solr-operator/Chart.yaml | 10 +++++----- helm/solr-operator/README.md | 10 +++++----- helm/solr-operator/values.yaml | 2 +- helm/solr/Chart.yaml | 7 +++---- helm/solr/README.md | 4 ++-- version/version.go | 2 +- 9 files changed, 25 insertions(+), 26 deletions(-) diff --git a/docs/local_tutorial.md b/docs/local_tutorial.md index 0a11a98f..1620dc6b 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-prerelease/all-with-dependencies.yaml +$ kubectl create -f https://solr.apache.org/operator/downloads/crds/v0.4.0/all-with-dependencies.yaml # Install the Solr operator and Zookeeper Operator -$ helm install solr-operator apache-solr/solr-operator --version 0.4.0-prerelease +$ helm install solr-operator apache-solr/solr-operator --version 0.4.0 ``` _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-prerelease \ +helm install example-solr apache-solr/solr --version 0.4.0 \ --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-prerelease \ +helm upgrade example-solr apache-solr/solr --version 0.4.0 \ --reuse-values \ --set image.tag=8.7 diff --git a/docs/running-the-operator.md b/docs/running-the-operator.md index 41e90e9f..855981c6 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-prerelease/all-with-dependencies.yaml -$ helm install solr-operator apache-solr/solr-operator --version 0.4.0-prerelease +$ 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 ``` _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 1026cf11..86e5e43a 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-prerelease/all-with-dependencies.yaml" -helm upgrade solr-operator apache-solr/solr-operator --version 0.4.0-prerelease +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 ``` _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 a02f9136..bb30d142 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-prerelease -appVersion: v0.4.0-prerelease +version: 0.4.0 +appVersion: v0.4.0 kubeVersion: ">= 1.16.0-0" home: https://solr.apache.org/operator sources: @@ -42,14 +42,14 @@ dependencies: annotations: artifacthub.io/operator: "true" artifacthub.io/operatorCapabilities: Seamless Upgrades - artifacthub.io/prerelease: "true" + artifacthub.io/prerelease: "false" 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: + fingerprint: 50E3EE1C91C7E0CB4DFB007B369424FC98F3F6EC 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 @@ -179,7 +179,7 @@ annotations: url: https://github.com/apache/solr-operator/pull/312 artifacthub.io/images: | - name: solr-operator - image: apache/solr-operator:v0.4.0-prerelease + image: apache/solr-operator:v0.4.0 artifacthub.io/crds: | - kind: SolrCloud version: v1beta1 diff --git a/helm/solr-operator/README.md b/helm/solr-operator/README.md index 50870cac..77c01d7d 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-prerelease/all-with-dependencies.yaml -helm install solr-operator apache-solr/solr-operator --version 0.4.0-prerelease +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 ``` 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-prerelease/all-with-dependencies.yaml -helm upgrade solr-operator apache-solr/solr-operator --version 0.4.0-prerelease +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 ``` #### 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-prerelease"` | The tag/version of the Solr Operator to run | +| image.tag | string | `"v0.4.0"` | 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 c165b21f..fe6e8f60 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-prerelease + tag: v0.4.0 pullPolicy: IfNotPresent nameOverride: "" diff --git a/helm/solr/Chart.yaml b/helm/solr/Chart.yaml index 87c77859..42cea3fc 100644 --- a/helm/solr/Chart.yaml +++ b/helm/solr/Chart.yaml @@ -16,8 +16,7 @@ apiVersion: v2 name: solr description: A SolrCloud cluser running on Kubernetes via the Solr Operator - -version: 0.4.0-prerelease +version: 0.4.0 appVersion: 8.9.0 kubeVersion: ">= 1.16.0-0" home: https://solr.apache.org @@ -37,7 +36,7 @@ maintainers: icon: https://solr.apache.org/theme/images/identity/Solr_Logo_on_white.png annotations: artifacthub.io/operator: "false" - artifacthub.io/prerelease: "true" + artifacthub.io/prerelease: "false" # Add change log for a single release here. # Allowed syntax is described at: https://artifacthub.io/docs/topics/annotations/helm/#example artifacthub.io/changes: | @@ -78,5 +77,5 @@ annotations: - name: solr image: apache/solr:8.9 artifacthub.io/signKey: | - fingerprint: + fingerprint: 50E3EE1C91C7E0CB4DFB007B369424FC98F3F6EC url: https://dist.apache.org/repos/dist/release/solr/KEYS diff --git a/helm/solr/README.md b/helm/solr/README.md index e99769ee..58149b09 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-prerelease --set image.tag=8.8.0 +helm install example apache-solr/solr --version 0.4.0 --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-prerelease --reuse-values --set image.tag=8.9.0 +helm upgrade example apache-solr/solr --version 0.4.0 --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 a0ae4af9..2ea5c6d2 100644 --- a/version/version.go +++ b/version/version.go @@ -20,7 +20,7 @@ package version var ( // Version information for the Solr Operator Version string = "v0.4.0" - VersionSuffix string = "prerelease" + VersionSuffix string = "" BuildTime string GitSHA string )