From 2eb2e5a9a0d8db1ebcea0fff0dc8f138ed6113a0 Mon Sep 17 00:00:00 2001 From: Povilas Versockas Date: Tue, 10 Oct 2023 14:11:51 +0300 Subject: [PATCH] chore: add helm lint to otel solutions --- .github/workflows/otel-agent-helm-test.yml | 4 ++-- .github/workflows/otel-infra-helm-test.yml | 4 ++-- .github/workflows/otel-integration-helm-test.yml | 4 ++-- otel-agent/k8s-helm/values.yaml | 3 ++- otel-infrastructure-collector/k8s-helm/ci/ci-values.yaml | 3 ++- otel-infrastructure-collector/k8s-helm/values.yaml | 3 ++- otel-integration/k8s-helm/values.yaml | 3 ++- 7 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.github/workflows/otel-agent-helm-test.yml b/.github/workflows/otel-agent-helm-test.yml index 02fe6bc6..c7be51e0 100644 --- a/.github/workflows/otel-agent-helm-test.yml +++ b/.github/workflows/otel-agent-helm-test.yml @@ -1,4 +1,4 @@ -name: Otel Agent Helm Install Test +name: Otel Agent Helm Lint and Install Test on: pull_request: @@ -18,5 +18,5 @@ jobs: with: create-kind-cluster: "true" - name: Run chart-testing (install) - run: ct install --charts otel-agent/k8s-helm + run: ct lint-and-install --charts otel-agent/k8s-helm diff --git a/.github/workflows/otel-infra-helm-test.yml b/.github/workflows/otel-infra-helm-test.yml index 790c10fb..c5dbd94f 100644 --- a/.github/workflows/otel-infra-helm-test.yml +++ b/.github/workflows/otel-infra-helm-test.yml @@ -1,4 +1,4 @@ -name: Otel Infrastructure Collector Helm Install Test +name: Otel Infrastructure Collector Helm Lint and Install Test on: pull_request: @@ -20,5 +20,5 @@ jobs: - name: Setup Secret run: kubectl create secret generic coralogix-keys --from-literal=PRIVATE_KEY=123 - name: Run chart-testing (install) - run: ct install --namespace default --charts otel-infrastructure-collector/k8s-helm + run: ct lint-and-install --namespace default --charts otel-infrastructure-collector/k8s-helm diff --git a/.github/workflows/otel-integration-helm-test.yml b/.github/workflows/otel-integration-helm-test.yml index d3b8d2e8..470cb893 100644 --- a/.github/workflows/otel-integration-helm-test.yml +++ b/.github/workflows/otel-integration-helm-test.yml @@ -1,4 +1,4 @@ -name: Otel Integration Helm Install Test +name: Otel Integration Helm Lint And Install Test on: pull_request: @@ -20,4 +20,4 @@ jobs: - name: Setup Secret run: kubectl create secret generic coralogix-keys --from-literal=PRIVATE_KEY=123 - name: Run chart-testing (install) - run: ct install --namespace default --charts otel-integration/k8s-helm + run: ct lint-and-install --namespace default --charts otel-integration/k8s-helm diff --git a/otel-agent/k8s-helm/values.yaml b/otel-agent/k8s-helm/values.yaml index 05d9b397..4ede5b03 100644 --- a/otel-agent/k8s-helm/values.yaml +++ b/otel-agent/k8s-helm/values.yaml @@ -109,7 +109,8 @@ opentelemetry-collector: - "k8s.job.name" - "k8s.pod.name" - "k8s.node.name" - memory_limiter: null # Will get the k8s resource limits + # Will get the k8s resource limits + memory_limiter: null resourcedetection/env: detectors: ["system","env"] timeout: 2s diff --git a/otel-infrastructure-collector/k8s-helm/ci/ci-values.yaml b/otel-infrastructure-collector/k8s-helm/ci/ci-values.yaml index 5e8aa278..8c427728 100644 --- a/otel-infrastructure-collector/k8s-helm/ci/ci-values.yaml +++ b/otel-infrastructure-collector/k8s-helm/ci/ci-values.yaml @@ -90,7 +90,8 @@ opentelemetry-collector: application_name: "{{.Values.global.defaultApplicationName }}" subsystem_name: "{{.Values.global.defaultSubsystemName }}" processors: - memory_limiter: null # Will get the k8s resource limits + # Will get the k8s resource limits + memory_limiter: null transform/kube-events: log_statements: - context: log diff --git a/otel-infrastructure-collector/k8s-helm/values.yaml b/otel-infrastructure-collector/k8s-helm/values.yaml index 66c45fca..66f36973 100644 --- a/otel-infrastructure-collector/k8s-helm/values.yaml +++ b/otel-infrastructure-collector/k8s-helm/values.yaml @@ -87,7 +87,8 @@ opentelemetry-collector: application_name: "{{.Values.global.defaultApplicationName }}" subsystem_name: "{{.Values.global.defaultSubsystemName }}" processors: - memory_limiter: null # Will get the k8s resource limits + # Will get the k8s resource limits + memory_limiter: null transform/kube-events: log_statements: - context: log diff --git a/otel-integration/k8s-helm/values.yaml b/otel-integration/k8s-helm/values.yaml index 189544f9..f69244bd 100644 --- a/otel-integration/k8s-helm/values.yaml +++ b/otel-integration/k8s-helm/values.yaml @@ -165,7 +165,8 @@ opentelemetry-agent: - name: "k8s.container.name" - name: "k8s.node.name" - name: "k8s.namespace.name" - memory_limiter: null # Will get the k8s resource limits + # Will get the k8s resource limits + memory_limiter: null exporters: coralogix: