diff --git a/argocd/apps/application.yaml b/argocd/apps/application.yaml index 0066a76..917eb47 100644 --- a/argocd/apps/application.yaml +++ b/argocd/apps/application.yaml @@ -3,6 +3,10 @@ kind: Application metadata: name: music-man namespace: argocd + labels: + app.kubernetes.io/name: music-man + app.kubernetes.io/part-of: application + app.kubernetes.io/managed-by: argocd finalizers: - resources-finalizer.argocd.argoproj.io spec: @@ -40,6 +44,7 @@ spec: - Validate=true - ServerSideApply=true - Replace=false + timeout: 300s retry: limit: 5 backoff: diff --git a/argocd/apps/cert-manager-application.yaml b/argocd/apps/cert-manager-application.yaml index ae4dea5..f6443c0 100644 --- a/argocd/apps/cert-manager-application.yaml +++ b/argocd/apps/cert-manager-application.yaml @@ -3,6 +3,10 @@ kind: Application metadata: name: cert-manager namespace: argocd + labels: + app.kubernetes.io/name: cert-manager + app.kubernetes.io/part-of: platform + app.kubernetes.io/managed-by: argocd finalizers: - resources-finalizer.argocd.argoproj.io spec: @@ -82,6 +86,7 @@ spec: - ServerSideApply=true - Replace=false + timeout: 300s retry: limit: 5 backoff: diff --git a/argocd/apps/cluster-resources-application.yaml b/argocd/apps/cluster-resources-application.yaml index 8037d13..c38542e 100644 --- a/argocd/apps/cluster-resources-application.yaml +++ b/argocd/apps/cluster-resources-application.yaml @@ -3,6 +3,12 @@ kind: Application metadata: name: cluster-resources namespace: argocd + labels: + app.kubernetes.io/name: cluster-resources + app.kubernetes.io/part-of: platform + app.kubernetes.io/managed-by: argocd + annotations: + argocd.argoproj.io/sync-wave: "1" finalizers: - resources-finalizer.argocd.argoproj.io spec: @@ -30,6 +36,7 @@ spec: - Replace=false - ApplyOutOfSyncOnly=false + timeout: 300s retry: limit: 5 backoff: diff --git a/argocd/apps/fluent-bit.yaml b/argocd/apps/fluent-bit.yaml index 9b65aff..091ebb0 100644 --- a/argocd/apps/fluent-bit.yaml +++ b/argocd/apps/fluent-bit.yaml @@ -3,6 +3,10 @@ kind: Application metadata: name: fluent-bit namespace: argocd + labels: + app.kubernetes.io/name: fluent-bit + app.kubernetes.io/part-of: monitoring-stack + app.kubernetes.io/managed-by: argocd finalizers: - resources-finalizer.argocd.argoproj.io spec: @@ -34,6 +38,7 @@ spec: - CreateNamespace=true - Validate=true - ServerSideApply=true + timeout: 300s retry: limit: 5 backoff: diff --git a/argocd/apps/grafana.yaml b/argocd/apps/grafana.yaml index 326758a..0971fca 100644 --- a/argocd/apps/grafana.yaml +++ b/argocd/apps/grafana.yaml @@ -3,6 +3,10 @@ kind: Application metadata: name: grafana namespace: argocd + labels: + app.kubernetes.io/name: grafana + app.kubernetes.io/part-of: monitoring-stack + app.kubernetes.io/managed-by: argocd finalizers: - resources-finalizer.argocd.argoproj.io spec: @@ -34,6 +38,7 @@ spec: - CreateNamespace=true - Validate=true - ServerSideApply=true + timeout: 300s retry: limit: 5 backoff: diff --git a/argocd/apps/kyverno.yaml b/argocd/apps/kyverno.yaml index f873bbe..bffff61 100644 --- a/argocd/apps/kyverno.yaml +++ b/argocd/apps/kyverno.yaml @@ -3,6 +3,12 @@ kind: Application metadata: name: kyverno namespace: argocd + labels: + app.kubernetes.io/name: kyverno + app.kubernetes.io/part-of: platform + app.kubernetes.io/managed-by: argocd + annotations: + argocd.argoproj.io/sync-wave: "0" finalizers: - resources-finalizer.argocd.argoproj.io spec: @@ -28,6 +34,7 @@ spec: - CreateNamespace=true - Validate=true - ServerSideApply=true + timeout: 300s retry: limit: 5 backoff: diff --git a/argocd/apps/loki.yaml b/argocd/apps/loki.yaml index 95f2df1..e41dd76 100644 --- a/argocd/apps/loki.yaml +++ b/argocd/apps/loki.yaml @@ -3,6 +3,10 @@ kind: Application metadata: name: loki namespace: argocd + labels: + app.kubernetes.io/name: loki + app.kubernetes.io/part-of: monitoring-stack + app.kubernetes.io/managed-by: argocd finalizers: - resources-finalizer.argocd.argoproj.io spec: @@ -34,6 +38,7 @@ spec: - CreateNamespace=true - Validate=true - ServerSideApply=true + timeout: 300s retry: limit: 5 backoff: diff --git a/argocd/apps/prometheus.yaml b/argocd/apps/prometheus.yaml index 71d4f02..fa5f83d 100644 --- a/argocd/apps/prometheus.yaml +++ b/argocd/apps/prometheus.yaml @@ -3,6 +3,10 @@ kind: Application metadata: name: prometheus namespace: argocd + labels: + app.kubernetes.io/name: prometheus + app.kubernetes.io/part-of: monitoring-stack + app.kubernetes.io/managed-by: argocd finalizers: - resources-finalizer.argocd.argoproj.io spec: @@ -34,6 +38,7 @@ spec: - CreateNamespace=true - Validate=true - ServerSideApply=true + timeout: 300s retry: limit: 5 backoff: diff --git a/argocd/apps/sealedsecrets.yaml b/argocd/apps/sealedsecrets.yaml index 4b18ad7..5290f0e 100644 --- a/argocd/apps/sealedsecrets.yaml +++ b/argocd/apps/sealedsecrets.yaml @@ -3,6 +3,10 @@ kind: Application metadata: name: sealed-secrets namespace: argocd + labels: + app.kubernetes.io/name: sealed-secrets + app.kubernetes.io/part-of: platform + app.kubernetes.io/managed-by: argocd finalizers: - resources-finalizer.argocd.argoproj.io spec: @@ -31,6 +35,7 @@ spec: - CreateNamespace=false # kube-system already exists - Validate=true - ServerSideApply=true + timeout: 300s retry: limit: 5 backoff: diff --git a/argocd/apps/traefik-application.yaml b/argocd/apps/traefik-application.yaml index 4be9b80..b4eac4d 100644 --- a/argocd/apps/traefik-application.yaml +++ b/argocd/apps/traefik-application.yaml @@ -3,6 +3,10 @@ kind: Application metadata: name: traefik namespace: argocd + labels: + app.kubernetes.io/name: traefik + app.kubernetes.io/part-of: platform + app.kubernetes.io/managed-by: argocd finalizers: - resources-finalizer.argocd.argoproj.io spec: @@ -57,6 +61,7 @@ spec: - ServerSideApply=true - Replace=false + timeout: 300s retry: limit: 5 backoff: diff --git a/argocd/apps/trivy.yaml b/argocd/apps/trivy.yaml index 8390d17..624c779 100644 --- a/argocd/apps/trivy.yaml +++ b/argocd/apps/trivy.yaml @@ -3,6 +3,10 @@ kind: Application metadata: name: trivy namespace: argocd + labels: + app.kubernetes.io/name: trivy + app.kubernetes.io/part-of: platform + app.kubernetes.io/managed-by: argocd finalizers: - resources-finalizer.argocd.argoproj.io spec: @@ -31,6 +35,7 @@ spec: - CreateNamespace=false # kube-system already exists - Validate=true - ServerSideApply=true + timeout: 300s retry: limit: 5 backoff: diff --git a/argocd/values/fluent-bit-values.yaml b/argocd/values/fluent-bit-values.yaml index 3ea72e6..ffb4145 100644 --- a/argocd/values/fluent-bit-values.yaml +++ b/argocd/values/fluent-bit-values.yaml @@ -60,8 +60,9 @@ tolerations: effect: NoSchedule resources: - limits: - memory: 200Mi requests: + cpu: 50m + memory: 128Mi + limits: cpu: 100m - memory: 100Mi + memory: 256Mi diff --git a/argocd/values/grafana-values.yaml b/argocd/values/grafana-values.yaml index 74452e7..cda6e5c 100644 --- a/argocd/values/grafana-values.yaml +++ b/argocd/values/grafana-values.yaml @@ -1,6 +1,14 @@ ingress: enabled: true +resources: + requests: + cpu: 100m + memory: 128Mi + limits: + cpu: 200m + memory: 256Mi + adminUser: admin adminPassword: "forte" diff --git a/argocd/values/loki-values.yaml b/argocd/values/loki-values.yaml index 8345786..32ca3a0 100644 --- a/argocd/values/loki-values.yaml +++ b/argocd/values/loki-values.yaml @@ -23,6 +23,13 @@ chunksCache: enabled: false singleBinary: replicas: 1 + resources: + requests: + cpu: 100m + memory: 256Mi + limits: + cpu: 200m + memory: 512Mi read: replicas: 0 backend: diff --git a/argocd/values/prometheus-values.yaml b/argocd/values/prometheus-values.yaml index 687f1e6..b7c1c7f 100644 --- a/argocd/values/prometheus-values.yaml +++ b/argocd/values/prometheus-values.yaml @@ -4,6 +4,14 @@ server: service: servicePort: 80 + resources: + requests: + cpu: 250m + memory: 512Mi + limits: + cpu: 500m + memory: 1Gi + # Add your custom scrape configurations here extraScrapeConfigs: | - job_name: kubernetes-nodes-cadvisor