Merge pull request #558 from sighupio/fix/upgrades-ingressv3-no-monit…

…oring fix(upgrades): delete monitoring resources only when enabled, prepare release 0.30.1
sighupio · Nov 29, 2024 · e8fb961 · e8fb961
2 parents a5657cf + 5943ca8
commit e8fb961
Show file tree

Hide file tree

Showing 17 changed files with 69 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 <p>The Swiss Army Knife<br/>for the Kubernetes Fury Distribution</p>
 
 [![Build Status](https://ci.sighup.io/api/badges/sighupio/furyctl/status.svg?ref=refs/heads/main)](https://ci.sighup.io/sighupio/furyctl)
-![Release](https://img.shields.io/badge/furyctl-v0.30.0-blue)
+![Release](https://img.shields.io/badge/furyctl-v0.30.1-blue)
 ![Slack](https://img.shields.io/badge/slack-@kubernetes/fury-yellow.svg?logo=slack)
 ![License](https://img.shields.io/github/license/sighupio/furyctl)
 [![Go Report Card](https://goreportcard.com/badge/github.com/sighupio/furyctl)](https://goreportcard.com/report/github.com/sighupio/furyctl)
@@ -69,7 +69,7 @@ $ furyctl version
 ...
 goVersion: go1.23
 osArch: amd64
-version: 0.30.0
+version: 0.30.1
 ```
 
 ### Installing from source
@@ -117,7 +117,7 @@ Once you've ensured the above dependencies are installed, you can proceed with t
    gitCommit: 217cdcc8bf075fccfdb11c41ccc6bb317ec704bc
    goVersion: go1.23.2
    osArch: arm64
-   version: 0.30.0
+   version: 0.30.1
    ```
 
 5. (optional) move the binary to your `bin` folder, in macOS:

diff --git a/configs/upgrades/ekscluster/1.27.9-1.28.5/post-distribution.sh.tpl b/configs/upgrades/ekscluster/1.27.9-1.28.5/post-distribution.sh.tpl
@@ -14,8 +14,10 @@ $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-n
 $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-nginx-tls -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-ca -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-selfsign -n ingress-nginx
+  {{- if ne .spec.distribution.modules.monitoring.type "none" }}
 $kubectlbin delete --ignore-not-found=true prometheusrule.monitoring.coreos.com ingress-nginx-k8s-rules -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true servicemonitor.monitoring.coreos.com ingress-nginx -n ingress-nginx
+  {{- end }}
 {{- end }}
 
 {{- if eq .spec.distribution.modules.ingress.nginx.type "dual" }}
@@ -31,6 +33,8 @@ $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-n
 $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-nginx-tls-internal -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-ca -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-selfsign -n ingress-nginx
+  {{- if ne .spec.distribution.modules.monitoring.type "none" }}
 $kubectlbin delete --ignore-not-found=true prometheusrule.monitoring.coreos.com ingress-nginx-k8s-rules -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true servicemonitor.monitoring.coreos.com ingress-nginx -n ingress-nginx
+  {{- end }}
 {{- end }}
diff --git a/configs/upgrades/ekscluster/1.28.4-1.28.5/post-distribution.sh.tpl b/configs/upgrades/ekscluster/1.28.4-1.28.5/post-distribution.sh.tpl
@@ -14,8 +14,10 @@ $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-n
 $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-nginx-tls -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-ca -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-selfsign -n ingress-nginx
+  {{- if ne .spec.distribution.modules.monitoring.type "none" }}
 $kubectlbin delete --ignore-not-found=true prometheusrule.monitoring.coreos.com ingress-nginx-k8s-rules -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true servicemonitor.monitoring.coreos.com ingress-nginx -n ingress-nginx
+  {{- end }}
 {{- end }}
 
 {{- if eq .spec.distribution.modules.ingress.nginx.type "dual" }}
@@ -31,6 +33,8 @@ $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-n
 $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-nginx-tls-internal -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-ca -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-selfsign -n ingress-nginx
+  {{- if ne .spec.distribution.modules.monitoring.type "none" }}
 $kubectlbin delete --ignore-not-found=true prometheusrule.monitoring.coreos.com ingress-nginx-k8s-rules -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true servicemonitor.monitoring.coreos.com ingress-nginx -n ingress-nginx
+  {{- end }}
 {{- end }}
diff --git a/configs/upgrades/ekscluster/1.28.4-1.29.5/post-distribution.sh.tpl b/configs/upgrades/ekscluster/1.28.4-1.29.5/post-distribution.sh.tpl
@@ -14,8 +14,10 @@ $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-n
 $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-nginx-tls -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-ca -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-selfsign -n ingress-nginx
+  {{- if ne .spec.distribution.modules.monitoring.type "none" }}
 $kubectlbin delete --ignore-not-found=true prometheusrule.monitoring.coreos.com ingress-nginx-k8s-rules -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true servicemonitor.monitoring.coreos.com ingress-nginx -n ingress-nginx
+  {{- end }}
 {{- end }}
 
 {{- if eq .spec.distribution.modules.ingress.nginx.type "dual" }}
@@ -31,6 +33,8 @@ $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-n
 $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-nginx-tls-internal -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-ca -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-selfsign -n ingress-nginx
+  {{- if ne .spec.distribution.modules.monitoring.type "none" }}
 $kubectlbin delete --ignore-not-found=true prometheusrule.monitoring.coreos.com ingress-nginx-k8s-rules -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true servicemonitor.monitoring.coreos.com ingress-nginx -n ingress-nginx
+  {{- end }}
 {{- end }}
diff --git a/configs/upgrades/ekscluster/1.29.4-1.29.5/post-distribution.sh.tpl b/configs/upgrades/ekscluster/1.29.4-1.29.5/post-distribution.sh.tpl
@@ -14,8 +14,10 @@ $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-n
 $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-nginx-tls -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-ca -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-selfsign -n ingress-nginx
+  {{- if ne .spec.distribution.modules.monitoring.type "none" }}
 $kubectlbin delete --ignore-not-found=true prometheusrule.monitoring.coreos.com ingress-nginx-k8s-rules -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true servicemonitor.monitoring.coreos.com ingress-nginx -n ingress-nginx
+  {{- end }}
 {{- end }}
 
 {{- if eq .spec.distribution.modules.ingress.nginx.type "dual" }}
@@ -31,6 +33,8 @@ $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-n
 $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-nginx-tls-internal -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-ca -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-selfsign -n ingress-nginx
+  {{- if ne .spec.distribution.modules.monitoring.type "none" }}
 $kubectlbin delete --ignore-not-found=true prometheusrule.monitoring.coreos.com ingress-nginx-k8s-rules -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true servicemonitor.monitoring.coreos.com ingress-nginx -n ingress-nginx
+  {{- end }}
 {{- end }}
diff --git a/configs/upgrades/ekscluster/1.29.4-1.30.0/post-distribution.sh.tpl b/configs/upgrades/ekscluster/1.29.4-1.30.0/post-distribution.sh.tpl
@@ -14,8 +14,10 @@ $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-n
 $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-nginx-tls -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-ca -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-selfsign -n ingress-nginx
+  {{- if ne .spec.distribution.modules.monitoring.type "none" }}
 $kubectlbin delete --ignore-not-found=true prometheusrule.monitoring.coreos.com ingress-nginx-k8s-rules -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true servicemonitor.monitoring.coreos.com ingress-nginx -n ingress-nginx
+  {{- end }}
 {{- end }}
 
 {{- if eq .spec.distribution.modules.ingress.nginx.type "dual" }}
@@ -31,6 +33,8 @@ $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-n
 $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-nginx-tls-internal -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-ca -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-selfsign -n ingress-nginx
+  {{- if ne .spec.distribution.modules.monitoring.type "none" }}
 $kubectlbin delete --ignore-not-found=true prometheusrule.monitoring.coreos.com ingress-nginx-k8s-rules -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true servicemonitor.monitoring.coreos.com ingress-nginx -n ingress-nginx
+  {{- end }}
 {{- end }}
diff --git a/configs/upgrades/kfddistribution/1.27.9-1.28.5/post-distribution.sh.tpl b/configs/upgrades/kfddistribution/1.27.9-1.28.5/post-distribution.sh.tpl
@@ -14,8 +14,10 @@ $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-n
 $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-nginx-tls -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-ca -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-selfsign -n ingress-nginx
+  {{- if ne .spec.distribution.modules.monitoring.type "none" }}
 $kubectlbin delete --ignore-not-found=true prometheusrule.monitoring.coreos.com ingress-nginx-k8s-rules -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true servicemonitor.monitoring.coreos.com ingress-nginx -n ingress-nginx
+  {{- end }}
 {{- end }}
 
 {{- if eq .spec.distribution.modules.ingress.nginx.type "dual" }}
@@ -31,6 +33,8 @@ $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-n
 $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-nginx-tls-internal -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-ca -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-selfsign -n ingress-nginx
+  {{- if ne .spec.distribution.modules.monitoring.type "none" }}
 $kubectlbin delete --ignore-not-found=true prometheusrule.monitoring.coreos.com ingress-nginx-k8s-rules -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true servicemonitor.monitoring.coreos.com ingress-nginx -n ingress-nginx
+  {{- end }}
 {{- end }}
diff --git a/configs/upgrades/kfddistribution/1.28.4-1.28.5/post-distribution.sh.tpl b/configs/upgrades/kfddistribution/1.28.4-1.28.5/post-distribution.sh.tpl
@@ -14,8 +14,10 @@ $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-n
 $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-nginx-tls -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-ca -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-selfsign -n ingress-nginx
+  {{- if ne .spec.distribution.modules.monitoring.type "none" }}
 $kubectlbin delete --ignore-not-found=true prometheusrule.monitoring.coreos.com ingress-nginx-k8s-rules -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true servicemonitor.monitoring.coreos.com ingress-nginx -n ingress-nginx
+  {{- end }}
 {{- end }}
 
 {{- if eq .spec.distribution.modules.ingress.nginx.type "dual" }}
@@ -31,6 +33,8 @@ $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-n
 $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-nginx-tls-internal -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-ca -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-selfsign -n ingress-nginx
+  {{- if ne .spec.distribution.modules.monitoring.type "none" }}
 $kubectlbin delete --ignore-not-found=true prometheusrule.monitoring.coreos.com ingress-nginx-k8s-rules -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true servicemonitor.monitoring.coreos.com ingress-nginx -n ingress-nginx
+  {{- end }}
 {{- end }}
diff --git a/configs/upgrades/kfddistribution/1.28.4-1.29.5/post-distribution.sh.tpl b/configs/upgrades/kfddistribution/1.28.4-1.29.5/post-distribution.sh.tpl
@@ -14,8 +14,10 @@ $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-n
 $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-nginx-tls -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-ca -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-selfsign -n ingress-nginx
+  {{- if ne .spec.distribution.modules.monitoring.type "none" }}
 $kubectlbin delete --ignore-not-found=true prometheusrule.monitoring.coreos.com ingress-nginx-k8s-rules -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true servicemonitor.monitoring.coreos.com ingress-nginx -n ingress-nginx
+  {{- end }}
 {{- end }}
 
 {{- if eq .spec.distribution.modules.ingress.nginx.type "dual" }}
@@ -31,6 +33,8 @@ $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-n
 $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-nginx-tls-internal -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-ca -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-selfsign -n ingress-nginx
+  {{- if ne .spec.distribution.modules.monitoring.type "none" }}
 $kubectlbin delete --ignore-not-found=true prometheusrule.monitoring.coreos.com ingress-nginx-k8s-rules -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true servicemonitor.monitoring.coreos.com ingress-nginx -n ingress-nginx
+  {{- end }}
 {{- end }}
diff --git a/configs/upgrades/kfddistribution/1.29.4-1.29.5/post-distribution.sh.tpl b/configs/upgrades/kfddistribution/1.29.4-1.29.5/post-distribution.sh.tpl
@@ -14,8 +14,10 @@ $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-n
 $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-nginx-tls -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-ca -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-selfsign -n ingress-nginx
+  {{- if ne .spec.distribution.modules.monitoring.type "none" }}
 $kubectlbin delete --ignore-not-found=true prometheusrule.monitoring.coreos.com ingress-nginx-k8s-rules -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true servicemonitor.monitoring.coreos.com ingress-nginx -n ingress-nginx
+  {{- end }}
 {{- end }}
 
 {{- if eq .spec.distribution.modules.ingress.nginx.type "dual" }}
@@ -31,6 +33,8 @@ $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-n
 $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-nginx-tls-internal -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-ca -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-selfsign -n ingress-nginx
+  {{- if ne .spec.distribution.modules.monitoring.type "none" }}
 $kubectlbin delete --ignore-not-found=true prometheusrule.monitoring.coreos.com ingress-nginx-k8s-rules -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true servicemonitor.monitoring.coreos.com ingress-nginx -n ingress-nginx
+  {{- end }}
 {{- end }}
diff --git a/configs/upgrades/kfddistribution/1.29.4-1.30.0/post-distribution.sh.tpl b/configs/upgrades/kfddistribution/1.29.4-1.30.0/post-distribution.sh.tpl
@@ -14,8 +14,10 @@ $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-n
 $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-nginx-tls -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-ca -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-selfsign -n ingress-nginx
+  {{- if ne .spec.distribution.modules.monitoring.type "none" }}
 $kubectlbin delete --ignore-not-found=true prometheusrule.monitoring.coreos.com ingress-nginx-k8s-rules -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true servicemonitor.monitoring.coreos.com ingress-nginx -n ingress-nginx
+  {{- end }}
 {{- end }}
 
 {{- if eq .spec.distribution.modules.ingress.nginx.type "dual" }}
@@ -31,6 +33,8 @@ $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-n
 $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-nginx-tls-internal -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-ca -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-selfsign -n ingress-nginx
+  {{- if ne .spec.distribution.modules.monitoring.type "none" }}
 $kubectlbin delete --ignore-not-found=true prometheusrule.monitoring.coreos.com ingress-nginx-k8s-rules -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true servicemonitor.monitoring.coreos.com ingress-nginx -n ingress-nginx
+  {{- end }}
 {{- end }}
diff --git a/configs/upgrades/onpremises/1.27.9-1.28.5/post-distribution.sh.tpl b/configs/upgrades/onpremises/1.27.9-1.28.5/post-distribution.sh.tpl
@@ -14,8 +14,10 @@ $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-n
 $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-nginx-tls -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-ca -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-selfsign -n ingress-nginx
+  {{- if ne .spec.distribution.modules.monitoring.type "none" }}
 $kubectlbin delete --ignore-not-found=true prometheusrule.monitoring.coreos.com ingress-nginx-k8s-rules -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true servicemonitor.monitoring.coreos.com ingress-nginx -n ingress-nginx
+  {{- end }}
 {{- end }}
 
 {{- if eq .spec.distribution.modules.ingress.nginx.type "dual" }}
@@ -31,6 +33,8 @@ $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-n
 $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-nginx-tls-internal -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-ca -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-selfsign -n ingress-nginx
+  {{- if ne .spec.distribution.modules.monitoring.type "none" }}
 $kubectlbin delete --ignore-not-found=true prometheusrule.monitoring.coreos.com ingress-nginx-k8s-rules -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true servicemonitor.monitoring.coreos.com ingress-nginx -n ingress-nginx
+  {{- end }}
 {{- end }}
diff --git a/configs/upgrades/onpremises/1.28.4-1.28.5/post-distribution.sh.tpl b/configs/upgrades/onpremises/1.28.4-1.28.5/post-distribution.sh.tpl
@@ -14,8 +14,10 @@ $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-n
 $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-nginx-tls -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-ca -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-selfsign -n ingress-nginx
+  {{- if ne .spec.distribution.modules.monitoring.type "none" }}
 $kubectlbin delete --ignore-not-found=true prometheusrule.monitoring.coreos.com ingress-nginx-k8s-rules -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true servicemonitor.monitoring.coreos.com ingress-nginx -n ingress-nginx
+  {{- end }}
 {{- end }}
 
 {{- if eq .spec.distribution.modules.ingress.nginx.type "dual" }}
@@ -31,6 +33,8 @@ $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-n
 $kubectlbin delete --ignore-not-found=true certificate.cert-manager.io ingress-nginx-tls-internal -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-ca -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true issuer.cert-manager.io ingress-nginx-selfsign -n ingress-nginx
+  {{- if ne .spec.distribution.modules.monitoring.type "none" }}
 $kubectlbin delete --ignore-not-found=true prometheusrule.monitoring.coreos.com ingress-nginx-k8s-rules -n ingress-nginx
 $kubectlbin delete --ignore-not-found=true servicemonitor.monitoring.coreos.com ingress-nginx -n ingress-nginx
+  {{- end }}
 {{- end }}