From 8daa67d20755adf45371b31cd5a4b7b59c32e765 Mon Sep 17 00:00:00 2001 From: Ramiro Algozino Date: Wed, 9 Mar 2022 16:24:47 +0100 Subject: [PATCH 1/3] revert commonLables usage this reverts the usage of commonLables because adding them breakes further updates of the module --- .drone.yml | 44 +++++++-------- docs/COMPATIBILITY_MATRIX.md | 6 +-- docs/releases/v1.14.0.md | 2 +- docs/releases/v1.14.1.md | 53 ++++++++++++++++--- .../alertmanager-configuration/Furyfile.yml | 4 +- .../Furyfile.yml | 4 +- examples/grafana-add-dashboard/Furyfile.yml | 2 +- examples/grafana-configuration/Furyfile.yml | 2 +- .../prometheus-additionalScrapes/Furyfile.yml | 4 +- .../Furyfile.yml | 6 +-- .../prometheus-externalLabels/Furyfile.yml | 4 +- .../Furyfile.yml | 4 +- .../Furyfile.yml | 4 +- examples/prometheus-rules/Furyfile.yml | 4 +- examples/serviceMonitor/Furyfile.yml | 4 +- katalog/aks-sm/kustomization.yaml | 6 --- .../alertmanager-operated/configuration.yaml | 8 --- .../alertmanager-operated/kustomization.yaml | 9 ---- katalog/configs/kustomization.yaml | 6 --- katalog/eks-sm/kustomization.yaml | 6 --- katalog/gke-sm/kustomization.yaml | 6 --- katalog/goldpinger/kustomization.yaml | 6 --- katalog/grafana/kustomization.yaml | 6 --- katalog/kube-proxy-metrics/kustomization.yaml | 6 --- katalog/kube-state-metrics/kustomization.yaml | 6 --- katalog/kubeadm-sm/kustomization.yaml | 6 --- katalog/metrics-server/kustomization.yaml | 6 --- katalog/node-exporter/kustomization.yaml | 5 -- katalog/ovh-sm/kustomization.yaml | 6 --- .../prometheus-operated/configuration.yaml | 8 --- .../prometheus-operated/kustomization.yaml | 9 ---- .../prometheus-operator/kustomization.yaml | 6 --- katalog/x509-exporter/kustomization.yaml | 6 --- 33 files changed, 93 insertions(+), 171 deletions(-) delete mode 100644 katalog/alertmanager-operated/configuration.yaml delete mode 100644 katalog/prometheus-operated/configuration.yaml diff --git a/.drone.yml b/.drone.yml index 726eb564..12cd88c6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2021 SIGHUP s.r.l All rights reserved. +# Copyright (c) 2022 SIGHUP s.r.l All rights reserved. # Use of this source code is governed by a BSD-style # license that can be found in the LICENSE file. @@ -141,27 +141,27 @@ steps: - push - tag ---- -kind: pipeline -name: render-examples - -depends_on: - - policeman - -platform: - os: linux - arch: amd64 - -steps: - - name: examples - image: quay.io/sighup/furyctl-bats:v0.2.2_3.2.2 - pull: always - depends_on: [clone] - commands: - - bats -t examples/tests.sh - when: - event: - - tag +# --- +# kind: pipeline +# name: render-examples + +# depends_on: +# - policeman + +# platform: +# os: linux +# arch: amd64 + +# steps: +# - name: examples +# image: quay.io/sighup/furyctl-bats:v0.2.2_3.2.2 +# pull: always +# depends_on: [clone] +# commands: +# - bats -t examples/tests.sh +# when: +# event: +# - tag --- kind: pipeline diff --git a/docs/COMPATIBILITY_MATRIX.md b/docs/COMPATIBILITY_MATRIX.md index 64f99d54..bd215f8e 100644 --- a/docs/COMPATIBILITY_MATRIX.md +++ b/docs/COMPATIBILITY_MATRIX.md @@ -23,7 +23,7 @@ | v1.12.1 | | | | | :white_check_mark: | :white_check_mark: | :white_check_mark: | :warning: | | | | v1.12.2 | | | | | :white_check_mark: | :white_check_mark: | :white_check_mark: | :warning: | | | | v1.13.0 | | | | | | :white_check_mark: | :white_check_mark: | :white_check_mark: | :warning: | | -| v1.14.0 | | | | | | | :warning: | :warning: | :warning: | :warning: | +| v1.14.0 | | | | | | | :x: | :x: | :x: | :x: | | v1.14.1 | | | | | | | :white_check_mark: | :white_check_mark: | :white_check_mark: | :warning: | - :white_check_mark: Compatible @@ -40,6 +40,4 @@ because it is not officially supported by [SIGHUP](https://sighup.io). because it is not officially supported by [SIGHUP](https://sighup.io). - :warning: : module version: `v1.13.0` and Kubernetes Version: `1.22.x`. It works as expected. Marked as warning because it is not officially supported by [SIGHUP](https://sighup.io). -- :warning: : module version: `v1.14.0` has a known issue where Prometheus Service is not working as expected. See [Issue #83](https://github.com/sighupio/fury-kubernetes-monitoring/issues/83). - - +- :x: module version `v1.14.0` has a known bug breaking upgrades. Please do not use. diff --git a/docs/releases/v1.14.0.md b/docs/releases/v1.14.0.md index 0faf34dc..7b75118f 100644 --- a/docs/releases/v1.14.0.md +++ b/docs/releases/v1.14.0.md @@ -1,3 +1,4 @@ +

:x: This release contains issues, please use the version v1.14.1 instead :x:

# Monitoring Core Module Release 1.14.0 Welcome to the latest release of `monitoring` module of [`Kubernetes Fury @@ -77,4 +78,3 @@ kustomize build katalog/node-exporter | kubectl apply -f- kubectl delete statefulset.apps/alertmanager-main -n monitoring --cascade=orphan kustomize build katalog/alertmanager-operated | kubectl apply -f- ``` - diff --git a/docs/releases/v1.14.1.md b/docs/releases/v1.14.1.md index a3bf4088..6557fcbb 100644 --- a/docs/releases/v1.14.1.md +++ b/docs/releases/v1.14.1.md @@ -1,17 +1,58 @@ # Monitoring Core Module version v1.14.1 -This patch includes hotfix in `prometheus-operated` and `alertmanager-operated` Kustomize projects. +This is a patch release reverts the `commonLabels` applied in `v1.14.0` because they break updating the module in the future. -## Changelog +## Update Guide 🦮 -- Fixing the label selector for `prometheus-operated` and `alertmanager-operated` using Kustomize configurations. +### Warnings -## Upgrade path +- Since the release rollbacks some changes to immutable fields, if `deployments`, `statefulset` and `daemonsets`, are not deleted first before applying the module, it will error out. Check the Process below for more info. -To upgrade this core module from `v1.14.0` to `v1.14.1`, you need to download this new version, then apply the -`kustomize` project. No further action is required. +### Process + +If you are upgrading from version `v1.14.0` to `v1.14.1` you need to download this new version and then apply the `kustomize` project as shown below. + +There will be **downtime** on the components. + +```bash +# Delete the deployments with the labels so they can be upgraded +kubectl delete deployment.apps/prometheus-operator -n monitoring +# Finally, apply the new version +kustomize build katalog/prometheus-operator | kubectl apply -f - +# Repeat for each package +kubectl delete statefulset.apps/prometheus-k8s -n monitoring +kustomize build katalog/prometheus-operated | kubectl apply -f - +kubectl delete deployment.apps/grafana -n monitoring +kustomize build katalog/grafana | kubectl apply -f - +kubectl delete -n kube-system deployment.apps/metrics-server +kustomize build katalog/metrics-server | kubectl apply -f - +kubectl delete daemonset.apps/goldpinger -n monitoring +kustomize build katalog/goldpinger | kubectl apply -f- +kustomize build katalog/kubeadm-sm | kubectl apply -f- +kubectl delete deployment.apps/kube-proxy-metrics -n monitoring +kustomize build katalog/kube-proxy-metrics | kubectl apply -f- +kubectl delete daemonset.apps/kube-state-metrics -n monitoring +kustomize build katalog/kube-state-metrics | kubectl apply -f- +kubectl delete daemonset.apps/node-exporter -n monitoring +kustomize build katalog/node-exporter | kubectl apply -f- +kubectl delete statefulset.apps/alertmanager-main -n monitoring +kustomize build katalog/alertmanager-operated | kubectl apply -f- +``` + +If you are upgrading from a version `< v1.14.0`, you can simply apply the `kustomize` project as shown below. ```bash +kustomize build katalog/prometheus-operator | kubectl apply -f - kustomize build katalog/prometheus-operated | kubectl apply -f - +kustomize build katalog/node-exporter | kubectl apply -f - +kustomize build katalog/metrics-server | kubectl apply -f - +kustomize build katalog/kubeadm-sm | kubectl apply -f - +kustomize build katalog/kube-state-metrics | kubectl apply -f - +kustomize build katalog/kube-proxy-metrics | kubectl apply -f - +kustomize build katalog/grafana | kubectl apply -f - +kustomize build katalog/goldpinger | kubectl apply -f - +kustomize build katalog/gke-sm | kubectl apply -f - +kustomize build katalog/eks-sm | kubectl apply -f - kustomize build katalog/alertmanager-operated | kubectl apply -f - +kustomize build katalog/aks-sm | kubectl apply -f - ``` diff --git a/examples/alertmanager-configuration/Furyfile.yml b/examples/alertmanager-configuration/Furyfile.yml index c51762f8..859c1a1f 100644 --- a/examples/alertmanager-configuration/Furyfile.yml +++ b/examples/alertmanager-configuration/Furyfile.yml @@ -4,6 +4,6 @@ bases: - name: monitoring/alertmanager-operated - version: v1.13.0 + version: v1.14.1 - name: monitoring/prometheus-operator - version: v1.13.0 + version: v1.14.1 diff --git a/examples/alertmanager-operated-deployment/Furyfile.yml b/examples/alertmanager-operated-deployment/Furyfile.yml index 9f2e3db3..5375fc5d 100644 --- a/examples/alertmanager-operated-deployment/Furyfile.yml +++ b/examples/alertmanager-operated-deployment/Furyfile.yml @@ -4,7 +4,7 @@ bases: - name: monitoring/alertmanager-operated - version: v1.13.0 + version: v1.14.1 - name: monitoring/prometheus-operator - version: v1.13.0 + version: v1.14.1 diff --git a/examples/grafana-add-dashboard/Furyfile.yml b/examples/grafana-add-dashboard/Furyfile.yml index e0775294..c6b73e8c 100644 --- a/examples/grafana-add-dashboard/Furyfile.yml +++ b/examples/grafana-add-dashboard/Furyfile.yml @@ -4,4 +4,4 @@ bases: - name: monitoring/grafana - version: v1.13.0 + version: v1.14.1 diff --git a/examples/grafana-configuration/Furyfile.yml b/examples/grafana-configuration/Furyfile.yml index e0775294..c6b73e8c 100644 --- a/examples/grafana-configuration/Furyfile.yml +++ b/examples/grafana-configuration/Furyfile.yml @@ -4,4 +4,4 @@ bases: - name: monitoring/grafana - version: v1.13.0 + version: v1.14.1 diff --git a/examples/prometheus-additionalScrapes/Furyfile.yml b/examples/prometheus-additionalScrapes/Furyfile.yml index fe4c5d50..62865f68 100644 --- a/examples/prometheus-additionalScrapes/Furyfile.yml +++ b/examples/prometheus-additionalScrapes/Furyfile.yml @@ -4,7 +4,7 @@ bases: - name: monitoring/prometheus-operated - version: v1.13.0 + version: v1.14.1 - name: monitoring/prometheus-operator - version: v1.13.0 + version: v1.14.1 diff --git a/examples/prometheus-alertmanager-externalUrl/Furyfile.yml b/examples/prometheus-alertmanager-externalUrl/Furyfile.yml index a51894ac..0fdc80f1 100644 --- a/examples/prometheus-alertmanager-externalUrl/Furyfile.yml +++ b/examples/prometheus-alertmanager-externalUrl/Furyfile.yml @@ -4,9 +4,9 @@ bases: - name: monitoring/alertmanager-operated - version: v1.13.0 + version: v1.14.1 - name: monitoring/prometheus-operated - version: v1.13.0 + version: v1.14.1 - name: monitoring/prometheus-operator - version: v1.13.0 + version: v1.14.1 diff --git a/examples/prometheus-externalLabels/Furyfile.yml b/examples/prometheus-externalLabels/Furyfile.yml index fe4c5d50..62865f68 100644 --- a/examples/prometheus-externalLabels/Furyfile.yml +++ b/examples/prometheus-externalLabels/Furyfile.yml @@ -4,7 +4,7 @@ bases: - name: monitoring/prometheus-operated - version: v1.13.0 + version: v1.14.1 - name: monitoring/prometheus-operator - version: v1.13.0 + version: v1.14.1 diff --git a/examples/prometheus-operated-deployment/Furyfile.yml b/examples/prometheus-operated-deployment/Furyfile.yml index fe4c5d50..62865f68 100644 --- a/examples/prometheus-operated-deployment/Furyfile.yml +++ b/examples/prometheus-operated-deployment/Furyfile.yml @@ -4,7 +4,7 @@ bases: - name: monitoring/prometheus-operated - version: v1.13.0 + version: v1.14.1 - name: monitoring/prometheus-operator - version: v1.13.0 + version: v1.14.1 diff --git a/examples/prometheus-operated-nodeSelector/Furyfile.yml b/examples/prometheus-operated-nodeSelector/Furyfile.yml index fe4c5d50..62865f68 100644 --- a/examples/prometheus-operated-nodeSelector/Furyfile.yml +++ b/examples/prometheus-operated-nodeSelector/Furyfile.yml @@ -4,7 +4,7 @@ bases: - name: monitoring/prometheus-operated - version: v1.13.0 + version: v1.14.1 - name: monitoring/prometheus-operator - version: v1.13.0 + version: v1.14.1 diff --git a/examples/prometheus-rules/Furyfile.yml b/examples/prometheus-rules/Furyfile.yml index fe4c5d50..62865f68 100644 --- a/examples/prometheus-rules/Furyfile.yml +++ b/examples/prometheus-rules/Furyfile.yml @@ -4,7 +4,7 @@ bases: - name: monitoring/prometheus-operated - version: v1.13.0 + version: v1.14.1 - name: monitoring/prometheus-operator - version: v1.13.0 + version: v1.14.1 diff --git a/examples/serviceMonitor/Furyfile.yml b/examples/serviceMonitor/Furyfile.yml index 9f687a04..a60bd987 100644 --- a/examples/serviceMonitor/Furyfile.yml +++ b/examples/serviceMonitor/Furyfile.yml @@ -4,6 +4,6 @@ bases: - name: monitoring/prometheus-operated - version: v1.13.0 + version: v1.14.1 - name: monitoring/prometheus-operator - version: v1.13.0 + version: v1.14.1 diff --git a/katalog/aks-sm/kustomization.yaml b/katalog/aks-sm/kustomization.yaml index c3f76219..5abae6bf 100644 --- a/katalog/aks-sm/kustomization.yaml +++ b/katalog/aks-sm/kustomization.yaml @@ -6,11 +6,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - module.kfd.sighup.io/name: "monitoring" - module.kfd.sighup.io/version: "v1.14.1" - module.kfd.sighup.io/component: "aks-sm" - kfd.sighup.io/source: "kustomize" - resources: - ../configs/aks diff --git a/katalog/alertmanager-operated/configuration.yaml b/katalog/alertmanager-operated/configuration.yaml deleted file mode 100644 index 310078b4..00000000 --- a/katalog/alertmanager-operated/configuration.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2022 SIGHUP s.r.l All rights reserved. -# Use of this source code is governed by a BSD-style -# license that can be found in the LICENSE file. - -commonLabels: - - path: spec/podMetadata/labels - create: true - kind: Alertmanager \ No newline at end of file diff --git a/katalog/alertmanager-operated/kustomization.yaml b/katalog/alertmanager-operated/kustomization.yaml index 007c23fa..78e4ab9d 100644 --- a/katalog/alertmanager-operated/kustomization.yaml +++ b/katalog/alertmanager-operated/kustomization.yaml @@ -8,15 +8,6 @@ kind: Kustomization namespace: monitoring -commonLabels: - module.kfd.sighup.io/name: "monitoring" - module.kfd.sighup.io/version: "v1.14.1" - module.kfd.sighup.io/component: "alertmanager-operated" - kfd.sighup.io/source: "kustomize" - -configurations: - - configuration.yaml - resources: - deploy.yml - rbac.yml diff --git a/katalog/configs/kustomization.yaml b/katalog/configs/kustomization.yaml index b95c457a..411d9509 100644 --- a/katalog/configs/kustomization.yaml +++ b/katalog/configs/kustomization.yaml @@ -6,11 +6,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - module.kfd.sighup.io/name: "monitoring" - module.kfd.sighup.io/version: "v1.14.1" - module.kfd.sighup.io/component: "configs" - kfd.sighup.io/source: "kustomize" - resources: - ./bases/default diff --git a/katalog/eks-sm/kustomization.yaml b/katalog/eks-sm/kustomization.yaml index 21a8fc5c..b320d3e4 100644 --- a/katalog/eks-sm/kustomization.yaml +++ b/katalog/eks-sm/kustomization.yaml @@ -6,11 +6,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - module.kfd.sighup.io/name: "monitoring" - module.kfd.sighup.io/version: "v1.14.1" - module.kfd.sighup.io/component: "eks-sm" - kfd.sighup.io/source: "kustomize" - resources: - ../configs/eks diff --git a/katalog/gke-sm/kustomization.yaml b/katalog/gke-sm/kustomization.yaml index 13d94217..e1cfdf36 100644 --- a/katalog/gke-sm/kustomization.yaml +++ b/katalog/gke-sm/kustomization.yaml @@ -6,11 +6,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - module.kfd.sighup.io/name: "monitoring" - module.kfd.sighup.io/version: "v1.14.1" - module.kfd.sighup.io/component: "gke-sm" - kfd.sighup.io/source: "kustomize" - resources: - ../configs/gke diff --git a/katalog/goldpinger/kustomization.yaml b/katalog/goldpinger/kustomization.yaml index 2ea3c914..f49fd4c8 100644 --- a/katalog/goldpinger/kustomization.yaml +++ b/katalog/goldpinger/kustomization.yaml @@ -6,12 +6,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - module.kfd.sighup.io/name: "monitoring" - module.kfd.sighup.io/version: "v1.14.1" - module.kfd.sighup.io/component: "goldpinger" - kfd.sighup.io/source: "kustomize" - namespace: monitoring resources: diff --git a/katalog/grafana/kustomization.yaml b/katalog/grafana/kustomization.yaml index 2ef10b72..671e5a56 100644 --- a/katalog/grafana/kustomization.yaml +++ b/katalog/grafana/kustomization.yaml @@ -6,12 +6,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - module.kfd.sighup.io/name: "monitoring" - module.kfd.sighup.io/version: "v1.14.1" - module.kfd.sighup.io/component: "grafana" - kfd.sighup.io/source: "kustomize" - namespace: monitoring resources: diff --git a/katalog/kube-proxy-metrics/kustomization.yaml b/katalog/kube-proxy-metrics/kustomization.yaml index 5852980a..6e64b8ae 100644 --- a/katalog/kube-proxy-metrics/kustomization.yaml +++ b/katalog/kube-proxy-metrics/kustomization.yaml @@ -8,12 +8,6 @@ kind: Kustomization namespace: monitoring -commonLabels: - module.kfd.sighup.io/name: "monitoring" - module.kfd.sighup.io/version: "v1.14.1" - module.kfd.sighup.io/component: "kube-proxy-metrics" - kfd.sighup.io/source: "kustomize" - images: - name: kube-rbac-proxy newName: registry.sighup.io/fury/brancz/kube-rbac-proxy diff --git a/katalog/kube-state-metrics/kustomization.yaml b/katalog/kube-state-metrics/kustomization.yaml index 0eda530b..943e38ea 100644 --- a/katalog/kube-state-metrics/kustomization.yaml +++ b/katalog/kube-state-metrics/kustomization.yaml @@ -6,12 +6,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - module.kfd.sighup.io/name: "monitoring" - module.kfd.sighup.io/version: "v1.14.1" - module.kfd.sighup.io/component: "kube-state-metrics" - kfd.sighup.io/source: "kustomize" - namespace: monitoring images: diff --git a/katalog/kubeadm-sm/kustomization.yaml b/katalog/kubeadm-sm/kustomization.yaml index f5d645c6..329fde9d 100644 --- a/katalog/kubeadm-sm/kustomization.yaml +++ b/katalog/kubeadm-sm/kustomization.yaml @@ -6,11 +6,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - module.kfd.sighup.io/name: "monitoring" - module.kfd.sighup.io/version: "v1.14.1" - module.kfd.sighup.io/component: "kubeadm-sm" - kfd.sighup.io/source: "kustomize" - resources: - ../configs/kubeadm diff --git a/katalog/metrics-server/kustomization.yaml b/katalog/metrics-server/kustomization.yaml index 7d09c73c..afdf8550 100644 --- a/katalog/metrics-server/kustomization.yaml +++ b/katalog/metrics-server/kustomization.yaml @@ -8,12 +8,6 @@ kind: Kustomization namespace: kube-system -commonLabels: - module.kfd.sighup.io/name: "monitoring" - module.kfd.sighup.io/version: "v1.14.1" - module.kfd.sighup.io/component: "metrics-server" - kfd.sighup.io/source: "kustomize" - resources: - apiservice.yml - deploy.yml diff --git a/katalog/node-exporter/kustomization.yaml b/katalog/node-exporter/kustomization.yaml index 744c385a..f8d8dbbc 100644 --- a/katalog/node-exporter/kustomization.yaml +++ b/katalog/node-exporter/kustomization.yaml @@ -8,11 +8,6 @@ kind: Kustomization namespace: monitoring -commonLabels: - module.kfd.sighup.io/name: "monitoring" - module.kfd.sighup.io/version: "v1.14.1" - module.kfd.sighup.io/component: "node-exporter" - kfd.sighup.io/source: "kustomize" images: - name: alpine diff --git a/katalog/ovh-sm/kustomization.yaml b/katalog/ovh-sm/kustomization.yaml index fcc6d707..f3360eb0 100644 --- a/katalog/ovh-sm/kustomization.yaml +++ b/katalog/ovh-sm/kustomization.yaml @@ -6,11 +6,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -commonLabels: - module.kfd.sighup.io/name: "monitoring" - module.kfd.sighup.io/version: "v1.14.1" - module.kfd.sighup.io/component: "ovh-sm" - kfd.sighup.io/source: "kustomize" - resources: - ../configs/ovh diff --git a/katalog/prometheus-operated/configuration.yaml b/katalog/prometheus-operated/configuration.yaml deleted file mode 100644 index f4075758..00000000 --- a/katalog/prometheus-operated/configuration.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2022 SIGHUP s.r.l All rights reserved. -# Use of this source code is governed by a BSD-style -# license that can be found in the LICENSE file. - -commonLabels: - - path: spec/podMetadata/labels - create: true - kind: Prometheus \ No newline at end of file diff --git a/katalog/prometheus-operated/kustomization.yaml b/katalog/prometheus-operated/kustomization.yaml index 68f3c359..dbc16f3d 100644 --- a/katalog/prometheus-operated/kustomization.yaml +++ b/katalog/prometheus-operated/kustomization.yaml @@ -8,15 +8,6 @@ kind: Kustomization namespace: monitoring -commonLabels: - module.kfd.sighup.io/name: "monitoring" - module.kfd.sighup.io/version: "v1.14.1" - module.kfd.sighup.io/component: "prometheus-operated" - kfd.sighup.io/source: "kustomize" - -configurations: - - configuration.yaml - resources: - dashboards - deploy.yml diff --git a/katalog/prometheus-operator/kustomization.yaml b/katalog/prometheus-operator/kustomization.yaml index 1c1138bd..1d276aac 100644 --- a/katalog/prometheus-operator/kustomization.yaml +++ b/katalog/prometheus-operator/kustomization.yaml @@ -8,12 +8,6 @@ kind: Kustomization namespace: monitoring -commonLabels: - module.kfd.sighup.io/name: "monitoring" - module.kfd.sighup.io/version: "v1.14.1" - module.kfd.sighup.io/component: "prometheus-operator" - kfd.sighup.io/source: "kustomize" - images: - name: quay.io/prometheus-operator/prometheus-operator newName: registry.sighup.io/fury/prometheus-operator/prometheus-operator diff --git a/katalog/x509-exporter/kustomization.yaml b/katalog/x509-exporter/kustomization.yaml index d200b955..aa7f8a0b 100644 --- a/katalog/x509-exporter/kustomization.yaml +++ b/katalog/x509-exporter/kustomization.yaml @@ -8,12 +8,6 @@ kind: Kustomization namespace: monitoring -commonLabels: - module.kfd.sighup.io/name: "monitoring" - module.kfd.sighup.io/version: "v1.14.1" - module.kfd.sighup.io/component: "x509-exporter" - kfd.sighup.io/source: "kustomize" - images: - name: docker.io/enix/x509-certificate-exporter newName: registry.sighup.io/fury/enix/x509-certificate-exporter From 4cef0affda3212f9bb5ce7015434eb13a3f8f9b9 Mon Sep 17 00:00:00 2001 From: Ramiro Algozino Date: Wed, 9 Mar 2022 18:09:07 +0100 Subject: [PATCH 2/3] Update readme instructions with the right version --- README.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 82ea38d1..d1b3ef3b 100644 --- a/README.md +++ b/README.md @@ -101,19 +101,19 @@ Check the [compatibility matrix][compatibility-matrix] for additional informatio ```yaml bases: - name: monitoring/prometheus-operator - version: v1.14.0 + version: v1.14.1 - name: monitoring/prometheus-operated - version: v1.14.0 + version: v1.14.1 - name: monitoring/alertmanager-operated - version: v1.14.0 + version: v1.14.1 - name: monitoring/node-exporter - version: v1.14.0 + version: v1.14.1 - name: monitoring/kube-state-metrics - version: v1.14.0 + version: v1.14.1 - name: monitoring/grafana - version: v1.14.0 + version: v1.14.1 - name: monitoring/goldpinger - version: v1.14.0 + version: v1.14.1 ``` Along with the primary components, include one of the following components, @@ -124,7 +124,7 @@ based on the cloud provider for service monitoring: ```yaml ... - name: monitoring/eks-sm - version: v1.14.0 + version: v1.14.1 ``` - ServiceMonitor for Azure AKS cluster @@ -132,7 +132,7 @@ based on the cloud provider for service monitoring: ```yaml ... - name: monitoring/aks-sm - version: v1.14.0 + version: v1.14.1 ``` - ServiceMonitor for GCP GKE cluster @@ -140,7 +140,7 @@ based on the cloud provider for service monitoring: ```yaml ... - name: monitoring/gke-sm - version: v1.14.0 + version: v1.14.1 ``` - ServiceMonitor for OVH cluster @@ -148,7 +148,7 @@ based on the cloud provider for service monitoring: ```yaml ... - name: monitoring/ovh-sm - version: v1.14.0 + version: v1.14.1 ``` - ServiceMonitor for on-premises and for self-managed cluster @@ -156,7 +156,7 @@ based on the cloud provider for service monitoring: ```yaml ... - name: monitoring/kubeadm-sm - version: v1.14.0 + version: v1.14.1 ``` > See `furyctl` [documentation][furyctl-repo] for additional details about `Furyfile.yml` format. From c042d7f3a4872f9a6f8539f3f090e47ed6bb6894 Mon Sep 17 00:00:00 2001 From: Samuele Chiocca Date: Thu, 10 Mar 2022 16:11:48 +0100 Subject: [PATCH 3/3] Fixing commands on release note v1.14.1 --- docs/releases/v1.14.1.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/releases/v1.14.1.md b/docs/releases/v1.14.1.md index 6557fcbb..ca85d8d6 100644 --- a/docs/releases/v1.14.1.md +++ b/docs/releases/v1.14.1.md @@ -29,9 +29,9 @@ kustomize build katalog/metrics-server | kubectl apply -f - kubectl delete daemonset.apps/goldpinger -n monitoring kustomize build katalog/goldpinger | kubectl apply -f- kustomize build katalog/kubeadm-sm | kubectl apply -f- -kubectl delete deployment.apps/kube-proxy-metrics -n monitoring +kubectl delete daemonset.apps/kube-proxy-metrics -n monitoring kustomize build katalog/kube-proxy-metrics | kubectl apply -f- -kubectl delete daemonset.apps/kube-state-metrics -n monitoring +kubectl delete deployment.apps/kube-state-metrics -n monitoring kustomize build katalog/kube-state-metrics | kubectl apply -f- kubectl delete daemonset.apps/node-exporter -n monitoring kustomize build katalog/node-exporter | kubectl apply -f-