Skip to content

Commit

Permalink
Fixed kustomization specs (#53)
Browse files Browse the repository at this point in the history
* Updated kustomization specs to recent specs

* Removed annotation part-of as that collides with pr-preview

* Added type to hostPath for /mnt
  • Loading branch information
saidsef authored Nov 15, 2023
1 parent 8937aa6 commit 0a7e13f
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 23 deletions.
9 changes: 5 additions & 4 deletions deployment/grafana/kustomization.yml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 1 addition & 3 deletions deployment/kustomization.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
---
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

namespace: monitoring
commonAnnotations:
app.kubernetes.io/created-by: kustomizer
app.kubernetes.io/part-of: monitoring
endpointslice.kubernetes.io/managed-by: controller
pod-security.kubernetes.io/audit: baseline
pod-security.kubernetes.io/warn-version: latest

bases:
resources:
- grafana/
- loki/
- prometheus/
Expand Down
9 changes: 5 additions & 4 deletions deployment/loki/kustomization.yml
Original file line number Diff line number Diff line change
@@ -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
9 changes: 5 additions & 4 deletions deployment/prometheus/kustomization.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
2 changes: 2 additions & 0 deletions deployment/promtail/daemonset.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,11 @@ spec:
- name: mntlibdockercontainers
hostPath:
path: /mnt/docker/containers
type: DirectoryOrCreate
- name: mntpods
hostPath:
path: /mnt/kubelet/pods
type: DirectoryOrCreate
- name: varlibdockercontainers
hostPath:
path: /var/lib/docker/containers
Expand Down
9 changes: 5 additions & 4 deletions deployment/promtail/kustomization.yml
Original file line number Diff line number Diff line change
@@ -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
9 changes: 5 additions & 4 deletions deployment/tempo/kustomization.yml
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 0a7e13f

Please sign in to comment.