diff --git a/config/crd/bases/solr.apache.org_solrbackups.yaml b/config/crd/bases/solr.apache.org_solrbackups.yaml index cf144161..e83cbb44 100644 --- a/config/crd/bases/solr.apache.org_solrbackups.yaml +++ b/config/crd/bases/solr.apache.org_solrbackups.yaml @@ -18,7 +18,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - operator.solr.apache.org/version: v0.6.0-prerelease + operator.solr.apache.org/version: v0.6.0 argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.5.0 creationTimestamp: null diff --git a/config/crd/bases/solr.apache.org_solrclouds.yaml b/config/crd/bases/solr.apache.org_solrclouds.yaml index 71d81b5d..3691581a 100644 --- a/config/crd/bases/solr.apache.org_solrclouds.yaml +++ b/config/crd/bases/solr.apache.org_solrclouds.yaml @@ -18,7 +18,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - operator.solr.apache.org/version: v0.6.0-prerelease + operator.solr.apache.org/version: v0.6.0 argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.5.0 creationTimestamp: null diff --git a/config/crd/bases/solr.apache.org_solrprometheusexporters.yaml b/config/crd/bases/solr.apache.org_solrprometheusexporters.yaml index ee12b317..4e6d3221 100644 --- a/config/crd/bases/solr.apache.org_solrprometheusexporters.yaml +++ b/config/crd/bases/solr.apache.org_solrprometheusexporters.yaml @@ -18,7 +18,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - operator.solr.apache.org/version: v0.6.0-prerelease + operator.solr.apache.org/version: v0.6.0 argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.5.0 creationTimestamp: null diff --git a/docs/local_tutorial.md b/docs/local_tutorial.md index 93610eaf..1dd86046 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.6.0-prerelease/all-with-dependencies.yaml +$ kubectl create -f https://solr.apache.org/operator/downloads/crds/v0.6.0/all-with-dependencies.yaml # Install the Solr operator and Zookeeper Operator -$ helm install solr-operator apache-solr/solr-operator --version 0.6.0-prerelease +$ helm install solr-operator apache-solr/solr-operator --version 0.6.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._ @@ -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.3 with 300m Heap each: -helm install example-solr apache-solr/solr --version 0.6.0-prerelease \ +helm install example-solr apache-solr/solr --version 0.6.0 \ --set image.tag=8.3 \ --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.6.0-prerelease \ +helm upgrade example-solr apache-solr/solr --version 0.6.0 \ --reuse-values \ --set image.tag=8.7 diff --git a/docs/running-the-operator.md b/docs/running-the-operator.md index a3e274e1..2b3780a8 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.6.0-prerelease/all-with-dependencies.yaml -$ helm install solr-operator apache-solr/solr-operator --version 0.6.0-prerelease +$ kubectl create -f https://solr.apache.org/operator/downloads/crds/v0.6.0/all-with-dependencies.yaml +$ helm install solr-operator apache-solr/solr-operator --version 0.6.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 9380cb96..4d05649e 100644 --- a/docs/upgrade-notes.md +++ b/docs/upgrade-notes.md @@ -99,8 +99,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.6.0-prerelease/all-with-dependencies.yaml" -helm upgrade solr-operator apache-solr/solr-operator --version 0.6.0-prerelease +kubectl replace -f "http://solr.apache.org/operator/downloads/crds/v0.6.0/all-with-dependencies.yaml" +helm upgrade solr-operator apache-solr/solr-operator --version 0.6.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 64150f8f..03f80927 100644 --- a/helm/solr-operator/Chart.yaml +++ b/helm/solr-operator/Chart.yaml @@ -12,12 +12,11 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - apiVersion: v2 name: solr-operator description: The Solr Operator enables easy management of Solr resources within Kubernetes. -version: 0.6.0-prerelease -appVersion: v0.6.0-prerelease +version: 0.6.0 +appVersion: v0.6.0 kubeVersion: ">= 1.19.0-0" home: https://solr.apache.org/operator sources: @@ -42,14 +41,14 @@ dependencies: annotations: artifacthub.io/operator: "true" artifacthub.io/operatorCapabilities: Full Lifecycle - 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: E05FDF113D89E7FB4A2DF4B2684D544160392455 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 @@ -177,7 +176,7 @@ annotations: url: https://github.com/apache/solr-operator/pull/456 artifacthub.io/images: | - name: solr-operator - image: apache/solr-operator:v0.6.0-prerelease + image: apache/solr-operator:v0.6.0 artifacthub.io/crds: | - kind: SolrCloud version: v1beta1 diff --git a/helm/solr-operator/README.md b/helm/solr-operator/README.md index 429a1c73..37ef2816 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.6.0-prerelease/all-with-dependencies.yaml -helm install solr-operator apache-solr/solr-operator --version 0.6.0-prerelease +kubectl create -f https://solr.apache.org/operator/downloads/crds/v0.6.0/all-with-dependencies.yaml +helm install solr-operator apache-solr/solr-operator --version 0.6.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.6.0-prerelease/all-with-dependencies.yaml -helm upgrade solr-operator apache-solr/solr-operator --version 0.6.0-prerelease +kubectl replace -f https://solr.apache.org/operator/downloads/crds/v0.6.0/all-with-dependencies.yaml +helm upgrade solr-operator apache-solr/solr-operator --version 0.6.0 ``` #### 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.6.0-prerelease"` | The tag/version of the Solr Operator to run | +| image.tag | string | `"v0.6.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/crds/crds.yaml b/helm/solr-operator/crds/crds.yaml index 995f81c5..5aa6830f 100644 --- a/helm/solr-operator/crds/crds.yaml +++ b/helm/solr-operator/crds/crds.yaml @@ -18,7 +18,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - operator.solr.apache.org/version: v0.6.0-prerelease + operator.solr.apache.org/version: v0.6.0 argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.5.0 creationTimestamp: null @@ -250,7 +250,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - operator.solr.apache.org/version: v0.6.0-prerelease + operator.solr.apache.org/version: v0.6.0 argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.5.0 creationTimestamp: null @@ -6449,7 +6449,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - operator.solr.apache.org/version: v0.6.0-prerelease + operator.solr.apache.org/version: v0.6.0 argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.5.0 creationTimestamp: null diff --git a/helm/solr-operator/values.yaml b/helm/solr-operator/values.yaml index 33c18c4d..4c49be29 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.6.0-prerelease + tag: v0.6.0 pullPolicy: IfNotPresent nameOverride: "" diff --git a/helm/solr/Chart.yaml b/helm/solr/Chart.yaml index fa2387c9..f3b1bf8d 100644 --- a/helm/solr/Chart.yaml +++ b/helm/solr/Chart.yaml @@ -12,11 +12,10 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - apiVersion: v2 name: solr description: A SolrCloud cluser running on Kubernetes via the Solr Operator -version: 0.6.0-prerelease +version: 0.6.0 appVersion: 8.11.1 kubeVersion: ">= 1.19.0-0" home: https://solr.apache.org @@ -36,7 +35,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: | @@ -76,5 +75,5 @@ annotations: image: solr:8.11 whitelisted: true artifacthub.io/signKey: | - fingerprint: + fingerprint: E05FDF113D89E7FB4A2DF4B2684D544160392455 url: https://dist.apache.org/repos/dist/release/solr/KEYS diff --git a/helm/solr/README.md b/helm/solr/README.md index 16baf826..3c992984 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 +helm install example apache-solr/solr --version 0.6.0 --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.11 +helm upgrade example apache-solr/solr --version 0.6.0 --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 c63d27f7..89d1cfed 100644 --- a/version/version.go +++ b/version/version.go @@ -20,7 +20,7 @@ package version var ( // Version information for the Solr Operator Version = "v0.6.0" - VersionSuffix = "prerelease" + VersionSuffix = "" BuildTime string GitSHA string )