Changes to address issues found in v0.3.0 RC2 (apache#262)

- Ability to not use the Zookeeper Operator in the Solr Operator Helm Chart
- Add missing RBAC for finalizers (apache#263)

Author: HoustonPutman

config/rbac/role.yaml

@@ -212,6 +212,12 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - solr.apache.org
+  resources:
+  - solrclouds/finalizers
+  verbs:
+  - update
 - apiGroups:
   - solr.apache.org
   resources:

controllers/solrcloud_controller.go

@@ -73,11 +73,12 @@ func UseZkCRD(useCRD bool) {
 // +kubebuilder:rbac:groups="",resources=configmaps,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups="",resources=configmaps/status,verbs=get;update;patch
 // +kubebuilder:rbac:groups="",resources=persistentvolumeclaims,verbs=get;list;watch;delete
-// +kubebuilder:rbac:groups=solr.apache.org,resources=solrclouds,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=solr.apache.org,resources=solrclouds/status,verbs=get;update;patch
 // +kubebuilder:rbac:groups=zookeeper.pravega.io,resources=zookeeperclusters,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=zookeeper.pravega.io,resources=zookeeperclusters/status,verbs=get;update;patch
 // +kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=solr.apache.org,resources=solrclouds,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=solr.apache.org,resources=solrclouds/status,verbs=get;update;patch
+// +kubebuilder:rbac:groups=solr.apache.org,resources=solrclouds/finalizers,verbs=update
 
 func (r *SolrCloudReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
 	_ = context.Background()

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 }}

helm/solr-operator/templates/role.yaml

@@ -216,6 +216,12 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - solr.apache.org
+  resources:
+  - solrclouds/finalizers
+  verbs:
+  - update
 - apiGroups:
   - solr.apache.org
   resources: