Merge pull request #842 from solarwinds/fixRenderingOfNodeCollector

Fix rendering of node collector
solarwinds · Dec 18, 2024 · 0f32ef6 · 0f32ef6
2 parents 2744eba + 0a85754
commit 0f32ef6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/deploy/helm/Chart.yaml b/deploy/helm/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: swo-k8s-collector
-version: 4.3.0-alpha.8
+version: 4.3.0-alpha.9
 appVersion: 0.12.1
 description: SolarWinds Kubernetes Integration
 keywords:

diff --git a/deploy/helm/templates/node-collector-config-map-windows.yaml b/deploy/helm/templates/node-collector-config-map-windows.yaml
@@ -1,4 +1,4 @@
-{{- if or .Values.otel.logs.enabled .Values.otel.metrics.enabled }}
+{{- if and (or .Values.otel.logs.enabled .Values.otel.metrics.enabled) .Values.otel.windows.enabled }}
 apiVersion: v1
 kind: ConfigMap
 metadata:

diff --git a/deploy/helm/templates/node-collector-daemon-set-windows.yaml b/deploy/helm/templates/node-collector-daemon-set-windows.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.otel.logs.enabled .Values.otel.windows.enabled }}
+{{- if and (or .Values.otel.logs.enabled .Values.otel.metrics.enabled) .Values.otel.windows.enabled }}
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:

diff --git a/deploy/helm/templates/node-collector-pod-monitor.yaml b/deploy/helm/templates/node-collector-pod-monitor.yaml
@@ -16,7 +16,7 @@ metadata:
 spec:
   selector:
     matchLabels:
-      app: {{ include "common.fullname" (tuple . "-logs") }}
+      app: {{ include "common.fullname" (tuple . "-node-collector") }}
   namespaceSelector:
     matchNames:
     - {{ .Release.Namespace }}