Fixed kustomization specs to recent specs

saidsef · Nov 15, 2023 · 9fb3d01 · 9fb3d01
1 parent 8937aa6
commit 9fb3d01
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 22 deletions.
diff --git a/deployment/grafana/kustomization.yml b/deployment/grafana/kustomization.yml
@@ -1,12 +1,13 @@
----
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-commonLabels:
-  app.kubernetes.io/name: grafana
-  app.kubernetes.io/created-by: kustomizer
 
 resources:
 - grafana-cm.yml
 - deployment.yml
 - service.yml
+labels:
+- includeSelectors: true
+  pairs:
+    app.kubernetes.io/created-by: kustomizer
+    app.kubernetes.io/name: grafana
diff --git a/deployment/kustomization.yml b/deployment/kustomization.yml
@@ -1,4 +1,3 @@
----
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
@@ -10,7 +9,7 @@ commonAnnotations:
   pod-security.kubernetes.io/audit: baseline
   pod-security.kubernetes.io/warn-version: latest
 
-bases:
+resources:
 - grafana/
 - loki/
 - prometheus/

diff --git a/deployment/loki/kustomization.yml b/deployment/loki/kustomization.yml
@@ -1,12 +1,13 @@
----
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-commonLabels:
-  app.kubernetes.io/name: loki
-  app.kubernetes.io/created-by: kustomizer
 
 resources:
 - loki-cm.yml
 - service.yml
 - statefulset.yml
+labels:
+- includeSelectors: true
+  pairs:
+    app.kubernetes.io/created-by: kustomizer
+    app.kubernetes.io/name: loki
diff --git a/deployment/prometheus/kustomization.yml b/deployment/prometheus/kustomization.yml
@@ -1,10 +1,6 @@
----
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-commonLabels:
-  app.kubernetes.io/name: prometheus
-  app.kubernetes.io/created-by: kustomizer
 
 resources:
 - prometheus-cm.yml
@@ -13,3 +9,8 @@ resources:
 - rbac.yml
 - service.yml
 - secret.yml
+labels:
+- includeSelectors: true
+  pairs:
+    app.kubernetes.io/created-by: kustomizer
+    app.kubernetes.io/name: prometheus
diff --git a/deployment/promtail/kustomization.yml b/deployment/promtail/kustomization.yml
@@ -1,13 +1,14 @@
----
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-commonLabels:
-  app.kubernetes.io/name: promtail
-  app.kubernetes.io/created-by: kustomizer
 
 resources:
 - account.yml
 - daemonset.yml
 - promtail-cm.yml
 - rbac.yml
+labels:
+- includeSelectors: true
+  pairs:
+    app.kubernetes.io/created-by: kustomizer
+    app.kubernetes.io/name: promtail
diff --git a/deployment/tempo/kustomization.yml b/deployment/tempo/kustomization.yml
@@ -1,13 +1,14 @@
----
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-commonLabels:
-  app.kubernetes.io/name: tempo
-  app.kubernetes.io/created-by: kustomizer
 
 resources:
 - account.yml
 - tempo-cm.yml
 - service.yml
 - statefulset.yml
+labels:
+- includeSelectors: true
+  pairs:
+    app.kubernetes.io/created-by: kustomizer
+    app.kubernetes.io/name: tempo