This is an automated email from the ASF dual-hosted git repository. houston pushed a commit to branch release-0.5 in repository https://gitbox.apache.org/repos/asf/solr-operator.git
commit 51c5db86865d0420820ee53b4eb1fefd11ed2879 Author: Houston Putman <[email protected]> AuthorDate: Mon Mar 21 12:00:54 2022 -0400 Add next patch version v0.5.2 --- 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 | 40 ++++++---------------- 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 | 4 +-- 13 files changed, 44 insertions(+), 66 deletions(-) diff --git a/config/crd/bases/solr.apache.org_solrbackups.yaml b/config/crd/bases/solr.apache.org_solrbackups.yaml index 810357d..cd69f97 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.5.1 + operator.solr.apache.org/version: v0.5.2-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 7751465..b16d4e9 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.5.1 + operator.solr.apache.org/version: v0.5.2-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 a6d1a20..1e008e5 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.5.1 + operator.solr.apache.org/version: v0.5.2-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 2816c0f..5c89938 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.5.1/all-with-dependencies.yaml +$ kubectl create -f https://solr.apache.org/operator/downloads/crds/v0.5.2-prerelease/all-with-dependencies.yaml # Install the Solr operator and Zookeeper Operator -$ helm install solr-operator apache-solr/solr-operator --version 0.5.1 +$ helm install solr-operator apache-solr/solr-operator --version 0.5.2-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.5.1 \ +helm install example-solr apache-solr/solr --version 0.5.2-prerelease \ --set image.tag=8.3 \ --set solrOptions.javaMemory="-Xms300m -Xmx300m" \ --set addressability.external.method=Ingress \ @@ -210,7 +210,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.5.1 \ +helm upgrade example-solr apache-solr/solr --version 0.5.2-prerelease \ --reuse-values \ --set image.tag=8.7 diff --git a/docs/running-the-operator.md b/docs/running-the-operator.md index de3f925..338bad7 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.5.1/all-with-dependencies.yaml -$ helm install solr-operator apache-solr/solr-operator --version 0.5.1 +$ kubectl create -f https://solr.apache.org/operator/downloads/crds/v0.5.2-prerelease/all-with-dependencies.yaml +$ helm install solr-operator apache-solr/solr-operator --version 0.5.2-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 2b9e0a7..ec86474 100644 --- a/docs/upgrade-notes.md +++ b/docs/upgrade-notes.md @@ -97,8 +97,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.5.1/all-with-dependencies.yaml"; -helm upgrade solr-operator apache-solr/solr-operator --version 0.5.1 +kubectl replace -f "http://solr.apache.org/operator/downloads/crds/v0.5.2-prerelease/all-with-dependencies.yaml"; +helm upgrade solr-operator apache-solr/solr-operator --version 0.5.2-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 ce4e79f..175c4a3 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.5.1 -appVersion: v0.5.1 +version: 0.5.2-prerelease +appVersion: v0.5.2-prerelease kubeVersion: ">= 1.19.0-0" home: https://solr.apache.org/operator sources: @@ -42,49 +42,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: 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: fixed - description: Solr Operator helm chart now sets runAsNonRoot only on the solr operator container. Sidecars can run as root. + - kind: added + description: Addition 1 links: - name: Github Issue - url: https://github.com/apache/solr-operator/issues/389 - - name: Github PR - url: https://github.com/apache/solr-operator/pull/395 - - kind: fixed - description: Correctly check whether resource limits & requests have changed when updating children objects - links: - - name: Github Issue - url: https://github.com/apache/solr-operator/issues/393 - - name: Github PR - url: https://github.com/apache/solr-operator/pull/398 - - kind: security - description: Upgrade inherited dependencies to mitigate security vulnerabilities - links: - - name: Github Issue - url: https://github.com/apache/solr-operator/issues/405 - - name: Github PR - url: https://github.com/apache/solr-operator/pull/406 + url: https://github.com/issue-url - kind: changed - description: Upgrade GoLang version to 1.17 + description: Change 2 links: - - name: Github Issue - url: https://github.com/apache/solr-operator/issues/407 - name: Github PR - url: https://github.com/apache/solr-operator/pull/408 + url: https://github.com/pr-url artifacthub.io/images: | - name: solr-operator - image: apache/solr-operator:v0.5.1 + image: apache/solr-operator:v0.5.2-prerelease artifacthub.io/crds: | - kind: SolrCloud version: v1beta1 @@ -181,4 +163,4 @@ annotations: - techproducts - books location: "/this/location" - artifacthub.io/containsSecurityUpdates: "true" + artifacthub.io/containsSecurityUpdates: "false" diff --git a/helm/solr-operator/README.md b/helm/solr-operator/README.md index 373d1ca..0d829dc 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.5.1/all-with-dependencies.yaml -helm install solr-operator apache-solr/solr-operator --version 0.5.1 +kubectl create -f https://solr.apache.org/operator/downloads/crds/v0.5.2-prerelease/all-with-dependencies.yaml +helm install solr-operator apache-solr/solr-operator --version 0.5.2-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.5.1/all-with-dependencies.yaml -helm upgrade solr-operator apache-solr/solr-operator --version 0.5.1 +kubectl replace -f https://solr.apache.org/operator/downloads/crds/v0.5.2-prerelease/all-with-dependencies.yaml +helm upgrade solr-operator apache-solr/solr-operator --version 0.5.2-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.5.1"` | The tag/version of the Solr Operator to run | +| image.tag | string | `"v0.5.2-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 9f7c808..76b9059 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.5.1 + operator.solr.apache.org/version: v0.5.2-prerelease argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.5.0 creationTimestamp: null @@ -1273,7 +1273,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - operator.solr.apache.org/version: v0.5.1 + operator.solr.apache.org/version: v0.5.2-prerelease argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.5.0 creationTimestamp: null @@ -8336,7 +8336,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - operator.solr.apache.org/version: v0.5.1 + operator.solr.apache.org/version: v0.5.2-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 8e4d8b9..7a5b8f3 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.5.1 + tag: v0.5.2-prerelease pullPolicy: IfNotPresent nameOverride: "" diff --git a/helm/solr/Chart.yaml b/helm/solr/Chart.yaml index 9ef4fbe..c0bf110 100644 --- a/helm/solr/Chart.yaml +++ b/helm/solr/Chart.yaml @@ -16,7 +16,7 @@ apiVersion: v2 name: solr description: A SolrCloud cluser running on Kubernetes via the Solr Operator -version: 0.5.1 +version: 0.5.2-prerelease appVersion: 8.9.0 kubeVersion: ">= 1.19.0-0" home: https://solr.apache.org @@ -36,24 +36,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: fixed - description: Fixed Helm chart value "zk.externalAddress" + - kind: added + description: Addition 1 links: - name: Github Issue - url: https://github.com/apache/solr-operator/issues/379 - - name: Github PR - url: https://github.com/apache/solr-operator/pull/380 - - kind: fixed - description: Fixed Helm chart value "addressability.external.additionalDomains", will be renamed to "additionalDomainNames" in v0.6.0 + url: https://github.com/issue-url + - kind: changed + description: Change 2 links: - - name: Github Issue - url: https://github.com/apache/solr-operator/issues/412 - name: Github PR - url: https://github.com/apache/solr-operator/pull/415 + url: https://github.com/pr-url artifacthub.io/containsSecurityUpdates: "false" artifacthub.io/recommendations: | - url: https://artifacthub.io/packages/helm/apache-solr/solr-operator @@ -71,5 +67,5 @@ annotations: image: solr:8.9 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 9db19ce..daacdc0 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.5.1 --set image.tag=8.8.0 +helm install example apache-solr/solr --version 0.5.2-prerelease --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.5.1 --reuse-values --set image.tag=8.9.0 +helm upgrade example apache-solr/solr --version 0.5.2-prerelease --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 f9a63db..c502a10 100644 --- a/version/version.go +++ b/version/version.go @@ -19,8 +19,8 @@ package version var ( // Version information for the Solr Operator - Version = "v0.5.1" - VersionSuffix = "" + Version = "v0.5.2" + VersionSuffix = "prerelease" BuildTime string GitSHA string )
