[solr-operator] branch main updated: Remove deprecations for v0.4.0 release. (#288)

[ho...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

houston pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr-operator.git


The following commit(s) were added to refs/heads/main by this push:
     new 83865be  Remove deprecations for v0.4.0 release. (#288)
83865be is described below

commit 83865be7dc4eabb355b6088c081434a216ee78bc
Author: Houston Putman <ho...@apache.org>
AuthorDate: Mon Jul 19 14:51:47 2021 -0400

    Remove deprecations for v0.4.0 release. (#288)
---
 docs/upgrade-notes.md                        | 4 +++-
 helm/solr-operator/Chart.yaml                | 9 +++++++++
 helm/solr-operator/README.md                 | 1 -
 helm/solr-operator/templates/deployment.yaml | 3 +--
 helm/solr-operator/values.yaml               | 3 ---
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/docs/upgrade-notes.md b/docs/upgrade-notes.md
index 9a36cd0..7211569 100644
--- a/docs/upgrade-notes.md
+++ b/docs/upgrade-notes.md
@@ -54,11 +54,13 @@ _Note that the Helm chart version does not contain a `v` prefix, which the downl
 ## Upgrade Warnings and Notes
 
 ### v0.4.0
+- The deprecated Solr Operator Helm chart option `useZkOperator` has been removed, use `zookeeper-operator.use` instead.  
+  **Note**: The old option takes a _string_ `"true"`/`"false"`, while the new option takes a _boolean_ `true`/`false`.
+  
 - The default Solr version for `SolrCloud` and `SolrPrometheusExporter` resources has been upgraded from `7.7.0` to `8.9`.
   This will not effect any existing resources, as default versions are hard-written to the resources immediately.
   Only new resources created after the Solr Operator is upgraded to `v0.4.0` will be affected.
 
-
 ### v0.3.0
 - All deprecated CRD fields and Solr Operator options from `v0.2.*` have been removed.
 
diff --git a/helm/solr-operator/Chart.yaml b/helm/solr-operator/Chart.yaml
index b6f178b..6dca87d 100644
--- a/helm/solr-operator/Chart.yaml
+++ b/helm/solr-operator/Chart.yaml
@@ -61,6 +61,15 @@ annotations:
           url: https://github.com/apache/solr-operator/issues/281
         - name: Github PR
           url: https://github.com/apache/solr-operator/pull/279
+    - kind: removed
+      description: "Removed deprecated Solr Operator Helm chart option `useZkOperator`, use `zookeeper-operator.use` instead"
+      links:
+        - name: Github Issue
+          url: https://github.com/apache/solr-operator/issues/286
+        - name: Github PR
+          url: https://github.com/apache/solr-operator/pull/288
+        - name: Deprecating Github PR
+          url: https://github.com/apache/solr-operator/pull/231
     - kind: changed
       description: Default Solr Version upgraded to 8.9, does not affect existing clouds
       links:
diff --git a/helm/solr-operator/README.md b/helm/solr-operator/README.md
index 9866ee5..4be45e1 100644
--- a/helm/solr-operator/README.md
+++ b/helm/solr-operator/README.md
@@ -159,7 +159,6 @@ The command removes all the Kubernetes components associated with the chart and
 | watchNamespaces | string | `""` | A comma-separated list of namespaces that the solr operator should watch. If empty, the solr operator will watch all namespaces in the cluster. If set to `true`, this will be populated with the namespace that the operator is deployed to. |
 | zookeeper-operator.install | boolean | `true` | This option installs the Zookeeper Operator as a helm dependency |
 | zookeeper-operator.use | boolean | `false` | This option enables the use of provided Zookeeper instances for SolrClouds via the Zookeeper Operator, without installing the Zookeeper Operator as a dependency. If `zookeeper-operator.install`=`true`, then this option is ignored. |
-| useZkOperator | string | `"true"` | **DEPRECATED** Replaced by the _boolean_ "zookeeper-operator.use" option. This option will be removed in v0.4.0 |
 | mTLS.clientCertSecret | string | `""` | Name of a Kubernetes TLS secret, in the same namespace, that contains a Client certificate to load into the operator. If provided, this is used when communicating with Solr. |
 | mTLS.caCertSecretKey | string | `""` | Name of a Kubernetes secret, in the same namespace, that contains PEM encoded Root CA Certificate to use when connecting to Solr with Client Auth. |
 | mTLS.caCertSecret | string | `""` | Name of the key in the `caCertSecret` that contains the Root CA Cert as a value. |
diff --git a/helm/solr-operator/templates/deployment.yaml b/helm/solr-operator/templates/deployment.yaml
index 093749b..e6f2991 100644
--- a/helm/solr-operator/templates/deployment.yaml
+++ b/helm/solr-operator/templates/deployment.yaml
@@ -46,8 +46,7 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" 
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         args:
-        # DEPRECATION: v0.4.0 - Remove (eq "true" .Values.useZkOperator)
-        {{- if or (index .Values "zookeeper-operator" "install") (or (index .Values "zookeeper-operator" "use") (eq .Values.useZkOperator "true")) }}
+        {{- if or (index .Values "zookeeper-operator" "install") (index .Values "zookeeper-operator" "use") }}
         - -zk-operator=true
         {{- else }}
         - -zk-operator=false
diff --git a/helm/solr-operator/values.yaml b/helm/solr-operator/values.yaml
index 81a56c0..95886d8 100644
--- a/helm/solr-operator/values.yaml
+++ b/helm/solr-operator/values.yaml
@@ -43,9 +43,6 @@ zookeeper-operator:
   crd:
     create: false
 
-# DEPRECATED: Please use "zookeeper-operator.use" instead.
-useZkOperator: "false"
-
 # A comma-separated list of namespaces that the operator should watch.
 # If empty, the solr operator will watch all namespaces in the cluster.
 watchNamespaces: ""