From 988d5766897a15fed30c1f84fb80a266edbc5a69 Mon Sep 17 00:00:00 2001 From: Valentin Maillot Date: Fri, 1 Sep 2023 10:27:59 +0200 Subject: [PATCH 1/5] feat(infra-apps): bump infra-apps to 0.173.0 to upgrade KPS to 49.2.0 and add sync policy Signed-off-by: Valentin Maillot --- charts/infra-apps/Chart.yaml | 106 +++++++++++++++++++++++++++------- charts/infra-apps/README.md | 3 +- charts/infra-apps/values.yaml | 7 ++- 3 files changed, 94 insertions(+), 22 deletions(-) diff --git a/charts/infra-apps/Chart.yaml b/charts/infra-apps/Chart.yaml index e1ac6b145..877d46fb2 100644 --- a/charts/infra-apps/Chart.yaml +++ b/charts/infra-apps/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: infra-apps description: Argo CD app-of-apps config for infrastructure components type: application -version: 0.173.0 +version: 0.174.0 home: https://github.com/adfinis/helm-charts/tree/main/charts/infra-apps sources: - https://github.com/adfinis/helm-charts @@ -17,24 +17,90 @@ dependencies: annotations: artifacthub.io/changes: | - kind: changed - description: "feat(argo-cd): Update from 2.8.0 to 2.8.2" - links: - - name: Release 2.8.2 - url: https://github.com/argoproj/argo-cd/releases/tag/v2.8.2 - - name: Release 2.8.1 - url: https://github.com/argoproj/argo-cd/releases/tag/v2.8.1 + description: | + feat(kube-prometheus-stack): Update from 48.3.1 to 49.2.0 - kind: changed - description: "feat(argo-cd): Update chart from 5.43.0 to 5.45.0" + description: "feat(kube_prometheus-stack): Update from 48.3.1 to 49.2.0" links: - - name: "chore: Remove support for autoscaling/v1" - url: https://github.com/argoproj/argo-helm/pull/2237 - - name: "chore: Remove support for legacy cert-manager APIs" - url: https://github.com/argoproj/argo-helm/pull/2238 - - name: "fix: Upgrade redis-exporter to 1.53.0" - url: https://github.com/argoproj/argo-helm/pull/2236 - - name: "fix: add missing permissions to run actions" - url: https://github.com/argoproj/argo-helm/pull/2212 - - name: "fix: Change applicationSet replicaCount to replicas" - url: https://github.com/argoproj/argo-helm/pull/2214 - - name: "fix: global log level configuration" - url: https://github.com/argoproj/argo-helm/pull/2213 + - name: "[kube-prometheus-stack] Add support for relabelings and metricRelabelings" + url: https://github.com/prometheus-community/helm-charts/pull/3683 + - name: "[kube-prometheus-stack] Updates thanos image to v0.32.1" + url: https://github.com/prometheus-community/helm-charts/pull/3735 + - name: "[prometheus] Bump chart dependencies, bump minimum kubeVersion" + url: https://github.com/prometheus-community/helm-charts/pull/3726 + - name: "[prometheus-smartctl-exporter]: update to smartctl exporter v0.11.0" + url: https://github.com/prometheus-community/helm-charts/pull/3734 + - name: "[prometheus-node-exporter] bump version" + url: https://github.com/prometheus-community/helm-charts/pull/3731 + - name: "[kube-state-metrics] add namespaceSelector to servicemonitor" + url: https://github.com/prometheus-community/helm-charts/pull/3670 + - name: "[kube-prometheus-stack] Upgrade crds to 0.67.1" + url: https://github.com/prometheus-community/helm-charts/pull/3668 + - name: "[prometheus-mongodb-exporter] add dnsConfig" + url: https://github.com/prometheus-community/helm-charts/pull/3722 + - name: "[kube-prometheus-stack] Updates thanos image to v0.32.0" + url: https://github.com/prometheus-community/helm-charts/pull/3728 + - name: "[kube-prometheus-stack] update helm release grafana to 6.59.* (#3727)" + url: https://github.com/prometheus-community/helm-charts/pull/3727 + - name: "[alertmanager] Updates Alertmanager image to v0.26.0" + url: https://github.com/prometheus-community/helm-charts/pull/3720 + - name: "feat: allow changing the default revisionHistoryLimit" + url: https://github.com/prometheus-community/helm-charts/pull/3675 + - name: "[prometheus-conntrack-stats-exporter] fix podLabels" + url: https://github.com/prometheus-community/helm-charts/pull/3717 + - name: "[kube-prometheus-stack] Updates Alertmanager image to v0.26.0" + url: https://github.com/prometheus-community/helm-charts/pull/3721 + - name: "change hook from ciliumnetworkpolicy patchWebHook to post" + url: https://github.com/prometheus-community/helm-charts/pull/3719 + - name: "kube-prometheus-stack : change ciliumnetworkpolicy hooks from post to pre in prometheus-operator" + url: https://github.com/prometheus-community/helm-charts/pull/3718 + - name: "Corrected operator service account comment" + url: https://github.com/prometheus-community/helm-charts/pull/3716 + - name: "[jiralert] Added commonLabels to jiralert" + url: https://github.com/prometheus-community/helm-charts/pull/3707 + - name: "update version" + url: https://github.com/prometheus-community/helm-charts/pull/3713 + - name: "[prometheus-snmp-exporter] Allow configuration of ipFamilyPolicy" + url: https://github.com/prometheus-community/helm-charts/pull/3685 + - name: "add pullsecrets" + url: https://github.com/prometheus-community/helm-charts/pull/3705 + - name: "[kube-prometheus-stack] fix typo in scrapeConfigNamespaceSelector" + url: https://github.com/prometheus-community/helm-charts/pull/3706 + - name: "[prometheus-adapter] fix dnsConfig location" + url: https://github.com/prometheus-community/helm-charts/pull/3661 + - name: "[kube-prometheus-stack] Add support for network policy match labels to be specified" + url: https://github.com/prometheus-community/helm-charts/pull/3671 + - name: "[prometheus-windows-exporter] Set correct name for windows_exporter" + url: https://github.com/prometheus-community/helm-charts/pull/3703 + - name: "Remove unused tpl from Prometheus chart" + url: https://github.com/prometheus-community/helm-charts/pull/3702 + - name: "[prometheus-adapter] Allow configuration of ipFamilyPolicy" + url: https://github.com/prometheus-community/helm-charts/pull/3698 + - name: "[prometheus-mongodb-exporter] Allow to add additional labels to all resources" + url: https://github.com/prometheus-community/helm-charts/pull/3697 + - name: "[prom-label-proxy] Add templating support for ingress, service, and args" + url: https://github.com/prometheus-community/helm-charts/pull/3693 + - name: "update / template labels / use appVersion as tag" + url: https://github.com/prometheus-community/helm-charts/pull/3692 + - name: "[prometheus-modbus-exporter] full" + url: https://github.com/prometheus-community/helm-charts/pull/3531 + - name: "[prometheus-blackbox-exporter] allow configuration of ipFamilyPolicy" + url: https://github.com/prometheus-community/helm-charts/pull/3684 + - name: "[alertmanager] Add securityContext to configmap reload" + url: https://github.com/prometheus-community/helm-charts/pull/3659 + - name: "[prometheus-smartctl-exporter]: update to smartctl exporter v0.10.0" + url: https://github.com/prometheus-community/helm-charts/pull/3691 + - name: "feat: allow changing the default revisionHistoryLimit" + url: https://github.com/prometheus-community/helm-charts/pull/3676 + - name: "feat: allow changing the default revisionHistoryLimit" + url: https://github.com/prometheus-community/helm-charts/pull/3677 + - name: "feat: allow changing the default revisionHistoryLimit" + url: https://github.com/prometheus-community/helm-charts/pull/3678 + - name: "[Alertmanager] add enabled property into config block" + url: https://github.com/prometheus-community/helm-charts/pull/3579 + - name: "[alertmanager] feat: allow changing the default revisionHistoryLimit" + url: https://github.com/prometheus-community/helm-charts/pull/3674 + - name: "[alertmanager] Add additional configuration options" + url: https://github.com/prometheus-community/helm-charts/pull/3620 + - name: "[alertmanager-snmp-notifier] Add inline schema" + url: https://github.com/prometheus-community/helm-charts/pull/3496 diff --git a/charts/infra-apps/README.md b/charts/infra-apps/README.md index 2368e799e..96dd335be 100644 --- a/charts/infra-apps/README.md +++ b/charts/infra-apps/README.md @@ -78,7 +78,8 @@ This chart is maintained by [Adfinis](https://adfinis.com/?pk_campaign=github&pk | kubePrometheusStack.destination.namespace | string | `"infra-monitoring"` | Namespace | | kubePrometheusStack.enabled | bool | `false` | Enable prometheus-operator | | kubePrometheusStack.repoURL | string | [repo](https://prometheus-community.github.io/helm-charts) | Repo URL | -| kubePrometheusStack.targetRevision | string | `"48.3.1"` | [kube-prometheus-stack Helm chart](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack) version | +| kubePrometheusStack.syncPolicy | object | `{"syncOptions":["ServerSideApply=true"]}` | Argo CD sync policy for the app | +| kubePrometheusStack.targetRevision | string | `"49.2.0"` | [kube-prometheus-stack Helm chart](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack) version | | kubePrometheusStack.values | object | [upstream values](https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/values.yaml) | Helm values | | kured | object | [example](./examples/kured.yaml) | [kured](https://github.com/kubereboot/kured) | | kured.annotations | object | `{}` | Annotations for Kured app | diff --git a/charts/infra-apps/values.yaml b/charts/infra-apps/values.yaml index b05aaf569..feabe61ee 100644 --- a/charts/infra-apps/values.yaml +++ b/charts/infra-apps/values.yaml @@ -133,7 +133,12 @@ kubePrometheusStack: # -- Chart chart: kube-prometheus-stack # -- [kube-prometheus-stack Helm chart](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack) version - targetRevision: 48.3.1 + targetRevision: 49.2.0 + # -- Argo CD sync policy for the app + syncPolicy: + syncOptions: + # enable server-side-apply for KPS since it get's rid of having to manually sync/replace resources + - ServerSideApply=true # -- Helm values # @default -- [upstream values](https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/values.yaml) values: {} From 7c20ed817a594b21832e1e30683554b37746cf8c Mon Sep 17 00:00:00 2001 From: Valentin Maillot Date: Fri, 1 Sep 2023 10:57:20 +0200 Subject: [PATCH 2/5] chore(Chart.yaml): add more description Signed-off-by: Valentin Maillot --- charts/infra-apps/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/infra-apps/Chart.yaml b/charts/infra-apps/Chart.yaml index 877d46fb2..f2badf48a 100644 --- a/charts/infra-apps/Chart.yaml +++ b/charts/infra-apps/Chart.yaml @@ -18,7 +18,7 @@ annotations: artifacthub.io/changes: | - kind: changed description: | - feat(kube-prometheus-stack): Update from 48.3.1 to 49.2.0 + feat(kube-prometheus-stack): Update from 48.3.1 to 49.2.0 and add `ServerSideApply` sync policy for Argo CD. You have to be aware that it could be broken for Argo CD < v2.5.0. - kind: changed description: "feat(kube_prometheus-stack): Update from 48.3.1 to 49.2.0" links: From a2e7d2bb380a93f91e9e0cc786c086a997936934 Mon Sep 17 00:00:00 2001 From: Valentin Maillot Date: Fri, 1 Sep 2023 11:04:53 +0200 Subject: [PATCH 3/5] chore(README.md): update after rebase Signed-off-by: Valentin Maillot --- charts/infra-apps/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/infra-apps/README.md b/charts/infra-apps/README.md index 96dd335be..915fa9331 100644 --- a/charts/infra-apps/README.md +++ b/charts/infra-apps/README.md @@ -1,6 +1,6 @@ # infra-apps -![Version: 0.173.0](https://img.shields.io/badge/Version-0.173.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 0.174.0](https://img.shields.io/badge/Version-0.174.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) Argo CD app-of-apps config for infrastructure components From 6b96cf67d43db38576a7bc18c7bde6a00356a4d4 Mon Sep 17 00:00:00 2001 From: vmaillot <74190001+vmaillot@users.noreply.github.com> Date: Fri, 1 Sep 2023 11:05:33 +0200 Subject: [PATCH 4/5] chore(values.yaml): add missing double dashes Co-authored-by: Lucas Bickel <116588+hairmare@users.noreply.github.com> --- charts/infra-apps/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/infra-apps/values.yaml b/charts/infra-apps/values.yaml index feabe61ee..d61383fea 100644 --- a/charts/infra-apps/values.yaml +++ b/charts/infra-apps/values.yaml @@ -137,7 +137,7 @@ kubePrometheusStack: # -- Argo CD sync policy for the app syncPolicy: syncOptions: - # enable server-side-apply for KPS since it get's rid of having to manually sync/replace resources + # -- enable server-side-apply for KPS since it get's rid of having to manually sync/replace resources - ServerSideApply=true # -- Helm values # @default -- [upstream values](https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/values.yaml) From d61fede67585238faa44a9f00f3b2a4b1bd0c37a Mon Sep 17 00:00:00 2001 From: Valentin Maillot Date: Fri, 1 Sep 2023 11:15:27 +0200 Subject: [PATCH 5/5] chore(README.md): one more round Signed-off-by: Valentin Maillot --- charts/infra-apps/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/infra-apps/README.md b/charts/infra-apps/README.md index 915fa9331..c2f993114 100644 --- a/charts/infra-apps/README.md +++ b/charts/infra-apps/README.md @@ -79,6 +79,7 @@ This chart is maintained by [Adfinis](https://adfinis.com/?pk_campaign=github&pk | kubePrometheusStack.enabled | bool | `false` | Enable prometheus-operator | | kubePrometheusStack.repoURL | string | [repo](https://prometheus-community.github.io/helm-charts) | Repo URL | | kubePrometheusStack.syncPolicy | object | `{"syncOptions":["ServerSideApply=true"]}` | Argo CD sync policy for the app | +| kubePrometheusStack.syncPolicy.syncOptions[0] | string | `"ServerSideApply=true"` | enable server-side-apply for KPS since it get's rid of having to manually sync/replace resources | | kubePrometheusStack.targetRevision | string | `"49.2.0"` | [kube-prometheus-stack Helm chart](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack) version | | kubePrometheusStack.values | object | [upstream values](https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/values.yaml) | Helm values | | kured | object | [example](./examples/kured.yaml) | [kured](https://github.com/kubereboot/kured) |