diff --git a/.gitignore b/.gitignore index 17877957dc..5fe23d644b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /charts/*/charts +!/charts/agent-operator/charts/ .idea .vscode .project diff --git a/charts/agent-operator/Chart.yaml b/charts/agent-operator/Chart.yaml index 769bc0b7af..f18013057e 100644 --- a/charts/agent-operator/Chart.yaml +++ b/charts/agent-operator/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: grafana-agent-operator description: A Helm chart for Grafana Agent Operator type: application -version: 0.3.20 +version: 0.3.21 appVersion: "0.40.3" home: https://grafana.com/docs/agent/v0.40/ icon: https://raw.githubusercontent.com/grafana/agent/v0.40.3/docs/sources/assets/logo_and_name.png @@ -11,3 +11,11 @@ sources: maintainers: - name: Grafana Agent Team email: grafana-agent-team@googlegroups.com + +dependencies: + - name: agent-crds + version: "0.0.0" + condition: crds.agent.create + - name: prometheus-crds + version: "0.0.0" + condition: crds.prometheus.create diff --git a/charts/agent-operator/README.md b/charts/agent-operator/README.md index 49afcf11e2..87263012ff 100644 --- a/charts/agent-operator/README.md +++ b/charts/agent-operator/README.md @@ -10,7 +10,14 @@ A Helm chart for Grafana Agent Operator * -Note that this chart does not provision custom resources like `GrafanaAgent` and `MetricsInstance` (formerly `PrometheusInstance`) or any `*Monitor` resources. +## Requirements + +| Repository | Name | Version | +|------------|------|---------| +| | agent-crds | 0.0.0 | +| | prometheus-crds | 0.0.0 | + +Note that this chart provisions custom resources like `GrafanaAgent` and `MetricsInstance` (formerly `PrometheusInstance`) and some `*Monitor` resources. CRD provisioning can be disabled. To learn how to deploy these resources, please see Grafana's [Agent Operator getting started guide](https://grafana.com/docs/agent/latest/operator/getting-started/). @@ -56,6 +63,8 @@ A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an | affinity | object | `{}` | Pod affinity configuration | | annotations | object | `{}` | Annotations for the Deployment | | containerSecurityContext | object | `{}` | Container security context (allowPrivilegeEscalation, etc.) | +| crds.agent | object | `{"create":true}` | Whether to install CRDs for monitoring. | +| crds.prometheus.create | bool | `true` | | | extraArgs | list | `[]` | List of additional cli arguments to configure agent-operator (example: `--log.level`) | | fullnameOverride | string | `""` | Overrides the chart's computed fullname | | hostAliases | list | `[]` | hostAliases to add | diff --git a/charts/agent-operator/README.md.gotmpl b/charts/agent-operator/README.md.gotmpl index 3dce97a945..bf71827e62 100644 --- a/charts/agent-operator/README.md.gotmpl +++ b/charts/agent-operator/README.md.gotmpl @@ -10,7 +10,7 @@ {{ template "chart.requirementsSection" . }} -Note that this chart does not provision custom resources like `GrafanaAgent` and `MetricsInstance` (formerly `PrometheusInstance`) or any `*Monitor` resources. +Note that this chart provisions custom resources like `GrafanaAgent` and `MetricsInstance` (formerly `PrometheusInstance`) and some `*Monitor` resources. CRD provisioning can be disabled. To learn how to deploy these resources, please see Grafana's [Agent Operator getting started guide](https://grafana.com/docs/agent/latest/operator/getting-started/). diff --git a/charts/agent-operator/charts/agent-crds/Chart.yaml b/charts/agent-operator/charts/agent-crds/Chart.yaml new file mode 100644 index 0000000000..446b007cc5 --- /dev/null +++ b/charts/agent-operator/charts/agent-crds/Chart.yaml @@ -0,0 +1,3 @@ +apiVersion: v2 +name: agent-crds +version: 0.0.0 diff --git a/charts/agent-operator/charts/agent-crds/README.md b/charts/agent-operator/charts/agent-crds/README.md new file mode 100644 index 0000000000..9219acd45f --- /dev/null +++ b/charts/agent-operator/charts/agent-crds/README.md @@ -0,0 +1,6 @@ +# agent-crds + +![Version: 0.0.0](https://img.shields.io/badge/Version-0.0.0-informational?style=flat-square) + +---------------------------------------------- +Autogenerated from chart metadata using [helm-docs v1.8.1](https://github.com/norwoodj/helm-docs/releases/v1.8.1) diff --git a/charts/agent-operator/crds/monitoring.grafana.com_grafanaagents.yaml b/charts/agent-operator/charts/agent-crds/crds/monitoring.grafana.com_grafanaagents.yaml similarity index 100% rename from charts/agent-operator/crds/monitoring.grafana.com_grafanaagents.yaml rename to charts/agent-operator/charts/agent-crds/crds/monitoring.grafana.com_grafanaagents.yaml diff --git a/charts/agent-operator/crds/monitoring.grafana.com_integrations.yaml b/charts/agent-operator/charts/agent-crds/crds/monitoring.grafana.com_integrations.yaml similarity index 100% rename from charts/agent-operator/crds/monitoring.grafana.com_integrations.yaml rename to charts/agent-operator/charts/agent-crds/crds/monitoring.grafana.com_integrations.yaml diff --git a/charts/agent-operator/crds/monitoring.grafana.com_logsinstances.yaml b/charts/agent-operator/charts/agent-crds/crds/monitoring.grafana.com_logsinstances.yaml similarity index 100% rename from charts/agent-operator/crds/monitoring.grafana.com_logsinstances.yaml rename to charts/agent-operator/charts/agent-crds/crds/monitoring.grafana.com_logsinstances.yaml diff --git a/charts/agent-operator/crds/monitoring.grafana.com_metricsinstances.yaml b/charts/agent-operator/charts/agent-crds/crds/monitoring.grafana.com_metricsinstances.yaml similarity index 100% rename from charts/agent-operator/crds/monitoring.grafana.com_metricsinstances.yaml rename to charts/agent-operator/charts/agent-crds/crds/monitoring.grafana.com_metricsinstances.yaml diff --git a/charts/agent-operator/crds/monitoring.grafana.com_podlogs.yaml b/charts/agent-operator/charts/agent-crds/crds/monitoring.grafana.com_podlogs.yaml similarity index 100% rename from charts/agent-operator/crds/monitoring.grafana.com_podlogs.yaml rename to charts/agent-operator/charts/agent-crds/crds/monitoring.grafana.com_podlogs.yaml diff --git a/charts/agent-operator/charts/agent-crds/values.yaml b/charts/agent-operator/charts/agent-crds/values.yaml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/charts/agent-operator/charts/prometheus-crds/Chart.yaml b/charts/agent-operator/charts/prometheus-crds/Chart.yaml new file mode 100644 index 0000000000..31947b926c --- /dev/null +++ b/charts/agent-operator/charts/prometheus-crds/Chart.yaml @@ -0,0 +1,3 @@ +apiVersion: v2 +name: prometheus-crds +version: 0.0.0 diff --git a/charts/agent-operator/charts/prometheus-crds/README.md b/charts/agent-operator/charts/prometheus-crds/README.md new file mode 100644 index 0000000000..4dfc512c32 --- /dev/null +++ b/charts/agent-operator/charts/prometheus-crds/README.md @@ -0,0 +1,6 @@ +# prometheus-crds + +![Version: 0.0.0](https://img.shields.io/badge/Version-0.0.0-informational?style=flat-square) + +---------------------------------------------- +Autogenerated from chart metadata using [helm-docs v1.8.1](https://github.com/norwoodj/helm-docs/releases/v1.8.1) diff --git a/charts/agent-operator/crds/monitoring.coreos.com_podmonitors.yaml b/charts/agent-operator/charts/prometheus-crds/crds/monitoring.coreos.com_podmonitors.yaml similarity index 100% rename from charts/agent-operator/crds/monitoring.coreos.com_podmonitors.yaml rename to charts/agent-operator/charts/prometheus-crds/crds/monitoring.coreos.com_podmonitors.yaml diff --git a/charts/agent-operator/crds/monitoring.coreos.com_probes.yaml b/charts/agent-operator/charts/prometheus-crds/crds/monitoring.coreos.com_probes.yaml similarity index 100% rename from charts/agent-operator/crds/monitoring.coreos.com_probes.yaml rename to charts/agent-operator/charts/prometheus-crds/crds/monitoring.coreos.com_probes.yaml diff --git a/charts/agent-operator/crds/monitoring.coreos.com_servicemonitors.yaml b/charts/agent-operator/charts/prometheus-crds/crds/monitoring.coreos.com_servicemonitors.yaml similarity index 100% rename from charts/agent-operator/crds/monitoring.coreos.com_servicemonitors.yaml rename to charts/agent-operator/charts/prometheus-crds/crds/monitoring.coreos.com_servicemonitors.yaml diff --git a/charts/agent-operator/charts/prometheus-crds/values.yaml b/charts/agent-operator/charts/prometheus-crds/values.yaml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/charts/agent-operator/values.yaml b/charts/agent-operator/values.yaml index 2c75016249..e0d25d56e9 100644 --- a/charts/agent-operator/values.yaml +++ b/charts/agent-operator/values.yaml @@ -19,6 +19,13 @@ podSecurityContext: {} # -- Container security context (allowPrivilegeEscalation, etc.) containerSecurityContext: {} +crds: + # -- Whether to install CRDs for monitoring. + agent: + create: true + prometheus: + create: true + rbac: # -- Toggle to create ClusterRole and ClusterRoleBinding create: true