Merge pull request #2 from tegridy-io/feat/support-grafana-agent-oper…

…ator Add grafana-agent-operator deployment
tegridy-io · Mar 3, 2024 · 2d24ca2 · 2d24ca2
2 parents dab7226 + 3b3bbc5
commit 2d24ca2
Show file tree

Hide file tree

Showing 12 changed files with 5,813 additions and 38 deletions.
diff --git a/class/defaults.yml b/class/defaults.yml
@@ -26,11 +26,11 @@ parameters:
         nodeSelector: {}
         tolerations: []
 
-      # agent:
-      #   enabled: false
-      #   resources: {}
-      #   nodeSelector: {}
-      #   tolerations: []
+      agent:
+        enabled: false
+        resources: {}
+        nodeSelector: {}
+        tolerations: []
 
     # --- Helm configuration ---------------------------------------------------
 
@@ -40,8 +40,8 @@ parameters:
         nodeSelector: ${sentry_operators:operator:grafana:nodeSelector}
         tolerations: ${sentry_operators:operator:grafana:tolerations}
 
-      # agent:
-      #   fullnameOverride: agent-operator
-      #   resources: ${sentry_operators:operator:agent:resources}
-      #   nodeSelector: ${sentry_operators:operator:agent:nodeSelector}
-      #   tolerations: ${sentry_operators:operator:agent:tolerations}
+      agent:
+        fullnameOverride: agent-operator
+        resources: ${sentry_operators:operator:agent:resources}
+        nodeSelector: ${sentry_operators:operator:agent:nodeSelector}
+        tolerations: ${sentry_operators:operator:agent:tolerations}
diff --git a/class/sentry-operators.yml b/class/sentry-operators.yml
@@ -16,21 +16,21 @@ parameters:
           input_paths: []
           input_type: jsonnet
           output_path: ''
-      # agent:
-      #   'True':
-      #     input_type: helm
-      #     output_type: yaml
-      #     input_paths:
-      #       - ${_base_directory}/helmcharts/agent/${sentry_operators:charts:agent:version}
-      #     output_path: sentry-operators/10_helmchart
-      #     helm_values: ${sentry_operators:helmValues:agent}
-      #     helm_params:
-      #       name: agent-operator
-      #       namespace: ${sentry_operators:namespace:name}
-      #   'False':
-      #     input_paths: []
-      #     input_type: jsonnet
-      #     output_path: ''
+      agent:
+        'True':
+          input_type: helm
+          output_type: yaml
+          input_paths:
+            - ${_base_directory}/helmcharts/agent/${sentry_operators:charts:agent:version}
+          output_path: sentry-operators/10_helmchart
+          helm_values: ${sentry_operators:helmValues:agent}
+          helm_params:
+            name: agent-operator
+            namespace: ${sentry_operators:namespace:name}
+        'False':
+          input_paths: []
+          input_type: jsonnet
+          output_path: ''
     filter:
       grafana:
         'True':
@@ -41,15 +41,15 @@ parameters:
           type: jsonnet
           filter: ''
           path: ''
-      # agent:
-      #   'True':
-      #     type: jsonnet
-      #     filter: postprocess/fix_null.jsonnet
-      #     path: sentry-operators/10_helmchart/grafana-agent-operator/crds
-      #   'False':
-      #     type: jsonnet
-      #     filter: ''
-      #     path: ''
+      agent:
+        'True':
+          type: jsonnet
+          filter: postprocess/fix_null.jsonnet
+          path: sentry-operators/10_helmchart/grafana-agent-operator/crds
+        'False':
+          type: jsonnet
+          filter: ''
+          path: ''
 
   kapitan:
     dependencies:
@@ -81,10 +81,10 @@ parameters:
         output_path: .
       # --- Helm
       - ${_config:compile:grafana:${sentry_operators:operator:grafana:enabled}}
-      # - ${_config:compile:agent:${sentry_operators:operator:agent:enabled}}
+      - ${_config:compile:agent:${sentry_operators:operator:agent:enabled}}
 
   commodore:
     postprocess:
       filters:
         - ${_config:filter:grafana:${sentry_operators:operator:grafana:enabled}}
-        # - ${_config:filter:agent:${sentry_operators:operator:agent:enabled}}
+        - ${_config:filter:agent:${sentry_operators:operator:agent:enabled}}
diff --git a/tests/defaults.yml b/tests/defaults.yml
@@ -3,5 +3,5 @@ parameters:
     operator:
       grafana:
         enabled: true
-      # agent:
-      #   enabled: true
+      agent:
+        enabled: true