Skip to content

Commit

Permalink
chore: add helm lint to otel solutions (#304)
Browse files Browse the repository at this point in the history
  • Loading branch information
povilasv authored Oct 10, 2023
1 parent 10b369f commit 4163036
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 27 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/otel-agent-helm-test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Otel Agent Helm Install Test
name: Otel Agent Helm Lint and Install Test

on:
pull_request:
Expand All @@ -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

4 changes: 2 additions & 2 deletions .github/workflows/otel-infra-helm-test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Otel Infrastructure Collector Helm Install Test
name: Otel Infrastructure Collector Helm Lint and Install Test

on:
pull_request:
Expand All @@ -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

4 changes: 2 additions & 2 deletions .github/workflows/otel-integration-helm-test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Otel Integration Helm Install Test
name: Otel Integration Helm Lint And Install Test

on:
pull_request:
Expand All @@ -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
4 changes: 1 addition & 3 deletions otel-agent/k8s-helm/ci/ci-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@ global:
defaultApplicationName: "default"
defaultSubsystemName: "nodes"
fullnameOverride: otel-coralogix

# Old endpoint based configuration,
# Old endpoint based configuration,
# please use domain instead.
traces:
endpoint: ""
metrics:
endpoint: ""
logs:
endpoint: ""

15 changes: 8 additions & 7 deletions otel-agent/k8s-helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ global:
defaultSubsystemName: "nodes"
fullnameOverride: otel-coralogix

# Old endpoint based configuration,
# Old endpoint based configuration,
# please use domain instead.
traces:
endpoint: ""
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -192,7 +193,7 @@ opentelemetry-collector:
- batch
receivers:
- otlp
tolerations:
tolerations:
- operator: Exists

resources:
Expand Down
3 changes: 2 additions & 1 deletion otel-infrastructure-collector/k8s-helm/ci/ci-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion otel-infrastructure-collector/k8s-helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 8 additions & 9 deletions otel-integration/k8s-helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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:
Expand Down Expand Up @@ -228,8 +229,7 @@ opentelemetry-agent:
- batch
receivers:
- otlp

tolerations:
tolerations:
- operator: Exists

resources:
Expand Down Expand Up @@ -269,7 +269,6 @@ opentelemetry-cluster-collector:
clusterRoleBinding:
name: "coralogix-opentelemetry-collector"
replicaCount: 1

presets:
clusterMetrics:
enabled: true
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -434,7 +434,6 @@ opentelemetry-cluster-collector:
- otlp
- prometheus
- k8s_cluster

tolerations:
- operator: Exists

Expand Down

0 comments on commit 4163036

Please sign in to comment.