From 8f32ad91506d818b289a74beca8819481114727b Mon Sep 17 00:00:00 2001 From: ktkfree Date: Wed, 29 Nov 2023 11:10:34 +0900 Subject: [PATCH 1/7] update chart version cluster-api-aws --- tks-cluster/infra/aws/resources.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: From c1cafe328a4b146a5a24d0164095e1af382563c8 Mon Sep 17 00:00:00 2001 From: sungil Date: Mon, 4 Dec 2023 04:15:46 +0000 Subject: [PATCH 2/7] argo-rollout: metrics --- tks-cluster/base/resources.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tks-cluster/base/resources.yaml b/tks-cluster/base/resources.yaml index c62646c..d8dba45 100644 --- a/tks-cluster/base/resources.yaml +++ b/tks-cluster/base/resources.yaml @@ -291,6 +291,15 @@ spec: registry: harbor-cicd.taco-cat.xyz repository: tks/argo-rollouts tag: v1.4.1 + podAnnotations: + prometheus.io/scrape: "true" + prometheus.io/path: /metrics + prometheus.io/port: "8090" + controller: + metrics: + enabled: true + serviceMonitor: + enabled: true dashboard: enabled: false nodeSelector: From 8eaef35baf2ba655494d1fed753dd8b94e427ddd Mon Sep 17 00:00:00 2001 From: sungil Date: Mon, 4 Dec 2023 04:10:52 +0000 Subject: [PATCH 3/7] servicemonitor: enable servicemonitor on kubeControllerManager and kubeScheduler --- lma/base/resources.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lma/base/resources.yaml b/lma/base/resources.yaml index 3c93e5d..0b4e9b3 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: From a62aac6a159c8b375ca791e9e95aeed1d79fa74e Mon Sep 17 00:00:00 2001 From: sungil Date: Mon, 4 Dec 2023 05:21:36 +0000 Subject: [PATCH 4/7] argo-rollout: bugfix: duplicated keys --- tks-cluster/base/resources.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tks-cluster/base/resources.yaml b/tks-cluster/base/resources.yaml index 7ba78b8..c8eb884 100644 --- a/tks-cluster/base/resources.yaml +++ b/tks-cluster/base/resources.yaml @@ -258,15 +258,14 @@ spec: registry: harbor.taco-cat.xyz repository: tks/argo-rollouts tag: v1.4.1 - podAnnotations: - prometheus.io/scrape: "true" - prometheus.io/path: /metrics - prometheus.io/port: "8090" - controller: metrics: enabled: true serviceMonitor: enabled: true + podAnnotations: + prometheus.io/scrape: "true" + prometheus.io/path: /metrics + prometheus.io/port: "8090" dashboard: enabled: false nodeSelector: From 53191ba003d5a0f0d05ab8cc6f8d8b4fe231cce1 Mon Sep 17 00:00:00 2001 From: sungil Date: Tue, 5 Dec 2023 01:13:48 +0000 Subject: [PATCH 5/7] argo-rollouts: add servicemonitor for argo-rollouts at lma-addons --- lma/base/resources.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lma/base/resources.yaml b/lma/base/resources.yaml index 0b4e9b3..89616a6 100644 --- a/lma/base/resources.yaml +++ b/lma/base/resources.yaml @@ -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 From bf02cdb23acef7acadf0a305ddd5d54d77dfb92f Mon Sep 17 00:00:00 2001 From: sungil Date: Tue, 5 Dec 2023 01:15:41 +0000 Subject: [PATCH 6/7] argo-rollouts: remove servicemonitor at the argo-rollouts chart --- tks-cluster/base/resources.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tks-cluster/base/resources.yaml b/tks-cluster/base/resources.yaml index c8eb884..8d13914 100644 --- a/tks-cluster/base/resources.yaml +++ b/tks-cluster/base/resources.yaml @@ -261,7 +261,7 @@ spec: metrics: enabled: true serviceMonitor: - enabled: true + enabled: false podAnnotations: prometheus.io/scrape: "true" prometheus.io/path: /metrics From bd9628d330b331098363be4beacec17e6985e51d Mon Sep 17 00:00:00 2001 From: sungil Date: Tue, 5 Dec 2023 01:20:56 +0000 Subject: [PATCH 7/7] argo-rollouts: add scrape interval --- lma/base/site-values.yaml | 1 + 1 file changed, 1 insertion(+) 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)