From 53aac364c7f745088af5683831a66be21bea7a41 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 ++-- .../workflows/otel-integration-helm-test.yml | 4 ++-- otel-agent/k8s-helm/ci/ci-values.yaml | 4 +--- otel-agent/k8s-helm/values.yaml | 15 ++++++++------- .../k8s-helm/ci/ci-values.yaml | 3 ++- .../k8s-helm/values.yaml | 3 ++- otel-integration/k8s-helm/values.yaml | 17 ++++++++--------- 8 files changed, 27 insertions(+), 27 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/ci/ci-values.yaml b/otel-agent/k8s-helm/ci/ci-values.yaml index e13c1f66..b1aea51d 100644 --- a/otel-agent/k8s-helm/ci/ci-values.yaml +++ b/otel-agent/k8s-helm/ci/ci-values.yaml @@ -3,8 +3,7 @@ global: defaultApplicationName: "default" defaultSubsystemName: "nodes" fullnameOverride: otel-coralogix - - # Old endpoint based configuration, + # Old endpoint based configuration, # please use domain instead. traces: endpoint: "" @@ -12,4 +11,3 @@ global: endpoint: "" logs: endpoint: "" - diff --git a/otel-agent/k8s-helm/values.yaml b/otel-agent/k8s-helm/values.yaml index 05d9b397..265ca20a 100644 --- a/otel-agent/k8s-helm/values.yaml +++ b/otel-agent/k8s-helm/values.yaml @@ -5,7 +5,7 @@ global: defaultSubsystemName: "nodes" fullnameOverride: otel-coralogix - # Old endpoint based configuration, + # Old endpoint based configuration, # please use domain instead. traces: endpoint: "" @@ -85,7 +85,7 @@ opentelemetry-collector: logs: endpoint: "{{ .Values.global.logs.endpoint }}" application_name_attributes: - - "k8s.namespace.name" + - "k8s.namespace.name" - "service.namespace" subsystem_name_attributes: - "k8s.deployment.name" @@ -98,7 +98,7 @@ opentelemetry-collector: processors: k8sattributes: filter: - node_from_env_var: KUBE_NODE_NAME + node_from_env_var: KUBE_NODE_NAME extract: metadata: - "k8s.namespace.name" @@ -109,9 +109,10 @@ 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"] + detectors: ["system", "env"] timeout: 2s override: false spanmetrics: @@ -124,7 +125,7 @@ opentelemetry-collector: - name: "k8s.job.name" - name: "k8s.container.name" - name: "k8s.node.name" - - name: "k8s.namespace.name" + - name: "k8s.namespace.name" receivers: otlp: protocols: @@ -192,7 +193,7 @@ opentelemetry-collector: - batch receivers: - otlp - tolerations: + tolerations: - operator: Exists resources: 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..6e8f5790 100644 --- a/otel-integration/k8s-helm/values.yaml +++ b/otel-integration/k8s-helm/values.yaml @@ -143,7 +143,7 @@ opentelemetry-agent: enabled: true k8sattributes: filter: - node_from_env_var: KUBE_NODE_NAME + node_from_env_var: KUBE_NODE_NAME extract: metadata: - "k8s.namespace.name" @@ -164,8 +164,9 @@ opentelemetry-agent: - name: "k8s.job.name" - name: "k8s.container.name" - name: "k8s.node.name" - - name: "k8s.namespace.name" - memory_limiter: null # Will get the k8s resource limits + - name: "k8s.namespace.name" + # Will get the k8s resource limits + memory_limiter: null exporters: coralogix: @@ -228,8 +229,7 @@ opentelemetry-agent: - batch receivers: - otlp - - tolerations: + tolerations: - operator: Exists resources: @@ -269,7 +269,6 @@ opentelemetry-cluster-collector: clusterRoleBinding: name: "coralogix-opentelemetry-collector" replicaCount: 1 - presets: clusterMetrics: enabled: true @@ -324,7 +323,7 @@ opentelemetry-cluster-collector: processors: k8sattributes: filter: - node_from_env_var: KUBE_NODE_NAME + node_from_env_var: KUBE_NODE_NAME extract: metadata: - "k8s.namespace.name" @@ -380,7 +379,8 @@ opentelemetry-cluster-collector: enabled: true cloud.availability_zone: enabled: true - memory_limiter: null # Will get the k8s resource limits + # Will get the k8s resource limits + memory_limiter: null exporters: coralogix: @@ -434,7 +434,6 @@ opentelemetry-cluster-collector: - otlp - prometheus - k8s_cluster - tolerations: - operator: Exists