feat(k8s): refactor Kubernetes manifests and add missing kustomization files for observability components

OussHammami · OussHammami · commit 22ba5cc0db9f · 2026-01-29T23:49:58.000+01:00
diff --git a/k8s/base/kustomization.yaml b/k8s/base/kustomization.yaml
@@ -2,20 +2,15 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - namespace.yaml
-  - marketfeed/deployment.yaml
-  - marketfeed/service.yaml
-  - rabbitmq/deployment.yaml
-  - rabbitmq/service.yaml
-  - web/deployment.yaml
-  - web/service.yaml
-  - postgres/pvc.yaml
-  - postgres/deployment.yaml
-  - postgres/service.yaml
-  - postgres/init-job.yaml
-  - portfolio-worker/deployment.yaml
-  - trading-worker/deployment.yaml
+  - marketfeed
+  - rabbitmq
+  - web
+  - postgres
+  - portfolio-worker
+  - trading-worker
 
 labels:
   - pairs:
-      app.kubernetes.io/part-of: stocksim
+      app.kubernetes.io/part-of: stocksim
+    includeTemplates: true
+    includeSelectors: false
diff --git a/k8s/base/marketfeed/kustomization.yaml b/k8s/base/marketfeed/kustomization.yaml
@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - deployment.yaml
+  - service.yaml
diff --git a/k8s/base/marketfeed/service.yaml b/k8s/base/marketfeed/service.yaml
@@ -4,7 +4,6 @@ metadata:
   name: marketfeed
   labels:
     app.kubernetes.io/name: marketfeed
-    app.kubernetes.io/part-of: stocksim
 spec:
   selector:
     app.kubernetes.io/name: marketfeed
diff --git a/k8s/base/portfolio-worker/kustomization.yaml b/k8s/base/portfolio-worker/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - deployment.yaml
diff --git a/k8s/base/postgres/kustomization.yaml b/k8s/base/postgres/kustomization.yaml
@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - pvc.yaml
+  - deployment.yaml
+  - service.yaml
+  - init-job.yaml
diff --git a/k8s/base/postgres/pvc.yaml b/k8s/base/postgres/pvc.yaml
@@ -2,6 +2,8 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: postgres-data
+  labels:
+    app.kubernetes.io/name: postgres
 spec:
   accessModes: ["ReadWriteOnce"]
   resources:
diff --git a/k8s/base/postgres/secret.yaml b/k8s/base/postgres/secret.yaml
diff --git a/k8s/base/rabbitmq/kustomization.yaml b/k8s/base/rabbitmq/kustomization.yaml
@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - deployment.yaml
+  - service.yaml
diff --git a/k8s/base/trading-worker/kustomization.yaml b/k8s/base/trading-worker/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - deployment.yaml
diff --git a/k8s/base/web/kustomization.yaml b/k8s/base/web/kustomization.yaml
@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - deployment.yaml
+  - service.yaml
diff --git a/k8s/overlays/local/kustomization.yaml b/k8s/overlays/local/kustomization.yaml
@@ -4,6 +4,7 @@ kind: Kustomization
 namespace: stocksim
 
 resources:
+  - namespace.yaml
   - ../../base
   - marketfeed-ingress.yaml
   - web-ingress.yaml
@@ -18,7 +19,7 @@ images:
   - name: stocksim/web
     newTag: local
   - name: stocksim/portfolio-worker
-    newTag: local  
+    newTag: local
   - name: stocksim/trading-worker
     newTag: local
 
@@ -38,4 +39,11 @@ patches:
   - target:
       kind: Deployment
       name: trading-worker
-    path: trading-worker-patch.yaml
+    path: trading-worker-patch.yaml
+
+labels:
+  - pairs:
+      app.kubernetes.io/part-of: stocksim
+      app.kubernetes.io/instance: local
+    includeTemplates: true
+    includeSelectors: false
diff --git a/k8s/overlays/local/namespace.yaml b/k8s/overlays/local/namespace.yaml
@@ -3,4 +3,4 @@ kind: Namespace
 metadata:
   name: stocksim
   labels:
-    name: stocksim
+    app.kubernetes.io/name: stocksim
diff --git a/k8s/overlays/local/observability/grafana-datasource.yaml b/k8s/overlays/local/observability/grafana-datasource.yaml
@@ -2,6 +2,8 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: grafana-datasources
+  labels:
+    app.kubernetes.io/name: grafana
 data:
   datasource.yaml: |
     apiVersion: 1
diff --git a/k8s/overlays/local/observability/grafana-deploy.yaml b/k8s/overlays/local/observability/grafana-deploy.yaml
@@ -2,30 +2,37 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: grafana
+  labels:
+    app.kubernetes.io/name: grafana
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: grafana
+      app.kubernetes.io/name: grafana
   template:
     metadata:
       labels:
-        app: grafana
+        app.kubernetes.io/name: grafana
     spec:
       containers:
         - name: grafana
           image: grafana/grafana:latest
           ports:
-            - { name: http, containerPort: 3000 }
+            - name: http
+              containerPort: 3000
           env:
             - name: GF_SECURITY_ADMIN_PASSWORD
               value: admin
           volumeMounts:
             - name: ds
               mountPath: /etc/grafana/provisioning/datasources
           resources:
-            requests: { cpu: 50m, memory: 256Mi }
-            limits: { cpu: 250m, memory: 512Mi }
+            requests:
+              cpu: 50m
+              memory: 256Mi
+            limits:
+              cpu: 250m
+              memory: 512Mi
       volumes:
         - name: ds
           configMap:
diff --git a/k8s/overlays/local/observability/grafana-svc.yaml b/k8s/overlays/local/observability/grafana-svc.yaml
@@ -2,8 +2,12 @@ apiVersion: v1
 kind: Service
 metadata:
   name: grafana
+  labels:
+    app.kubernetes.io/name: grafana
 spec:
   selector:
-    app: grafana
+    app.kubernetes.io/name: grafana
   ports:
-    - { name: http, port: 3000, targetPort: http }
+    - name: http
+      port: 3000
+      targetPort: http
diff --git a/k8s/overlays/local/observability/kustomization.yaml b/k8s/overlays/local/observability/kustomization.yaml
@@ -16,3 +16,11 @@ resources:
   - grafana-datasource.yaml
   - grafana-deploy.yaml
   - grafana-svc.yaml
+
+labels:
+  - pairs:
+      app.kubernetes.io/part-of: stocksim
+      app.kubernetes.io/component: observability
+      app.kubernetes.io/instance: local
+    includeTemplates: true
+    includeSelectors: false
diff --git a/k8s/overlays/local/observability/namespace.yaml b/k8s/overlays/local/observability/namespace.yaml
@@ -2,3 +2,5 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: observability
+  labels:
+    app.kubernetes.io/name: observability
diff --git a/k8s/overlays/local/observability/otelcol-config.yaml b/k8s/overlays/local/observability/otelcol-config.yaml
@@ -2,6 +2,8 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: otelcol-config
+  labels:
+    app.kubernetes.io/name: otelcol
 data:
   otelcol.yaml: |
     receivers:
diff --git a/k8s/overlays/local/observability/otelcol-deploy.yaml b/k8s/overlays/local/observability/otelcol-deploy.yaml
@@ -2,31 +2,41 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: otelcol
+  labels:
+    app.kubernetes.io/name: otelcol
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: otelcol
+      app.kubernetes.io/name: otelcol
   template:
     metadata:
       labels:
-        app: otelcol
+        app.kubernetes.io/name: otelcol
     spec:
       containers:
         - name: otelcol
           image: otel/opentelemetry-collector-contrib:0.106.1
           args: ["--config=/conf/otelcol.yaml"]
           ports:
-            - { name: otlp-grpc, containerPort: 4317 }
-            - { name: otlp-http, containerPort: 4318 }
-            - { name: prom-exp, containerPort: 9464 }
-            - { name: otel-metrics, containerPort: 8888 }
+            - name: otlp-grpc
+              containerPort: 4317
+            - name: otlp-http
+              containerPort: 4318
+            - name: prom-exp
+              containerPort: 9464
+            - name: otel-metrics
+              containerPort: 8888
           volumeMounts:
             - name: conf
               mountPath: /conf
           resources:
-            requests: { cpu: 50m, memory: 128Mi }
-            limits: { cpu: 250m, memory: 256Mi }
+            requests:
+              cpu: 50m
+              memory: 128Mi
+            limits:
+              cpu: 250m
+              memory: 256Mi
       volumes:
         - name: conf
           configMap:
diff --git a/k8s/overlays/local/observability/otelcol-svc.yaml b/k8s/overlays/local/observability/otelcol-svc.yaml
@@ -2,11 +2,21 @@ apiVersion: v1
 kind: Service
 metadata:
   name: otelcol
+  labels:
+    app.kubernetes.io/name: otelcol
 spec:
   selector:
-    app: otelcol
+    app.kubernetes.io/name: otelcol
   ports:
-    - { name: otlp-grpc, port: 4317, targetPort: otlp-grpc }
-    - { name: otlp-http, port: 4318, targetPort: otlp-http }
-    - { name: prom-exp, port: 9464, targetPort: prom-exp }
-    - { name: otel-metrics, port: 8888, targetPort: otel-metrics }
+    - name: otlp-grpc
+      port: 4317
+      targetPort: otlp-grpc
+    - name: otlp-http
+      port: 4318
+      targetPort: otlp-http
+    - name: prom-exp
+      port: 9464
+      targetPort: prom-exp
+    - name: otel-metrics
+      port: 8888
+      targetPort: otel-metrics
diff --git a/k8s/overlays/local/observability/prometheus-config.yaml b/k8s/overlays/local/observability/prometheus-config.yaml
@@ -2,6 +2,8 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: prometheus-config
+  labels:
+    app.kubernetes.io/name: prometheus
 data:
   prometheus.yml: |
     global:
diff --git a/k8s/overlays/local/observability/prometheus-deploy.yaml b/k8s/overlays/local/observability/prometheus-deploy.yaml
@@ -2,29 +2,36 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: prometheus
+  labels:
+    app.kubernetes.io/name: prometheus
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: prometheus
+      app.kubernetes.io/name: prometheus
   template:
     metadata:
       labels:
-        app: prometheus
+        app.kubernetes.io/name: prometheus
     spec:
       containers:
         - name: prometheus
           image: prom/prometheus:latest
           args:
             - "--config.file=/etc/prometheus/prometheus.yml"
           ports:
-            - { name: http, containerPort: 9090 }
+            - name: http
+              containerPort: 9090
           volumeMounts:
             - name: conf
               mountPath: /etc/prometheus
           resources:
-            requests: { cpu: 50m, memory: 256Mi }
-            limits: { cpu: 250m, memory: 512Mi }
+            requests:
+              cpu: 50m
+              memory: 256Mi
+            limits:
+              cpu: 250m
+              memory: 512Mi
       volumes:
         - name: conf
           configMap:
diff --git a/k8s/overlays/local/observability/prometheus-svc.yaml b/k8s/overlays/local/observability/prometheus-svc.yaml
@@ -2,8 +2,12 @@ apiVersion: v1
 kind: Service
 metadata:
   name: prometheus
+  labels:
+    app.kubernetes.io/name: prometheus
 spec:
   selector:
-    app: prometheus
+    app.kubernetes.io/name: prometheus
   ports:
-    - { name: http, port: 9090, targetPort: http }
+    - name: http
+      port: 9090
+      targetPort: http
diff --git a/k8s/overlays/local/observability/zipkin-deploy.yaml b/k8s/overlays/local/observability/zipkin-deploy.yaml
diff --git a/k8s/overlays/local/observability/zipkin-svc.yaml b/k8s/overlays/local/observability/zipkin-svc.yaml
