From e716a226ff956c9b0bf1267443507afa399838bf Mon Sep 17 00:00:00 2001 From: Justin Daines Date: Tue, 1 Oct 2024 15:58:32 -0400 Subject: [PATCH] feat: Add overrides for excludeTargets and includeTargets --- .gitignore | 2 +- charts/events/Chart.yaml | 2 +- charts/events/README.md | 4 +++- charts/events/templates/deployment.yaml | 13 +++++++++++++ charts/events/values.yaml | 6 ++++++ charts/stack/Chart.lock | 6 +++--- charts/stack/Chart.yaml | 4 ++-- charts/stack/README.md | 2 +- 8 files changed, 30 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 3ef439e9..f49c4234 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ *.tgz demo .kubeconfig - +.idea #terraform integration/.terraform diff --git a/charts/events/Chart.yaml b/charts/events/Chart.yaml index c86ce7a6..17d1b1a8 100644 --- a/charts/events/Chart.yaml +++ b/charts/events/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: events description: Observe kubernetes event collection type: application -version: 0.1.26 +version: 0.2.0 appVersion: v0.11.1 dependencies: - name: endpoint diff --git a/charts/events/README.md b/charts/events/README.md index aad9cdd4..4f6eb56f 100644 --- a/charts/events/README.md +++ b/charts/events/README.md @@ -1,6 +1,6 @@ # events -![Version: 0.1.26](https://img.shields.io/badge/Version-0.1.26-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.11.1](https://img.shields.io/badge/AppVersion-v0.11.1-informational?style=flat-square) +![Version: 0.1.27](https://img.shields.io/badge/Version-0.1.27-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.11.1](https://img.shields.io/badge/AppVersion-v0.11.1-informational?style=flat-square) Observe kubernetes event collection @@ -22,6 +22,8 @@ Observe kubernetes event collection |-----|------|---------|-------------| | affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].key | string | `"observeinc.com/unschedulable"` | | | affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].operator | string | `"DoesNotExist"` | | +| containerOverrides.excludeTargets | object | `{}` | | +| containerOverrides.includeTargets | object | `{}` | | | customLabels | object | `{}` | | | global.observe | object | `{}` | | | image.kube_cluster_info.pullPolicy | string | `"Always"` | | diff --git a/charts/events/templates/deployment.yaml b/charts/events/templates/deployment.yaml index 92a1ec49..48b66189 100644 --- a/charts/events/templates/deployment.yaml +++ b/charts/events/templates/deployment.yaml @@ -47,6 +47,18 @@ spec: image: {{ .Values.image.kube_state_events.repository }}:{{ default .Chart.AppVersion .Values.image.kube_state_events.tag }} imagePullPolicy: {{ .Values.image.kube_state_events.pullPolicy }} args: + # Include excludeTags if defined + {{- if .Values.containerOverrides.excludeTargets }} + {{- range .Values.containerOverrides.excludeTargets }} + - -exclude-target={{ . }} + {{- end }} + {{- end }} + # Include includeTags if defined + {{- if .Values.containerOverrides.includeTargets }} + {{- range .Values.containerOverrides.includeTargets }} + - -include-target={{ . }} + {{- end }} + {{- end }} - -healthz-addr=:5171 - -metrics-addr=:9090 - -o={{ include "observe.collectionEndpointWithToken" . }}/v1/http/kubernetes/events?clusterUid=$(OBSERVE_CLUSTER) @@ -55,6 +67,7 @@ spec: - autoscaling/v1 - batch/v1 - networking.k8s.io/v1 + ports: - containerPort: 5171 - containerPort: 9090 diff --git a/charts/events/values.yaml b/charts/events/values.yaml index b7c8cd4e..cf65b69d 100644 --- a/charts/events/values.yaml +++ b/charts/events/values.yaml @@ -26,6 +26,12 @@ serviceAccount: annotations: {} name: +# Override exclude or include resources matching pattern from being watched. View resources with `kubectl api-resources` +# Does not work for "Core" APIs. Values must be in format //. example "events.k8s.io/v1/events" +containerOverrides: + excludeTargets: {} + includeTargets: {} + resources: limits: cpu: 50m diff --git a/charts/stack/Chart.lock b/charts/stack/Chart.lock index ed68f628..7accc1d3 100644 --- a/charts/stack/Chart.lock +++ b/charts/stack/Chart.lock @@ -7,12 +7,12 @@ dependencies: version: 0.3.25 - name: events repository: file://../events - version: 0.1.26 + version: 0.2.0 - name: proxy repository: file://../proxy version: 0.1.8 - name: traces repository: file://../traces version: 1.0.6 -digest: sha256:0b0eeefbe2ee2ca0698adccdfe5e306976365ced30fe1da7cf83ed4bfb6d3572 -generated: "2024-09-23T14:41:25.299168-07:00" +digest: sha256:6df6b041f08a4cbf0c1c4b6100adb097531bcb721f2802b8fa37a2b3ae83f7cf +generated: "2024-10-02T16:27:16.536402-04:00" diff --git a/charts/stack/Chart.yaml b/charts/stack/Chart.yaml index 2eb76a16..285e66e4 100644 --- a/charts/stack/Chart.yaml +++ b/charts/stack/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: stack description: Observe Kubernetes agent stack type: application -version: 1.0.6 +version: 1.1.0 dependencies: - name: logs version: 0.1.33 @@ -13,7 +13,7 @@ dependencies: repository: file://../metrics condition: metrics.enabled - name: events - version: 0.1.26 + version: 0.2.0 repository: file://../events condition: events.enabled - name: proxy diff --git a/charts/stack/README.md b/charts/stack/README.md index 2c860aed..e2cd0e7a 100644 --- a/charts/stack/README.md +++ b/charts/stack/README.md @@ -14,7 +14,7 @@ Observe Kubernetes agent stack | Repository | Name | Version | |------------|------|---------| -| file://../events | events | 0.1.26 | +| file://../events | events | 0.1.27 | | file://../logs | logs | 0.1.33 | | file://../metrics | metrics | 0.3.25 | | file://../proxy | proxy | 0.1.8 |