You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ge...@apache.org on 2022/08/14 20:02:46 UTC
[solr-operator] branch release-0.6 updated (4c2ed79 -> ea9d9c1)
This is an automated email from the ASF dual-hosted git repository.
gerlowskija pushed a change to branch release-0.6
in repository https://gitbox.apache.org/repos/asf/solr-operator.git
from 4c2ed79 Refactor helm logic in test_cluster.sh (#463)
add 44b3b5b Solr Operator v0.6.0 Release
new ea9d9c1 Add next patch version v0.6.1
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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 | 126 ++-------------------
helm/solr-operator/README.md | 10 +-
helm/solr-operator/crds/crds.yaml | 6 +-
helm/solr-operator/values.yaml | 2 +-
helm/solr/Chart.yaml | 22 +---
helm/solr/README.md | 4 +-
version/version.go | 2 +-
13 files changed, 36 insertions(+), 158 deletions(-)
[solr-operator] 01/01: Add next patch version v0.6.1
Posted by ge...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gerlowskija pushed a commit to branch release-0.6
in repository https://gitbox.apache.org/repos/asf/solr-operator.git
commit ea9d9c1eb41215b559d8745a0a127ac53caaa2f2
Author: Jason Gerlowski <ge...@apache.org>
AuthorDate: Sun Aug 14 16:02:37 2022 -0400
Add next patch version v0.6.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 | 129 ++-------------------
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, 41 insertions(+), 161 deletions(-)
diff --git a/config/crd/bases/solr.apache.org_solrbackups.yaml b/config/crd/bases/solr.apache.org_solrbackups.yaml
index e83cbb4..1f14753 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
+ operator.solr.apache.org/version: v0.6.1-prerelease
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 3691581..1e6d4d9 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
+ operator.solr.apache.org/version: v0.6.1-prerelease
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 4e6d322..ef3c8d4 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
+ operator.solr.apache.org/version: v0.6.1-prerelease
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 1dd8604..dac9505 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/all-with-dependencies.yaml
+$ kubectl create -f https://solr.apache.org/operator/downloads/crds/v0.6.1-prerelease/all-with-dependencies.yaml
# Install the Solr operator and Zookeeper Operator
-$ helm install solr-operator apache-solr/solr-operator --version 0.6.0
+$ helm install solr-operator apache-solr/solr-operator --version 0.6.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.6.0 \
+helm install example-solr apache-solr/solr --version 0.6.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.6.0 \
+helm upgrade example-solr apache-solr/solr --version 0.6.1-prerelease \
--reuse-values \
--set image.tag=8.7
diff --git a/docs/running-the-operator.md b/docs/running-the-operator.md
index 2b3780a..9ba9ffe 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/all-with-dependencies.yaml
-$ helm install solr-operator apache-solr/solr-operator --version 0.6.0
+$ kubectl create -f https://solr.apache.org/operator/downloads/crds/v0.6.1-prerelease/all-with-dependencies.yaml
+$ helm install solr-operator apache-solr/solr-operator --version 0.6.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 4d05649..6efbb72 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/all-with-dependencies.yaml"
-helm upgrade solr-operator apache-solr/solr-operator --version 0.6.0
+kubectl replace -f "http://solr.apache.org/operator/downloads/crds/v0.6.1-prerelease/all-with-dependencies.yaml"
+helm upgrade solr-operator apache-solr/solr-operator --version 0.6.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 03f8092..c59ef46 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.6.0
-appVersion: v0.6.0
+version: 0.6.1-prerelease
+appVersion: v0.6.1-prerelease
kubeVersion: ">= 1.19.0-0"
home: https://solr.apache.org/operator
sources:
@@ -41,142 +41,31 @@ dependencies:
annotations:
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: E05FDF113D89E7FB4A2DF4B2684D544160392455
+ 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: Upgrade the default Solr version to 8.11
- links:
- - name: Github Issue
- url: https://github.com/apache/solr-operator/issues/387
- - name: Github PR
- url: https://github.com/apache/solr-operator/pull/388
- - kind: changed
- description: The required Zookeeper Operator version has been upgraded to v0.2.14
- links:
- - name: Github Issue
- url: https://github.com/apache/solr-operator/issues/443
- - name: Github PR
- url: https://github.com/apache/solr-operator/pull/449
- - name: Zookeeper Operator v0.2.14 Release
- url: https://github.com/pravega/zookeeper-operator/releases/tag/v0.2.14
- - kind: changed
- description: Loosen requirement on GCS backup credential/secret. Can now be omitted if using GKE's Workload Identity.
- links:
- - name: Github Issue
- url: https://github.com/apache/solr-operator/issues/391
- - name: Github PR
- url: https://github.com/apache/solr-operator/pull/394
- - kind: changed
- description: The "addressability.external.additionalDomains" option has been renamed to "addressability.external.additionalDomainNames". See the upgrade notes for more information.
- links:
- - name: Github Issue
- url: https://github.com/apache/solr-operator/issues/412
- - name: Github PR
- url: https://github.com/apache/solr-operator/pull/416
- - kind: added
- description: You can now do a managed update of Solr while using ephemeral data. The operator will manage data migration during the rolling update for you.
- links:
- - name: Github Issue
- url: https://github.com/apache/solr-operator/issues/365
- - name: Github PR
- url: https://github.com/apache/solr-operator/pull/375
- - kind: removed
- description: Options deprecated in v0.5.0 have been removed. See the upgrade notes for more information.
- links:
- - name: Github PR
- url: https://github.com/apache/solr-operator/pull/418
- - kind: fixed
- description: Fixed issue with StatefulSet volumeMounts for PVCs with custom names.
- links:
- - name: Github Issue
- url: https://github.com/apache/solr-operator/issues/438
- - name: Github PR
- url: https://github.com/apache/solr-operator/pull/439
- - kind: fixed
- description: SolrCloud pods are no longer deleted right after a SolrCloud is created.
- links:
- - name: Github Issue
- url: https://github.com/apache/solr-operator/issues/431
- - name: Github PR
- url: https://github.com/apache/solr-operator/pull/432
- - kind: fixed
- description: Fixed rolebindings when watching multiple namespaces
- links:
- - name: Github PR
- url: https://github.com/apache/solr-operator/pull/444
- - kind: fixed
- description: SolrClouds now support a ZookeeperConnection address without the port (uses 2181 by default). The operator will also log whenever the statefulSet is skipped because of the zkConnectionString.
- links:
- - name: Github Issue
- url: https://github.com/apache/solr-operator/issues/428
- - name: Github PR
- url: https://github.com/apache/solr-operator/pull/429
- - kind: fixed
- description: SolrCloud.Status now shows correct version when using an image repo that contains a colon
- links:
- - name: Github Issue
- url: https://github.com/apache/solr-operator/issues/445
- - name: Github PR
- url: https://github.com/apache/solr-operator/pull/450
- kind: added
- description: SolrCloud and SolrPrometheusExporter Services now have the appropriate (http or https) appProtocol set. This fixes integration with Istio.
+ description: Addition 1
links:
- name: Github Issue
- url: https://github.com/apache/solr-operator/issues/427
- - name: Github PR
- url: https://github.com/apache/solr-operator/pull/453
+ url: https://github.com/issue-url
- kind: changed
- description: SolrPrometheusExporters now default to using the references SolrCloud image if none is provided. Note, the entire PrometheusExporter image specification must be empty for it to use the SolrCloud image. This does not effect existing resources, only newly created resources.
- links:
- - name: Github Issue
- url: https://github.com/apache/solr-operator/issues/386
- - name: Github PR
- url: https://github.com/apache/solr-operator/pull/454
- - kind: added
- description: SolrCloud default initContainer(s) can now have their resources customized via `podOptions.defaultInitContainerResources`. These initContainers now include default resources.
+ description: Change 2
links:
- - name: Github Issue
- url: https://github.com/apache/solr-operator/issues/448
- - name: Github PR
- url: https://github.com/apache/solr-operator/pull/451
- - kind: changed
- description: SolrBackup.Status' 'Next Scheduled' is now updated on changes to the backup schedule.
- links:
- - name: Github Issue
- url: https://github.com/apache/solr-operator/issues/376
- - name: Github PR
- url: https://github.com/apache/solr-operator/pull/455
- - kind: changed
- description: SolrClouds can now use the Ingress controller's default TLS Secret when terminating TLS at the Ingress. The old `ingressTLSTerminationSecret` option is now deprecated. Refer the upgrade notes for more information.
- links:
- - name: Github Issue
- url: https://github.com/apache/solr-operator/issues/437
- - name: Github PR
- url: https://github.com/apache/solr-operator/pull/452
- - name: Upgrade Notes
- url: https://apache.github.io/solr-operator/docs/upgrade-notes.html#v060
- - name: Solr Addressability Docs
- url: https://apache.github.io/solr-operator/docs/solr-cloud/solr-cloud-crd.html#addressability
- - kind: added
- description: SolrCloud now accepts a `solrZkOpts` option for specifying any Java system properties needed to connect to ZooKeeper.
- links:
- - name: Github Issue
- url: https://github.com/apache/solr-operator/issues/435
- name: Github PR
- url: https://github.com/apache/solr-operator/pull/456
+ url: https://github.com/pr-url
artifacthub.io/images: |
- name: solr-operator
- image: apache/solr-operator:v0.6.0
+ image: apache/solr-operator:v0.6.1-prerelease
artifacthub.io/crds: |
- kind: SolrCloud
version: v1beta1
diff --git a/helm/solr-operator/README.md b/helm/solr-operator/README.md
index 37ef281..424f1e7 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/all-with-dependencies.yaml
-helm install solr-operator apache-solr/solr-operator --version 0.6.0
+kubectl create -f https://solr.apache.org/operator/downloads/crds/v0.6.1-prerelease/all-with-dependencies.yaml
+helm install solr-operator apache-solr/solr-operator --version 0.6.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.6.0/all-with-dependencies.yaml
-helm upgrade solr-operator apache-solr/solr-operator --version 0.6.0
+kubectl replace -f https://solr.apache.org/operator/downloads/crds/v0.6.1-prerelease/all-with-dependencies.yaml
+helm upgrade solr-operator apache-solr/solr-operator --version 0.6.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.6.0"` | The tag/version of the Solr Operator to run |
+| image.tag | string | `"v0.6.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 5aa6830..61931e8 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
+ operator.solr.apache.org/version: v0.6.1-prerelease
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
+ operator.solr.apache.org/version: v0.6.1-prerelease
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
+ operator.solr.apache.org/version: v0.6.1-prerelease
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 4c49be2..3256a13 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
+ tag: v0.6.1-prerelease
pullPolicy: IfNotPresent
nameOverride: ""
diff --git a/helm/solr/Chart.yaml b/helm/solr/Chart.yaml
index f3b1bf8..9ba1c60 100644
--- a/helm/solr/Chart.yaml
+++ b/helm/solr/Chart.yaml
@@ -15,7 +15,7 @@
apiVersion: v2
name: solr
description: A SolrCloud cluser running on Kubernetes via the Solr Operator
-version: 0.6.0
+version: 0.6.1-prerelease
appVersion: 8.11.1
kubeVersion: ">= 1.19.0-0"
home: https://solr.apache.org
@@ -35,29 +35,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: changed
- description: Upgrade the default Solr version to 8.11
+ - kind: added
+ description: Addition 1
links:
- name: Github Issue
- url: https://github.com/apache/solr-operator/issues/387
- - name: Github PR
- url: https://github.com/apache/solr-operator/pull/388
+ url: https://github.com/issue-url
- kind: changed
- description: The "addressability.external.additionalDomains" option has been renamed to "addressability.external.additionalDomainNames". See the upgrade notes for more information.
- links:
- - name: Github Issue
- url: https://github.com/apache/solr-operator/issues/412
- - name: Github PR
- url: https://github.com/apache/solr-operator/pull/416
- - kind: removed
- description: The deprecated "dataStorage.backupRestoreOptions" field has been removed.
+ description: Change 2
links:
- name: Github PR
- url: https://github.com/apache/solr-operator/pull/418
+ url: https://github.com/pr-url
artifacthub.io/containsSecurityUpdates: "false"
artifacthub.io/recommendations: |
- url: https://artifacthub.io/packages/helm/apache-solr/solr-operator
@@ -75,5 +66,5 @@ annotations:
image: solr:8.11
whitelisted: true
artifacthub.io/signKey: |
- fingerprint: E05FDF113D89E7FB4A2DF4B2684D544160392455
+ 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 3c99298..bde49c8 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 --set image.tag=8.8
+helm install example apache-solr/solr --version 0.6.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.6.0 --reuse-values --set image.tag=8.11
+helm upgrade example apache-solr/solr --version 0.6.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 89d1cfe..2c32bee 100644
--- a/version/version.go
+++ b/version/version.go
@@ -19,8 +19,8 @@ package version
var (
// Version information for the Solr Operator
- Version = "v0.6.0"
- VersionSuffix = ""
+ Version = "v0.6.1"
+ VersionSuffix = "prerelease"
BuildTime string
GitSHA string
)