diff --git a/deploy/helm/grafana-operator/README.md b/deploy/helm/grafana-operator/README.md index 9594131ea..482338903 100644 --- a/deploy/helm/grafana-operator/README.md +++ b/deploy/helm/grafana-operator/README.md @@ -77,7 +77,7 @@ It's easier to just manage this configuration outside of the operator. | image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. | | imagePullSecrets | list | `[]` | image pull secrets | | isOpenShift | bool | `false` | Determines if the target cluster is OpenShift. Additional rbac permissions for routes will be added on OpenShift | -| leaderElect | bool | `false` | If you want to run multiple replicas of the grafana-operator, this is not recommended. | +| leaderElect | bool | `true` | This is recommended in most scenarios, even when only running a single instance of the operator. | | logging.encoder | string | `"console"` | Log encoding ("console", "json") | | logging.level | string | `"info"` | Configure the verbosity of logging ("debug", "error", "info") | | logging.time | string | `"rfc3339"` | Time encoding ("epoch", "iso8601", "millis", "nano", "rfc3339", "rfc3339nano") | diff --git a/deploy/helm/grafana-operator/templates/cm.yaml b/deploy/helm/grafana-operator/templates/cm.yaml deleted file mode 100644 index 69dd923b1..000000000 --- a/deploy/helm/grafana-operator/templates/cm.yaml +++ /dev/null @@ -1,23 +0,0 @@ -{{- if .Values.leaderElect }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "grafana-operator.fullname" . }} - namespace: {{ include "grafana-operator.namespace" . }} - labels: - {{- include "grafana-operator.labels" . | nindent 4 }} - app.kubernetes.io/component: operator -data: - controller_manager_config.yaml: | - apiVersion: controller-runtime.sigs.k8s.io/v1alpha1 - kind: ControllerManagerConfig - health: - healthProbeBindAddress: :8081 - metrics: - bindAddress: 127.0.0.1:8080 - webhook: - port: 9443 - leaderElection: - leaderElect: true - resourceName: f75f3bba.integreatly.org -{{- end }} diff --git a/deploy/helm/grafana-operator/values.yaml b/deploy/helm/grafana-operator/values.yaml index 37fe5082b..3819f681b 100644 --- a/deploy/helm/grafana-operator/values.yaml +++ b/deploy/helm/grafana-operator/values.yaml @@ -2,8 +2,8 @@ # if true the operator will only be able to manage instances in the same namespace namespaceScope: false -# -- If you want to run multiple replicas of the grafana-operator, this is not recommended. -leaderElect: false +# -- This is recommended in most scenarios, even when only running a single instance of the operator. +leaderElect: true # -- Sets the `WATCH_NAMESPACE` environment variable, # it defines which namespaces the operator should be listening for (e.g. `"grafana, foo"`).