Merge pull request #86 from sighupio/hotfix/revert-commonLabels

revert commonLables usage
sighupio · Mar 10, 2022 · ba36e78 · ba36e78
2 parents 943e329 + c042d7f
commit ba36e78
Show file tree

Hide file tree

Showing 34 changed files with 105 additions and 183 deletions.
diff --git 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/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,39 +124,39 @@ 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
 
 ```yaml
   ...
   - name: monitoring/aks-sm
-    version: v1.14.0
+    version: v1.14.1
 ```
 
 - ServiceMonitor for GCP GKE cluster
 
 ```yaml
   ...
   - name: monitoring/gke-sm
-    version: v1.14.0
+    version: v1.14.1
 ```
 
 - ServiceMonitor for OVH cluster
 
 ```yaml
   ...
   - name: monitoring/ovh-sm
-    version: v1.14.0
+    version: v1.14.1
 ```
 
 - ServiceMonitor for on-premises and for self-managed cluster
 
 ```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.

diff --git 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
@@ -1,3 +1,4 @@
+<h1>:x: This release contains issues, please use the version v1.14.1 instead :x:</h1>
 # 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
@@ -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 daemonset.apps/kube-proxy-metrics -n monitoring
+kustomize build katalog/kube-proxy-metrics | kubectl apply -f-
+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-
+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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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