You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ho...@apache.org on 2023/04/24 19:18:41 UTC
[solr-operator] 01/01: Add next patch version v0.7.1
This is an automated email from the ASF dual-hosted git repository.
houston pushed a commit to branch release-0.7
in repository https://gitbox.apache.org/repos/asf/solr-operator.git
commit dfc2e39c95d80edcfc178de507d775bdb81fed82
Author: Houston Putman <ho...@apache.org>
AuthorDate: Mon Apr 24 15:18:33 2023 -0400
Add next patch version v0.7.1
---
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 | 12 +++++------
helm/solr-operator/README.md | 10 ++++-----
helm/solr-operator/crds/crds.yaml | 6 +++---
helm/solr-operator/values.yaml | 2 +-
helm/solr/Chart.yaml | 25 +++++++++-------------
helm/solr/README.md | 4 ++--
version/version.go | 4 ++--
13 files changed, 40 insertions(+), 45 deletions(-)
diff --git a/config/crd/bases/solr.apache.org_solrbackups.yaml b/config/crd/bases/solr.apache.org_solrbackups.yaml
index 2ccba19..0d77624 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.7.0
+ operator.solr.apache.org/version: v0.7.1-prerelease
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 4db6a85..0f96d2b 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.7.0
+ operator.solr.apache.org/version: v0.7.1-prerelease
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 8cb2eac..b47a5bb 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.7.0
+ operator.solr.apache.org/version: v0.7.1-prerelease
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 9e79da3..1d1e45b 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.7.0/all-with-dependencies.yaml
+$ kubectl create -f https://solr.apache.org/operator/downloads/crds/v0.7.1-prerelease/all-with-dependencies.yaml
# Install the Solr operator and Zookeeper Operator
-$ helm install solr-operator apache-solr/solr-operator --version 0.7.0
+$ helm install solr-operator apache-solr/solr-operator --version 0.7.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._
@@ -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.7.0 \
+helm install example-solr apache-solr/solr --version 0.7.1-prerelease \
--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.7.0 \
+helm upgrade example-solr apache-solr/solr --version 0.7.1-prerelease \
--reuse-values \
--set image.tag=8.7
diff --git a/docs/running-the-operator.md b/docs/running-the-operator.md
index 7ec4312..c957282 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.7.0/all-with-dependencies.yaml
-$ helm install solr-operator apache-solr/solr-operator --version 0.7.0
+$ kubectl create -f https://solr.apache.org/operator/downloads/crds/v0.7.1-prerelease/all-with-dependencies.yaml
+$ helm install solr-operator apache-solr/solr-operator --version 0.7.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 248a397..cf5cd9f 100644
--- a/docs/upgrade-notes.md
+++ b/docs/upgrade-notes.md
@@ -101,8 +101,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.7.0/all-with-dependencies.yaml"
-helm upgrade solr-operator apache-solr/solr-operator --version 0.7.0
+kubectl replace -f "http://solr.apache.org/operator/downloads/crds/v0.7.1-prerelease/all-with-dependencies.yaml"
+helm upgrade solr-operator apache-solr/solr-operator --version 0.7.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 d53f085..61e99b9 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.7.0
-appVersion: v0.7.0
+version: 0.7.1-prerelease
+appVersion: v0.7.1-prerelease
kubeVersion: ">= 1.21.0-0"
home: https://solr.apache.org/operator
sources:
@@ -42,21 +42,21 @@ 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: 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\n description: Minimum Kubernetes version has been upped to 1.21\n links:\n - name: GitHub PR\n url: https://github.com/apache/solr-operator/pull/473\n- kind: changed\n description: The required Zookeeper Operator version has been upgraded to v0.2.15\n links:\n - name: GitHub Issue\n url: https://github.com/apache/solr-operator/issues/549\n - name: GitHub PR\n url: https://github.com/apache/solr-operator/pull/550\n [...]
+ artifacthub.io/changes: "- kind: added\n description: Addition 1\n links:\n - name: Github Issue\n url: https://github.com/issue-url\n- kind: changed\n description: Change 2\n links:\n - name: Github PR\n url: https://github.com/pr-url\n"
artifacthub.io/images: |
- name: solr-operator
- image: apache/solr-operator:v0.7.0
+ image: apache/solr-operator:v0.7.1-prerelease
artifacthub.io/crds: |
- kind: SolrCloud
version: v1beta1
diff --git a/helm/solr-operator/README.md b/helm/solr-operator/README.md
index 2da8ca7..159cc81 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.7.0/all-with-dependencies.yaml
-helm install solr-operator apache-solr/solr-operator --version 0.7.0
+kubectl create -f https://solr.apache.org/operator/downloads/crds/v0.7.1-prerelease/all-with-dependencies.yaml
+helm install solr-operator apache-solr/solr-operator --version 0.7.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.7.0/all-with-dependencies.yaml
-helm upgrade solr-operator apache-solr/solr-operator --version 0.7.0
+kubectl replace -f https://solr.apache.org/operator/downloads/crds/v0.7.1-prerelease/all-with-dependencies.yaml
+helm upgrade solr-operator apache-solr/solr-operator --version 0.7.1-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.7.0"` | The tag/version of the Solr Operator to run |
+| image.tag | string | `"v0.7.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/crds/crds.yaml b/helm/solr-operator/crds/crds.yaml
index 05ac0d0..3f75cde 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.7.0
+ operator.solr.apache.org/version: v0.7.1-prerelease
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.7.0
+ operator.solr.apache.org/version: v0.7.1-prerelease
argocd.argoproj.io/sync-options: Replace=true
controller-gen.kubebuilder.io/version: v0.10.0
creationTimestamp: null
@@ -16802,7 +16802,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- operator.solr.apache.org/version: v0.7.0
+ operator.solr.apache.org/version: v0.7.1-prerelease
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 0e2145d..3bafdca 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.7.0
+ tag: v0.7.1-prerelease
pullPolicy: IfNotPresent
nameOverride: ""
diff --git a/helm/solr/Chart.yaml b/helm/solr/Chart.yaml
index a7e678b..bca5276 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.7.0
+version: 0.7.1-prerelease
appVersion: 8.11.1
kubeVersion: ">= 1.21.0-0"
home: https://solr.apache.org
@@ -37,25 +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: changed
- description: Minimum Kubernetes version has been upped to 1.21
- links:
- - name: GitHub PR
- url: https://github.com/apache/solr-operator/pull/473
- kind: added
- description: Support custom annotations on created ServiceAccount
+ description: Addition 1
links:
- - name: GitHub PR
- url: https://github.com/apache/solr-operator/pull/480
- - kind: fixed
- description: Fix namespace support for helm installation
+ - name: Github Issue
+ url: https://github.com/issue-url
+ - kind: changed
+ description: Change 2
links:
- - name: GitHub PR
- url: https://github.com/apache/solr-operator/pull/508
+ - 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
@@ -73,5 +68,5 @@ annotations:
image: solr:8.11
whitelisted: true
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 53d7549..d7a1afd 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.7.0 --set image.tag=8.8
+helm install example apache-solr/solr --version 0.7.1-prerelease --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.7.0 --reuse-values --set image.tag=8.11
+helm upgrade example apache-solr/solr --version 0.7.1-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 07121e9..98ff5a7 100644
--- a/version/version.go
+++ b/version/version.go
@@ -19,8 +19,8 @@ package version
var (
// Version information for the Solr Operator
- Version = "v0.7.0"
- VersionSuffix = ""
+ Version = "v0.7.1"
+ VersionSuffix = "prerelease"
BuildTime string
GitSHA string
)