diff --git a/config/crd/bases/solr.apache.org_solrbackups.yaml b/config/crd/bases/solr.apache.org_solrbackups.yaml index 534e0cf5..9c0d245a 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.8.1-prerelease + operator.solr.apache.org/version: v0.8.1 argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.10.0 creationTimestamp: null diff --git a/config/crd/bases/solr.apache.org_solrclouds.yaml b/config/crd/bases/solr.apache.org_solrclouds.yaml index 672b65fc..1f8d9ecc 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.8.1-prerelease + operator.solr.apache.org/version: v0.8.1 argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.10.0 creationTimestamp: null diff --git a/config/crd/bases/solr.apache.org_solrprometheusexporters.yaml b/config/crd/bases/solr.apache.org_solrprometheusexporters.yaml index e6024b80..c64fface 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.8.1-prerelease + operator.solr.apache.org/version: v0.8.1 argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.10.0 creationTimestamp: null diff --git a/docs/local_tutorial.md b/docs/local_tutorial.md index 98091bea..3574105a 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.8.1-prerelease/all-with-dependencies.yaml +$ kubectl create -f https://solr.apache.org/operator/downloads/crds/v0.8.1/all-with-dependencies.yaml # Install the Solr operator and Zookeeper Operator -$ helm install solr-operator apache-solr/solr-operator --version 0.8.1-prerelease +$ helm install solr-operator apache-solr/solr-operator --version 0.8.1 ``` _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.2 with 300m Heap each: -helm install example-solr apache-solr/solr --version 0.8.1-prerelease \ +helm install example-solr apache-solr/solr --version 0.8.1 \ --set image.tag=8.11.2 \ --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.8.1-prerelease \ +helm upgrade example-solr apache-solr/solr --version 0.8.1 \ --reuse-values \ --set image.tag=8.11.3 diff --git a/docs/running-the-operator.md b/docs/running-the-operator.md index c1950188..4a063f4f 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.8.1-prerelease/all-with-dependencies.yaml -$ helm install solr-operator apache-solr/solr-operator --version 0.8.1-prerelease +$ kubectl create -f https://solr.apache.org/operator/downloads/crds/v0.8.1/all-with-dependencies.yaml +$ helm install solr-operator apache-solr/solr-operator --version 0.8.1 ``` _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 abf4435b..a117bc4f 100644 --- a/docs/upgrade-notes.md +++ b/docs/upgrade-notes.md @@ -113,8 +113,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.8.1-prerelease/all-with-dependencies.yaml" -helm upgrade solr-operator apache-solr/solr-operator --version 0.8.1-prerelease +kubectl replace -f "http://solr.apache.org/operator/downloads/crds/v0.8.1/all-with-dependencies.yaml" +helm upgrade solr-operator apache-solr/solr-operator --version 0.8.1 ``` _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 dc6665cf..db8891ad 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.8.1-prerelease -appVersion: v0.8.1-prerelease +version: 0.8.1 +appVersion: v0.8.1 kubeVersion: ">= 1.22.0-0" home: https://solr.apache.org/operator sources: @@ -42,62 +42,21 @@ annotations: artifacthub.io/category: "database" 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 - artifacthub.io/changes: | - - kind: security - description: Command-based Solr probes no longer echoes 'JAVA_TOOL_OPTIONS' values in Kubernetes events. - links: - - name: JIRA Issue - url: https://issues.apache.org/jira/browse/SOLR-17216 - - name: Github PR - url: https://github.com/apache/solr-operator/pull/698 - - kind: changed - description: SolrClouds now support auto-readOnlyRootFilesystem setting. - links: - - name: Github Issue - url: https://github.com/apache/solr-operator/issues/624 - - name: Github PR - url: https://github.com/apache/solr-operator/pull/648 - description: Avoid reset of security.json if get request fails - links: - - name: Github Issue - url: https://github.com/apache/solr-operator/issues/659 - - name: Github PR - url: https://github.com/apache/solr-operator/pull/660 - - kind: fixed - description: SolrCloud scaling is now safe when using persistent storage with a 'Delete' reclaim policy - links: - - name: Github Issue - url: https://github.com/apache/solr-operator/issues/688 - - name: Github PR - url: https://github.com/apache/solr-operator/pull/689 - - kind: fixed - description: SolrPrometheusExporter no longer fails liveness probes when the SolrCloud is too large - links: - - name: Github Issue - url: https://github.com/apache/solr-operator/issues/693 - - name: Github PR - url: https://github.com/apache/solr-operator/pull/694 - - kind: fixed - description: SolrClouds addressed via an Ingress now scale up and down safely. - links: - - name: Github Issue - url: https://github.com/apache/solr-operator/issues/682 - - name: Github PR - url: https://github.com/apache/solr-operator/pull/692 + artifacthub.io/changes: "- kind: security\n description: Command-based Solr probes no longer echoes 'JAVA_TOOL_OPTIONS' values in Kubernetes events.\n links:\n - name: JIRA Issue\n url: https://issues.apache.org/jira/browse/SOLR-17216\n - name: Github PR\n url: https://github.com/apache/solr-operator/pull/698\n- kind: changed\n description: SolrClouds now support auto-readOnlyRootFilesystem setting.\n links:\n - name: Github Issue\n url: https://github.com/apache/solr-operator/issues/624\n - name: Github PR\n url: https://github.com/apache/solr-operator/pull/648\n description: Avoid reset of security.json if get request fails \n links:\n - name: Github Issue\n url: https://github.com/apache/solr-operator/issues/659\n - name: Github PR\n url: https://github.com/apache/solr-operator/pull/660\n- kind: fixed\n description: SolrCloud scaling is now safe when using persistent storage with a 'Delete' reclaim policy\n links:\n - name: Github Issue\n url: https://github.com/apache/solr-operator/issues/688\n - name: Github PR\n url: https://github.com/apache/solr-operator/pull/689\n- kind: fixed\n description: SolrPrometheusExporter no longer fails liveness probes when the SolrCloud is too large\n links:\n - name: Github Issue\n url: https://github.com/apache/solr-operator/issues/693\n - name: Github PR\n url: https://github.com/apache/solr-operator/pull/694\n- kind: fixed\n description: SolrClouds addressed via an Ingress now scale up and down safely.\n links:\n - name: Github Issue\n url: https://github.com/apache/solr-operator/issues/682\n - name: Github PR\n url: https://github.com/apache/solr-operator/pull/692\n" artifacthub.io/images: | - name: solr-operator - image: apache/solr-operator:v0.8.1-prerelease + image: apache/solr-operator:v0.8.1 artifacthub.io/crds: | - kind: SolrCloud version: v1beta1 diff --git a/helm/solr-operator/README.md b/helm/solr-operator/README.md index 32e879b5..467b318b 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.8.1-prerelease/all-with-dependencies.yaml -helm install solr-operator apache-solr/solr-operator --version 0.8.1-prerelease +kubectl create -f https://solr.apache.org/operator/downloads/crds/v0.8.1/all-with-dependencies.yaml +helm install solr-operator apache-solr/solr-operator --version 0.8.1 ``` 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.8.1-prerelease/all-with-dependencies.yaml -helm upgrade solr-operator apache-solr/solr-operator --version 0.8.1-prerelease +kubectl replace -f https://solr.apache.org/operator/downloads/crds/v0.8.1/all-with-dependencies.yaml +helm upgrade solr-operator apache-solr/solr-operator --version 0.8.1 ``` #### 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.8.1-prerelease"` | The tag/version of the Solr Operator to run | +| image.tag | string | `"v0.8.1"` | 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 ba85c68d..f79bd862 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.8.1-prerelease + operator.solr.apache.org/version: v0.8.1 argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.10.0 creationTimestamp: null @@ -266,7 +266,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - operator.solr.apache.org/version: v0.8.1-prerelease + operator.solr.apache.org/version: v0.8.1 argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.10.0 creationTimestamp: null @@ -17084,7 +17084,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - operator.solr.apache.org/version: v0.8.1-prerelease + operator.solr.apache.org/version: v0.8.1 argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.10.0 creationTimestamp: null diff --git a/helm/solr-operator/values.yaml b/helm/solr-operator/values.yaml index f3113eb9..c7dcf443 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.8.1-prerelease + tag: v0.8.1 pullPolicy: IfNotPresent nameOverride: "" diff --git a/helm/solr/Chart.yaml b/helm/solr/Chart.yaml index 0100b5a4..b487bd6e 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.8.1-prerelease +version: 0.8.1 appVersion: 8.11.1 kubeVersion: ">= 1.22.0-0" home: https://solr.apache.org @@ -37,7 +37,7 @@ annotations: artifacthub.io/alternativeName: "solrcloud" artifacthub.io/category: "database" 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: "" @@ -58,5 +58,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 464260c7..8b347662 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 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.8.1-prerelease --set image.tag=8.8 +helm install example apache-solr/solr --version 0.8.1 --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.8.1-prerelease --reuse-values --set image.tag=8.11 +helm upgrade example apache-solr/solr --version 0.8.1 --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 ffa56511..efbe812c 100644 --- a/version/version.go +++ b/version/version.go @@ -20,7 +20,7 @@ package version var ( // Version information for the Solr Operator Version = "v0.8.1" - VersionSuffix = "prerelease" + VersionSuffix = "" BuildTime string GitSHA string )