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 2021/04/22 16:18:45 UTC

[solr-operator] branch rc2-changes created (now 89986e3)

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

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


      at 89986e3  Fix Zookeeper Operator helm chart variables.

This branch includes the following new commits:

     new 89986e3  Fix Zookeeper Operator helm chart variables.

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.


[solr-operator] 01/01: Fix Zookeeper Operator helm chart variables.

Posted by ho...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 89986e3956013d7e12ba707fa3d59b56c2876bfe
Author: Houston Putman <ho...@apache.org>
AuthorDate: Thu Apr 22 11:18:27 2021 -0500

    Fix Zookeeper Operator helm chart variables.
---
 helm/solr-operator/templates/deployment.yaml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/helm/solr-operator/templates/deployment.yaml b/helm/solr-operator/templates/deployment.yaml
index 7f800d7..093749b 100644
--- a/helm/solr-operator/templates/deployment.yaml
+++ b/helm/solr-operator/templates/deployment.yaml
@@ -46,10 +46,12 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" 
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         args:
-        # TODO: v0.4.0 - Remove (eq "true" .Values.useZkOperator)
-        {{- if or ".Values.zookeeper-operator.install" (or ".Values.zookeeper-operator.use" (eq .Values.useZkOperator "true")) }}
+        # 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")) }}
         - -zk-operator=true
-        {{- end}}
+        {{- else }}
+        - -zk-operator=false
+        {{- end }}
         {{- if .Values.watchNamespaces }}
         - --watch-namespaces={{- include "solr-operator.watchNamespaces" . -}}
         {{- end }}