From 60ad2ebbd288321380f4d2736fd08f56c7c96104 Mon Sep 17 00:00:00 2001 From: Kevin Park Date: Wed, 18 Oct 2023 21:12:41 +0900 Subject: [PATCH 1/4] Revise prometheus pvc spec syntax error --- build/charts/yorkie-monitoring/values.yaml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/build/charts/yorkie-monitoring/values.yaml b/build/charts/yorkie-monitoring/values.yaml index ce05ef851..6399e28cc 100644 --- a/build/charts/yorkie-monitoring/values.yaml +++ b/build/charts/yorkie-monitoring/values.yaml @@ -164,18 +164,15 @@ kube-prometheus-stack: # Prometheus StorageSpec for persistent data # ref: https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/user-guides/storage.md - # - storageSpec: {} - # Using PersistentVolumeClaim - # - volumeClaimTemplate: - spec: - # storageClassName: gluster - accessModes: ["ReadWriteOnce"] - resources: - requests: - storage: 1Gi - selector: {} + storageSpec: + # Using PersistentVolumeClaim + volumeClaimTemplate: + spec: + # storageClassName: gluster + accessModes: ["ReadWriteOnce"] + resources: + requests: + storage: 1Gi prometheus-node-exporter: # fullnameOverride should be {{monitoring.name}} + "prometheus-node-exporter" From 644db4c143178ad97348791bb6e60adf671cba87 Mon Sep 17 00:00:00 2001 From: Kevin Park Date: Wed, 18 Oct 2023 22:00:01 +0900 Subject: [PATCH 2/4] Upgrade yorkie-monitoring helm chart version --- build/charts/yorkie-monitoring/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/charts/yorkie-monitoring/Chart.yaml b/build/charts/yorkie-monitoring/Chart.yaml index 94746e0dc..09f2fde6d 100644 --- a/build/charts/yorkie-monitoring/Chart.yaml +++ b/build/charts/yorkie-monitoring/Chart.yaml @@ -13,8 +13,8 @@ maintainers: sources: - https://github.com/yorkie-team/yorkie -version: 0.4.0 -appVersion: "0.4.0" +version: 0.4.1 +appVersion: "0.4.1" kubeVersion: ">=1.24.0-0" keywords: From 29906cab711556ef1b4a5452b5c272a346d78f06 Mon Sep 17 00:00:00 2001 From: Kevin Park Date: Wed, 18 Oct 2023 22:30:35 +0900 Subject: [PATCH 3/4] Sync chart version with Yorkie version --- build/charts/yorkie-monitoring/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/charts/yorkie-monitoring/Chart.yaml b/build/charts/yorkie-monitoring/Chart.yaml index 09f2fde6d..b1a6863b2 100644 --- a/build/charts/yorkie-monitoring/Chart.yaml +++ b/build/charts/yorkie-monitoring/Chart.yaml @@ -13,8 +13,8 @@ maintainers: sources: - https://github.com/yorkie-team/yorkie -version: 0.4.1 -appVersion: "0.4.1" +version: 0.4.7 +appVersion: "0.4.7" kubeVersion: ">=1.24.0-0" keywords: From af75197724d54c5c3cbf04ab1519fb2107071a63 Mon Sep 17 00:00:00 2001 From: Kevin Park Date: Wed, 18 Oct 2023 22:49:37 +0900 Subject: [PATCH 4/4] Update MAINTAINING.md version updating guide --- MAINTAINING.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/MAINTAINING.md b/MAINTAINING.md index 4c82f6ea5..d9eb2ded8 100644 --- a/MAINTAINING.md +++ b/MAINTAINING.md @@ -7,8 +7,9 @@ - Update `YORKIE_VERSION` in [Makefile](https://github.com/yorkie-team/yorkie/blob/main/Makefile#L1). - Update `version` and `appVersion` in [yorkie-cluster Helm Chart](https://github.com/yorkie-team/yorkie/blob/main/build/charts/yorkie-cluster/Chart.yaml#L16-L17). - If `yorkie-monitoring` or `yorkie-argocd` Helm Chart have changes, you also need to update `version` and `appVersion` for each chart. - - [yorkie-monitoring Helm Chart](https://github.com/yorkie-team/yorkie/blob/main/build/charts/yorkie-monitoring/Chart.yaml#L16-L17) - - [yorkie-argocd Helm Chart](https://github.com/yorkie-team/yorkie/blob/main/build/charts/yorkie-argocd/Chart.yaml#L16-L17) + - [yorkie-monitoring Helm Chart](https://github.com/yorkie-team/yorkie/blob/main/build/charts/yorkie-monitoring/Chart.yaml#L16-L17) + - [yorkie-argocd Helm Chart](https://github.com/yorkie-team/yorkie/blob/main/build/charts/yorkie-argocd/Chart.yaml#L16-L17) +- Also, you need to update `helmChartTargetRevision` in `yorkie-argocd` Helm Chart's [values.yaml](https://github.com/yorkie-team/yorkie/blob/main/build/charts/yorkie-argocd/values.yaml#L13) ### 2. Write changelog of this version in [CHANGELOG.md](https://github.com/yorkie-team/yorkie/blob/main/CHANGELOG.md).