From e15f509944cae2b89117826f9d25b402650cf52f Mon Sep 17 00:00:00 2001 From: Mykhailo Kuzmich Date: Sat, 11 Nov 2023 23:26:11 +0200 Subject: [PATCH] feat(agent-operator): move crds(agent, prometheus) into separate subcharts Signed-off-by: Mykhailo Kuzmich --- .gitignore | 1 + charts/agent-operator/Chart.yaml | 8 ++++++++ charts/agent-operator/charts/agent-crds/Chart.yaml | 3 +++ .../crds/monitoring.grafana.com_grafanaagents.yaml | 0 .../crds/monitoring.grafana.com_integrations.yaml | 0 .../crds/monitoring.grafana.com_logsinstances.yaml | 0 .../crds/monitoring.grafana.com_metricsinstances.yaml | 0 .../agent-crds}/crds/monitoring.grafana.com_podlogs.yaml | 0 charts/agent-operator/charts/prometheus-crds/Chart.yaml | 3 +++ .../crds/monitoring.coreos.com_podmonitors.yaml | 0 .../crds/monitoring.coreos.com_probes.yaml | 0 .../crds/monitoring.coreos.com_servicemonitors.yaml | 0 charts/agent-operator/values.yaml | 7 +++++++ 13 files changed, 22 insertions(+) create mode 100644 charts/agent-operator/charts/agent-crds/Chart.yaml rename charts/agent-operator/{ => charts/agent-crds}/crds/monitoring.grafana.com_grafanaagents.yaml (100%) rename charts/agent-operator/{ => charts/agent-crds}/crds/monitoring.grafana.com_integrations.yaml (100%) rename charts/agent-operator/{ => charts/agent-crds}/crds/monitoring.grafana.com_logsinstances.yaml (100%) rename charts/agent-operator/{ => charts/agent-crds}/crds/monitoring.grafana.com_metricsinstances.yaml (100%) rename charts/agent-operator/{ => charts/agent-crds}/crds/monitoring.grafana.com_podlogs.yaml (100%) create mode 100644 charts/agent-operator/charts/prometheus-crds/Chart.yaml rename charts/agent-operator/{ => charts/prometheus-crds}/crds/monitoring.coreos.com_podmonitors.yaml (100%) rename charts/agent-operator/{ => charts/prometheus-crds}/crds/monitoring.coreos.com_probes.yaml (100%) rename charts/agent-operator/{ => charts/prometheus-crds}/crds/monitoring.coreos.com_servicemonitors.yaml (100%) 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 5b50875e7f..c3744cd944 100644 --- a/charts/agent-operator/Chart.yaml +++ b/charts/agent-operator/Chart.yaml @@ -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/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/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/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/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/values.yaml b/charts/agent-operator/values.yaml index fb770e2fd7..e45636ed83 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