Reorder dasmonset, support annotations for serviceaccount (#18)

medic · Jul 31, 2024 · e2761dc · e2761dc
1 parent 02968ce
commit e2761dc
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 59 deletions.
diff --git a/charts/observability/Chart.yaml b/charts/observability/Chart.yaml
@@ -6,7 +6,7 @@ icon: https://avatars.githubusercontent.com/u/474424?s=200&v=4
 
 type: application
 
-version: 0.1.5
+version: 0.1.6
 
 appVersion: ""
 dependencies:

diff --git a/charts/observability/templates/daemonset.yaml b/charts/observability/templates/daemonset.yaml
@@ -2,7 +2,7 @@
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
-  name: {{ include "observability.fullname" . }}
+  name: {{ include "observability.fullname" . }}-vector
   annotations:
     checksum/vector-config: {{ include (print $.Template.BasePath "/vector-configmap.yaml") . | sha256sum }}
   labels:
@@ -26,63 +26,6 @@ spec:
       automountServiceAccountToken: true
       serviceAccountName: {{ include "observability.serviceAccountName" . }}
       containers:
-        - name: node-exporter
-          image: quay.io/prometheus/node-exporter:v1.7.0
-          imagePullPolicy: IfNotPresent
-          securityContext:
-            fsGroup: 65534
-            runAsGroup: 65534
-            runAsNonRoot: true
-            runAsUser: 65534
-          args:
-            - --path.procfs=/host/proc
-            - --path.sysfs=/host/sys
-            - --path.rootfs=/host/root
-            - --path.udev.data=/host/root/run/udev/data
-            - --web.listen-address=[$(HOST_IP)]:9100
-          securityContext:
-            readOnlyRootFilesystem: true
-          env:
-            - name: HOST_IP
-              # value: 127.0.0.1
-              value: 0.0.0.0
-          ports:
-            - name: metrics
-              containerPort: 9100
-              protocol: TCP
-          livenessProbe:
-            failureThreshold: 3
-            httpGet:
-              httpHeaders:
-              path: /
-              port: 9100
-              scheme: HTTP
-            initialDelaySeconds: 0
-            periodSeconds: 10
-            successThreshold: 1
-            timeoutSeconds: 1
-          readinessProbe:
-            failureThreshold: 3
-            httpGet:
-              httpHeaders:
-              path: /
-              port: 9100
-              scheme: HTTP
-            initialDelaySeconds: 0
-            periodSeconds: 10
-            successThreshold: 1
-            timeoutSeconds: 1
-          volumeMounts:
-            - name: procfs
-              mountPath: /host/proc
-              readOnly:  true
-            - name: sysfs
-              mountPath: /host/sys
-              readOnly: true
-            - name: root
-              mountPath: /host/root
-              mountPropagation: HostToContainer
-              readOnly: true
         - name: vector
           image: "timberio/vector:0.35.1-distroless-libc"
           imagePullPolicy: IfNotPresent
@@ -141,6 +84,63 @@ spec:
             - mountPath: /host/sys
               name: sysfs
               readOnly: true
+        - name: node-exporter
+          image: quay.io/prometheus/node-exporter:v1.7.0
+          imagePullPolicy: IfNotPresent
+          securityContext:
+            fsGroup: 65534
+            runAsGroup: 65534
+            runAsNonRoot: true
+            runAsUser: 65534
+          args:
+            - --path.procfs=/host/proc
+            - --path.sysfs=/host/sys
+            - --path.rootfs=/host/root
+            - --path.udev.data=/host/root/run/udev/data
+            - --web.listen-address=[$(HOST_IP)]:9100
+          securityContext:
+            readOnlyRootFilesystem: true
+          env:
+            - name: HOST_IP
+              # value: 127.0.0.1
+              value: 0.0.0.0
+          ports:
+            - name: metrics
+              containerPort: 9100
+              protocol: TCP
+          livenessProbe:
+            failureThreshold: 3
+            httpGet:
+              httpHeaders:
+              path: /
+              port: 9100
+              scheme: HTTP
+            initialDelaySeconds: 0
+            periodSeconds: 10
+            successThreshold: 1
+            timeoutSeconds: 1
+          readinessProbe:
+            failureThreshold: 3
+            httpGet:
+              httpHeaders:
+              path: /
+              port: 9100
+              scheme: HTTP
+            initialDelaySeconds: 0
+            periodSeconds: 10
+            successThreshold: 1
+            timeoutSeconds: 1
+          volumeMounts:
+            - name: procfs
+              mountPath: /host/proc
+              readOnly:  true
+            - name: sysfs
+              mountPath: /host/sys
+              readOnly: true
+            - name: root
+              mountPath: /host/root
+              mountPropagation: HostToContainer
+              readOnly: true
       hostNetwork: false
       hostPID: true
       nodeSelector:

diff --git a/charts/observability/templates/serviceaccount.yaml b/charts/observability/templates/serviceaccount.yaml
@@ -5,4 +5,6 @@ metadata:
   name: {{ include "observability.serviceAccountName" . }}
   labels:
     {{- include "observability.labels" . | nindent 4 }}
+  annotations:
+    {{- toYaml .Values.serviceAccount.annotations | nindent 4 }}
 automountServiceAccountToken: true
diff --git a/charts/observability/values.yaml b/charts/observability/values.yaml
@@ -8,6 +8,7 @@ fullnameOverride: ""
 
 serviceAccount:
   create: true
+  annotations: {}
   name: ""