Changes to address issues found in v0.3.0 RC2 (#262)
- Ability to not use the Zookeeper Operator in the Solr Operator Helm Chart
- Add missing RBAC for finalizers (#263)
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
index a038fc9..30d176f 100644
--- a/config/rbac/role.yaml
+++ b/config/rbac/role.yaml
@@ -215,6 +215,12 @@
- apiGroups:
- solr.apache.org
resources:
+ - solrclouds/finalizers
+ verbs:
+ - update
+- apiGroups:
+ - solr.apache.org
+ resources:
- solrclouds/status
verbs:
- get
diff --git a/controllers/solrcloud_controller.go b/controllers/solrcloud_controller.go
index f625b9c..c2dae2f 100644
--- a/controllers/solrcloud_controller.go
+++ b/controllers/solrcloud_controller.go
@@ -73,11 +73,12 @@
// +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()
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 @@
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 }}
diff --git a/helm/solr-operator/templates/role.yaml b/helm/solr-operator/templates/role.yaml
index 88ce35d..a6790ac 100644
--- a/helm/solr-operator/templates/role.yaml
+++ b/helm/solr-operator/templates/role.yaml
@@ -219,6 +219,12 @@
- apiGroups:
- solr.apache.org
resources:
+ - solrclouds/finalizers
+ verbs:
+ - update
+- apiGroups:
+ - solr.apache.org
+ resources:
- solrclouds/status
verbs:
- get
