diff --git a/charts/everest/Chart.lock b/charts/everest/Chart.lock index 585b74e8..aad0e5d6 100644 --- a/charts/everest/Chart.lock +++ b/charts/everest/Chart.lock @@ -5,5 +5,8 @@ dependencies: - name: everest-db-namespace repository: file://charts/everest-db-namespace version: 0.0.0 -digest: sha256:de45f56b3032db8bc6e21fc0858bc56d1b8701e7c1edfcc18c61285945235826 -generated: "2024-11-05T15:38:39.638426+05:30" +- name: victoria-metrics-operator + repository: https://victoriametrics.github.io/helm-charts + version: 0.37.0 +digest: sha256:5a31bb7a9b06f09f6ede94ac79bf15182d312ecfea36881be64e2981f1b5ae1a +generated: "2024-11-15T23:27:17.821571+05:30" diff --git a/charts/everest/Chart.yaml b/charts/everest/Chart.yaml index 027fc209..acc87093 100644 --- a/charts/everest/Chart.yaml +++ b/charts/everest/Chart.yaml @@ -25,3 +25,8 @@ dependencies: version: 0.0.0 repository: "file://charts/everest-db-namespace" condition: "everest-db-namespace.enabled" + - name: victoria-metrics-operator + alias: monitoring + version: 0.37.0 + repository: "https://victoriametrics.github.io/helm-charts" + condition: "monitoring.enabled" diff --git a/charts/everest/README.md b/charts/everest/README.md index ac607bf5..27ad509c 100644 --- a/charts/everest/README.md +++ b/charts/everest/README.md @@ -65,7 +65,13 @@ The following table shows the configurable parameters of the Percona Everest cha |-----|------|---------|-------------| | compatibility.openshift | bool | `false` | Enable OpenShift compatibility. If set, ignores olm.install and olm.namespace settings. | | everest-db-namespace.enabled | bool | `false` | Do not enable. | -| monitoring.namespace | string | `"everest-monitoring"` | Namespace where monitoring is installed. Do no change unless you know what you are doing. | +| monitoring.admissionWebhooks.enabled | bool | `false` | | +| monitoring.certManager.enabled | bool | `false` | | +| monitoring.crds.enabled | bool | `false` | | +| monitoring.crds.plain | bool | `true` | | +| monitoring.enabled | bool | `true` | If set, installs VictoriaMetrics operator. | +| monitoring.nameOverride | string | `"vm-operator"` | | +| monitoring.namespaceOverride | string | `"everest-monitoring"` | | | namespaceOverride | string | `""` | Namespace override. Defaults to the value of .Release.Namespace. | | olm.catalogSourceImage | string | `"perconalab/everest-catalog"` | Image to use for Everest CatalogSource. | | olm.image | string | `"quay.io/operator-framework/olm@sha256:1b6002156f568d722c29138575733591037c24b4bfabc67946f268ce4752c3e6"` | Image to use for the OLM components. | diff --git a/charts/everest/templates/everest-monitoring/hooks.yaml b/charts/everest/templates/everest-monitoring/hooks.yaml deleted file mode 100644 index 4d8bd052..00000000 --- a/charts/everest/templates/everest-monitoring/hooks.yaml +++ /dev/null @@ -1,5 +0,0 @@ -# TODO: We will remove the below hooks once we use the VictoriaMetrics Helm chart directly as a dependency. -{{- include "everest.csvCleanup" (dict "namespace" .Values.monitoring.namespace) }} ---- -{{- include "everest.installplanApprover" (dict "namespace" .Values.monitoring.namespace) }} - diff --git a/charts/everest/templates/everest-monitoring/namespace.yaml b/charts/everest/templates/everest-monitoring/namespace.yaml deleted file mode 100644 index 72046784..00000000 --- a/charts/everest/templates/everest-monitoring/namespace.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: {{ .Values.monitoring.namespace }} diff --git a/charts/everest/templates/everest-monitoring/operatorgroup.yaml b/charts/everest/templates/everest-monitoring/operatorgroup.yaml deleted file mode 100644 index 6edffac4..00000000 --- a/charts/everest/templates/everest-monitoring/operatorgroup.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: operators.coreos.com/v1 -kind: OperatorGroup -metadata: - name: {{ .Values.monitoring.namespace }} - namespace: {{ .Values.monitoring.namespace }} -spec: - targetNamespaces: - - {{ .Values.monitoring.namespace }} - upgradeStrategy: Default diff --git a/charts/everest/templates/everest-monitoring/subscription.yaml b/charts/everest/templates/everest-monitoring/subscription.yaml deleted file mode 100644 index c3e933bc..00000000 --- a/charts/everest/templates/everest-monitoring/subscription.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: victoriametrics-operator - namespace: {{ .Values.monitoring.namespace }} -spec: - channel: stable-v0 - config: {} - installPlanApproval: Manual - name: victoriametrics-operator - source: everest-catalog - sourceNamespace: {{ include "everest.olmNamespace" . }} diff --git a/charts/everest/templates/everest-operator/deployment.yaml b/charts/everest/templates/everest-operator/deployment.yaml index c0144a19..432b067e 100644 --- a/charts/everest/templates/everest-operator/deployment.yaml +++ b/charts/everest/templates/everest-operator/deployment.yaml @@ -68,7 +68,7 @@ spec: {{- if .Values.operator.enableLeaderElection }} - --leader-elect {{- end }} - - --monitoring-namespace={{ .Values.monitoring.namespace }} + - --monitoring-namespace={{ .Values.monitoring.namespaceOverride }} - --system-namespace={{ include "everest.namespace" . }} command: - /manager diff --git a/charts/everest/templates/monitoring-namespace.yaml b/charts/everest/templates/monitoring-namespace.yaml new file mode 100644 index 00000000..3a787b86 --- /dev/null +++ b/charts/everest/templates/monitoring-namespace.yaml @@ -0,0 +1,6 @@ +{{- if .Values.monitoring.enabled }} +apiVersion: v1 +kind: Namespace +metadata: + name: {{ .Values.monitoring.namespaceOverride }} +{{- end }} diff --git a/charts/everest/values.yaml b/charts/everest/values.yaml index 5e0f792e..34b6cb35 100644 --- a/charts/everest/values.yaml +++ b/charts/everest/values.yaml @@ -69,9 +69,19 @@ olm: tlsCert: "" # -- Client key for the PackageServer APIService. Overrides the tls.type setting. tlsKey: "" -monitoring: - # -- Namespace where monitoring is installed. Do no change unless you know what you are doing. - namespace: everest-monitoring everest-db-namespace: # -- Do not enable. enabled: false + +monitoring: + # -- If set, installs VictoriaMetrics operator. + enabled: true + namespaceOverride: everest-monitoring + nameOverride: vm-operator + crds: + enabled: false + plain: true + admissionWebhooks: + enabled: false + certManager: + enabled: false