Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add cluster events deployment to agent stack #156

Merged
merged 9 commits into from
Jul 31, 2024

Conversation

obs-gh-alexlew
Copy link
Contributor

No description provided.

Copy link
Contributor

The following chart updates are necessary:

diff --git a/charts/logs/Chart.yaml b/charts/logs/Chart.yaml
index 3b1cf66..4a1518b 100644
--- a/charts/logs/Chart.yaml
+++ b/charts/logs/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: logs
 description: Observe logs collection
 type: application
-version: 0.1.28
+version: 0.1.29
 dependencies:
   - name: fluent-bit
     version: 0.47.3
diff --git a/charts/stack/Chart.lock b/charts/stack/Chart.lock
index b96c493..61caf9b 100644
--- a/charts/stack/Chart.lock
+++ b/charts/stack/Chart.lock
@@ -1,7 +1,7 @@
 dependencies:
 - name: logs
   repository: file://../logs
-  version: 0.1.28
+  version: 0.1.29
 - name: metrics
   repository: file://../metrics
   version: 0.3.22
@@ -13,6 +13,6 @@ dependencies:
   version: 0.1.7
 - name: traces
   repository: file://../traces
-  version: 0.2.22
-digest: sha256:d507b5355e8b15b0e144c027ce61b36b146b0e25d70770ecab15ede213784684
-generated: "2024-07-21T00:19:55.760674098Z"
+  version: 0.2.23
+digest: sha256:30ef0c3e05d208645f85eaad0a404cdc2999473a4b481c6ced83474a3a3bf7d5
+generated: "2024-07-24T23:47:13.404761327Z"
diff --git a/charts/stack/Chart.yaml b/charts/stack/Chart.yaml
index 1244473..bf77a9e 100644
--- a/charts/stack/Chart.yaml
+++ b/charts/stack/Chart.yaml
@@ -2,10 +2,10 @@ apiVersion: v2
 name: stack
 description: Observe Kubernetes agent stack
 type: application
-version: 0.4.35
+version: 0.4.36
 dependencies:
   - name: logs
-    version: 0.1.28
+    version: 0.1.29
     repository: file://../logs
     condition: logs.enabled
   - name: metrics
@@ -21,7 +21,7 @@ dependencies:
     repository: file://../proxy
     condition: proxy.enabled
   - name: traces
-    version: 0.2.22
+    version: 0.2.23
     repository: file://../traces
     condition: traces.enabled
 maintainers:
diff --git a/charts/traces/Chart.yaml b/charts/traces/Chart.yaml
index 8a0e5b8..1fa0e2a 100644
--- a/charts/traces/Chart.yaml
+++ b/charts/traces/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: traces
 description: Observe OpenTelemetry trace collection
 type: application
-version: 0.2.22
+version: 0.2.23
 dependencies:
   - name: opentelemetry-collector
     version: 0.97.2

fullnameOverride: "observe"
namespaceOverride: "observe"
nameOverride: "daemonset"
namespaceOverride: "k8sexplorer"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we switching namespaceOverride?

path: "observe-agent.yaml"
defaultMode: 420

extraVolumeMounts:
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Injecting our otel collector config as volume

key: id
extraEnvsFrom: []
extraVolumes:
- name: "observe-agent-deployment-config"
Copy link
Contributor Author

@obs-gh-alexlew obs-gh-alexlew Jul 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

injecting the observe-agent.yaml as volume

requests:
cpu: 250m
memory: 256Mi
daemonset:
daemonset:
# Resource settings
resources:
limits:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for removing these! It will likely reduce some pain for now. Eventually we can provide a config, but that's for later.

- {name: serviceaccounts, mode: watch}
processors:
# needs to come after transform/watch_objects in pipelines
observek8sattributes:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume this is the new custom processor.
But yeah the current config.tpl format LGTM. Once we start iterating on it we can have more feedbacks

| deployment-cluster-events.clusterRole.clusterRoleBinding.name | string | `""` | |
| deployment-cluster-events.clusterRole.create | bool | `true` | |
| deployment-cluster-events.clusterRole.name | string | `""` | |
| deployment-cluster-events.clusterRole.rules[0].apiGroups[0] | string | `""` | |
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems a little painful...
I guess it's so that we allow customer to restrict the access for this agent easier?
(Either way this comment doesn't block this PR

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is just the schema for the otel-collector open source chart

@obs-gh-alexlew obs-gh-alexlew merged commit 60886aa into main Jul 31, 2024
4 of 5 checks passed
@obs-gh-alexlew obs-gh-alexlew deleted the alew/add-events-configs branch July 31, 2024 21:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants