From b1489a8dd9b492d7b7867285f8556989dc95523a Mon Sep 17 00:00:00 2001
From: Brad Stein <Brad.Stein@gmail.com>
Date: Fri, 16 Jan 2026 00:15:58 -0300
Subject: [PATCH] fix logging pipeline secret and scheduling

---
 services/crypto/default-serviceaccount.yaml   |  8 ++++
 services/crypto/kustomization.yaml            |  1 +
 .../logging/data-prepper-helmrelease.yaml     | 21 ----------
 .../data-prepper-pipeline-configmap.yaml      | 39 -------------------
 services/logging/kustomization.yaml           |  9 ++++-
 .../scripts/data_prepper_pipelines.yaml       | 31 +++++++++++++++
 .../overlays/atlas/patch-node-selector.yaml   |  2 +-
 7 files changed, 49 insertions(+), 62 deletions(-)
 create mode 100644 services/crypto/default-serviceaccount.yaml
 delete mode 100644 services/logging/data-prepper-pipeline-configmap.yaml
 create mode 100644 services/logging/scripts/data_prepper_pipelines.yaml

diff --git a/services/crypto/default-serviceaccount.yaml b/services/crypto/default-serviceaccount.yaml
new file mode 100644
index 0000000..fca7007
--- /dev/null
+++ b/services/crypto/default-serviceaccount.yaml
@@ -0,0 +1,8 @@
+# services/crypto/default-serviceaccount.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: default
+  namespace: crypto
+imagePullSecrets:
+  - name: harbor-regcred
diff --git a/services/crypto/kustomization.yaml b/services/crypto/kustomization.yaml
index 4e6ee87..f31fc8a 100644
--- a/services/crypto/kustomization.yaml
+++ b/services/crypto/kustomization.yaml
@@ -3,3 +3,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - namespace.yaml
+  - default-serviceaccount.yaml
diff --git a/services/logging/data-prepper-helmrelease.yaml b/services/logging/data-prepper-helmrelease.yaml
index ca3eba0..1c0bc45 100644
--- a/services/logging/data-prepper-helmrelease.yaml
+++ b/services/logging/data-prepper-helmrelease.yaml
@@ -52,24 +52,3 @@ spec:
                   operator: In
                   values:
                     - rpi5
-  postRenderers:
-    - kustomize:
-        patches:
-          - target:
-              group: apps
-              version: v1
-              kind: Deployment
-              name: data-prepper
-            patch: |-
-              apiVersion: apps/v1
-              kind: Deployment
-              metadata:
-                name: data-prepper
-              spec:
-                template:
-                  spec:
-                    volumes:
-                      - name: data-prepper-pipelines
-                        $patch: replace
-                        configMap:
-                          name: data-prepper-pipeline
diff --git a/services/logging/data-prepper-pipeline-configmap.yaml b/services/logging/data-prepper-pipeline-configmap.yaml
deleted file mode 100644
index 13ca326..0000000
--- a/services/logging/data-prepper-pipeline-configmap.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-# services/logging/data-prepper-pipeline-configmap.yaml
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: data-prepper-pipeline
-  namespace: logging
-data:
-  pipelines.yaml: |
-    entry-pipeline:
-      delay: "100"
-      source:
-        otel_trace_source:
-          ssl: false
-      sink:
-        - pipeline:
-            name: "raw-pipeline"
-        - pipeline:
-            name: "service-map-pipeline"
-    raw-pipeline:
-      source:
-        pipeline:
-          name: "entry-pipeline"
-      processor:
-        - otel_traces:
-      sink:
-        - opensearch:
-            hosts: ["http://opensearch-master.logging.svc.cluster.local:9200"]
-            index_type: trace-analytics-raw
-    service-map-pipeline:
-      delay: "100"
-      source:
-        pipeline:
-          name: "entry-pipeline"
-      processor:
-        - service_map:
-      sink:
-        - opensearch:
-            hosts: ["http://opensearch-master.logging.svc.cluster.local:9200"]
-            index_type: trace-analytics-service-map
diff --git a/services/logging/kustomization.yaml b/services/logging/kustomization.yaml
index 394a248..08c73a8 100644
--- a/services/logging/kustomization.yaml
+++ b/services/logging/kustomization.yaml
@@ -10,7 +10,6 @@ resources:
   - node-image-prune-rpi5-serviceaccount.yaml
   - vault-serviceaccount.yaml
   - secretproviderclass.yaml
-  - data-prepper-pipeline-configmap.yaml
   - opensearch-pvc.yaml
   - opensearch-helmrelease.yaml
   - opensearch-dashboards-helmrelease.yaml
@@ -59,3 +58,11 @@ configMapGenerator:
       - seed.py=scripts/opensearch_observability_seed.py
     options:
       disableNameSuffixHash: true
+
+secretGenerator:
+  - name: data-prepper-pipeline
+    namespace: logging
+    files:
+      - pipelines.yaml=scripts/data_prepper_pipelines.yaml
+    options:
+      disableNameSuffixHash: true
diff --git a/services/logging/scripts/data_prepper_pipelines.yaml b/services/logging/scripts/data_prepper_pipelines.yaml
new file mode 100644
index 0000000..5e244ff
--- /dev/null
+++ b/services/logging/scripts/data_prepper_pipelines.yaml
@@ -0,0 +1,31 @@
+entry-pipeline:
+  delay: "100"
+  source:
+    otel_trace_source:
+      ssl: false
+  sink:
+    - pipeline:
+        name: "raw-pipeline"
+    - pipeline:
+        name: "service-map-pipeline"
+raw-pipeline:
+  source:
+    pipeline:
+      name: "entry-pipeline"
+  processor:
+    - otel_traces:
+  sink:
+    - opensearch:
+        hosts: ["http://opensearch-master.logging.svc.cluster.local:9200"]
+        index_type: trace-analytics-raw
+service-map-pipeline:
+  delay: "100"
+  source:
+    pipeline:
+      name: "entry-pipeline"
+  processor:
+    - service_map:
+  sink:
+    - opensearch:
+        hosts: ["http://opensearch-master.logging.svc.cluster.local:9200"]
+        index_type: trace-analytics-service-map
diff --git a/services/sui-metrics/overlays/atlas/patch-node-selector.yaml b/services/sui-metrics/overlays/atlas/patch-node-selector.yaml
index e97ccb7..d4f3360 100644
--- a/services/sui-metrics/overlays/atlas/patch-node-selector.yaml
+++ b/services/sui-metrics/overlays/atlas/patch-node-selector.yaml
@@ -8,4 +8,4 @@ spec:
   template:
     spec:
       nodeSelector:
-        kubernetes.io/hostname: titan-24
+        hardware: rpi5