feat(agent-operator): move crds(agent, prometheus) into separate subc…

…harts Signed-off-by: Mykhailo Kuzmich <[email protected]>
grafana · Nov 11, 2023 · e15f509 · e15f509
1 parent 767b8ab
commit e15f509
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 0 deletions.
diff --git 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
@@ -11,3 +11,11 @@ sources:
 maintainers:
   - name: Grafana Agent Team
     email: [email protected]
+
+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
@@ -0,0 +1,3 @@
+apiVersion: v2
+name: agent-crds
+version: 0.0.0
diff --git a/...monitoring.grafana.com_grafanaagents.yaml → ...monitoring.grafana.com_grafanaagents.yaml b/...monitoring.grafana.com_grafanaagents.yaml → ...monitoring.grafana.com_grafanaagents.yaml
diff --git a/.../monitoring.grafana.com_integrations.yaml → .../monitoring.grafana.com_integrations.yaml b/.../monitoring.grafana.com_integrations.yaml → .../monitoring.grafana.com_integrations.yaml
diff --git a/...monitoring.grafana.com_logsinstances.yaml → ...monitoring.grafana.com_logsinstances.yaml b/...monitoring.grafana.com_logsinstances.yaml → ...monitoring.grafana.com_logsinstances.yaml
diff --git a/...itoring.grafana.com_metricsinstances.yaml → ...itoring.grafana.com_metricsinstances.yaml b/...itoring.grafana.com_metricsinstances.yaml → ...itoring.grafana.com_metricsinstances.yaml
diff --git a/.../crds/monitoring.grafana.com_podlogs.yaml → .../crds/monitoring.grafana.com_podlogs.yaml b/.../crds/monitoring.grafana.com_podlogs.yaml → .../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
@@ -0,0 +1,3 @@
+apiVersion: v2
+name: prometheus-crds
+version: 0.0.0
diff --git a/...ds/monitoring.coreos.com_podmonitors.yaml → ...ds/monitoring.coreos.com_podmonitors.yaml b/...ds/monitoring.coreos.com_podmonitors.yaml → ...ds/monitoring.coreos.com_podmonitors.yaml
diff --git a/...or/crds/monitoring.coreos.com_probes.yaml → ...ds/crds/monitoring.coreos.com_probes.yaml b/...or/crds/monitoring.coreos.com_probes.yaml → ...ds/crds/monitoring.coreos.com_probes.yaml
diff --git a/...onitoring.coreos.com_servicemonitors.yaml → ...onitoring.coreos.com_servicemonitors.yaml b/...onitoring.coreos.com_servicemonitors.yaml → ...onitoring.coreos.com_servicemonitors.yaml
diff --git 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