diff --git a/lma/base/resources.yaml b/lma/base/resources.yaml index 3c93e5d..89616a6 100644 --- a/lma/base/resources.yaml +++ b/lma/base/resources.yaml @@ -195,13 +195,13 @@ spec: kubelet: enabled: false kubeControllerManager: - enabled: false + enabled: true coreDns: enabled: true serviceMonitor: interval: TO_BE_FIXED kubeDns: - enabled: false + enabled: true serviceMonitor: interval: TO_BE_FIXED kubeEtcd: @@ -211,7 +211,7 @@ spec: interval: TO_BE_FIXED scheme: http kubeScheduler: - enabled: false + enabled: true kubeProxy: enabled: true serviceMonitor: @@ -753,7 +753,7 @@ spec: type: helmrepo repository: https://harbor.taco-cat.xyz/chartrepo/tks name: lma-addons - version: 1.8.6 + version: 1.8.7 origin: https://openinfradev.github.io/helm-repo releaseName: addons targetNamespace: lma @@ -799,6 +799,9 @@ spec: argocd: enabled: true interval: TO_BE_FIXED + argoRollout: + enabled: true + interval: TO_BE_FIXED argowf: enabled: true interval: TO_BE_FIXED diff --git a/lma/base/site-values.yaml b/lma/base/site-values.yaml index 90fc379..b9519e4 100644 --- a/lma/base/site-values.yaml +++ b/lma/base/site-values.yaml @@ -135,6 +135,7 @@ charts: serviceMonitor.grafana.interval: $(serviceScrapeInterval) serviceMonitor.argocd.interval: $(serviceScrapeInterval) serviceMonitor.argowf.interval: $(serviceScrapeInterval) + serviceMonitor.argoRollout.interval: $(serviceScrapeInterval) serviceMonitor.processExporter.interval: $(serviceScrapeInterval) serviceMonitor.ceph.interval: $(serviceScrapeInterval) serviceMonitor.calico.interval: $(serviceScrapeInterval) diff --git a/tks-cluster/base/resources.yaml b/tks-cluster/base/resources.yaml index b77deab..8d13914 100644 --- a/tks-cluster/base/resources.yaml +++ b/tks-cluster/base/resources.yaml @@ -258,6 +258,14 @@ spec: registry: harbor.taco-cat.xyz repository: tks/argo-rollouts tag: v1.4.1 + metrics: + enabled: true + serviceMonitor: + enabled: false + podAnnotations: + prometheus.io/scrape: "true" + prometheus.io/path: /metrics + prometheus.io/port: "8090" dashboard: enabled: false nodeSelector: diff --git a/tks-cluster/infra/aws/resources.yaml b/tks-cluster/infra/aws/resources.yaml index b0390fb..f6bc7a4 100644 --- a/tks-cluster/infra/aws/resources.yaml +++ b/tks-cluster/infra/aws/resources.yaml @@ -11,7 +11,7 @@ spec: type: helmrepo repository: https://harbor.taco-cat.xyz/chartrepo/tks name: cluster-api-aws - version: 0.10.0 + version: 0.10.1 releaseName: cluster-api-aws targetNamespace: argo values: