From 6a9669d4893cec8252786c360099f0801aa86cd9 Mon Sep 17 00:00:00 2001
From: Steve Hipwell <steve.hipwell@gmail.com>
Date: Tue, 10 Sep 2024 17:12:56 +0100
Subject: [PATCH] feat(chart): Updated image to v0.7.2

Signed-off-by: Steve Hipwell <steve.hipwell@gmail.com>
---
 charts/metrics-server/CHANGELOG.md            | 22 ++++++++++++++-----
 charts/metrics-server/Chart.yaml              | 12 +++++++---
 .../metrics-server/templates/deployment.yaml  |  4 ++--
 .../templates/servicemonitor.yaml             |  2 +-
 4 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/charts/metrics-server/CHANGELOG.md b/charts/metrics-server/CHANGELOG.md
index 5a7b3c5ca..5c0dd9504 100644
--- a/charts/metrics-server/CHANGELOG.md
+++ b/charts/metrics-server/CHANGELOG.md
@@ -14,15 +14,24 @@
 
 ## [UNRELEASED]
 
-### Fixed
+## [3.12.2] - TBC
+
+### Added
+
+- Explicitly added the app protocol to the service. ([#1540](https://github.com/kubernetes-sigs/metrics-server/pull/1540)) _@
+seankhliao_
 
-- Fixed nanny's RoleBinding which contained a hard-coded namespace instead of the Helm's release namespace. ([#1479](https://github.com/kubernetes-sigs/metrics-server/pull/1479)) _@
-the-technat_
+### Changed
+
+- Updated the _Metrics Server_ OCI image to [v0.7.2](https://github.com/kubernetes-sigs/metrics-server/releases/tag/v0.7.2). ([#xxxx](https://github.com/kubernetes-sigs/metrics-server/pull/xxxx)) _@stevehipwell_
+- Updated the _addonResizer_ OCI image to [1.8.21](https://github.com/kubernetes/autoscaler/releases/tag/addon-resizer-1.8.21). ([#1504](https://github.com/kubernetes-sigs/metrics-server/pull/1504)) _@jimmy-ungerman_
+
+### Fixed
 
-- ### Changed
-- Updated the _addonResizer_ OCI image to [1.8.21](https://github.com/kubernetes/autoscaler/releases/tag/addon-resizer-1.8.21). _@jimmy-ungerman_
+- Fixed nanny's RoleBinding which contained a hard-coded namespace instead of the Helm's release namespace. ([#1479](https://github.com/kubernetes-sigs/metrics-server/pull/1479)) _@the-technat_
+- Fixed the `ServiceMonitor` job label. ([#xxxx](https://github.com/kubernetes-sigs/metrics-server/pull/xxxx)) _@stevehipwell_
 
-## [3.12.1] - TBC
+## [3.12.1] - 2024-04-05
 
 ### Changed
 
@@ -143,6 +152,7 @@ the-technat_
 RELEASE LINKS
 -->
 [UNRELEASED]: https://github.com/kubernetes-sigs/metrics-server/tree/master/charts/metrics-server
+[3.12.2]: https://github.com/kubernetes-sigs/metrics-server/releases/tag/metrics-server-helm-chart-3.12.2
 [3.12.1]: https://github.com/kubernetes-sigs/metrics-server/releases/tag/metrics-server-helm-chart-3.12.1
 [3.12.0]: https://github.com/kubernetes-sigs/metrics-server/releases/tag/metrics-server-helm-chart-3.12.0
 [3.11.0]: https://github.com/kubernetes-sigs/metrics-server/releases/tag/metrics-server-helm-chart-3.11.0
diff --git a/charts/metrics-server/Chart.yaml b/charts/metrics-server/Chart.yaml
index eb26cc7d4..65803bf3c 100644
--- a/charts/metrics-server/Chart.yaml
+++ b/charts/metrics-server/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: metrics-server
 description: Metrics Server is a scalable, efficient source of container resource metrics for Kubernetes built-in autoscaling pipelines.
 type: application
-version: 3.12.1
-appVersion: 0.7.1
+version: 3.12.2
+appVersion: 0.7.2
 keywords:
   - kubernetes
   - metrics-server
@@ -21,5 +21,11 @@ maintainers:
     url: https://github.com/endrec
 annotations:
   artifacthub.io/changes: |
+    - kind: added
+      description: "Explicitly added the app protocol to the service."
     - kind: changed
-      description: "Updated the _Metrics Server_ OCI image to [v0.7.1](https://github.com/kubernetes-sigs/metrics-server/releases/tag/v0.7.1)."
+      description: "Updated the _Metrics Server_ OCI image to [v0.7.2](https://github.com/kubernetes-sigs/metrics-server/releases/tag/v0.7.2)."
+    - kind: changed
+      description: "Updated the _addonResizer_ OCI image to [1.8.21](https://github.com/kubernetes/autoscaler/releases/tag/addon-resizer-1.8.21)"
+    - kind: fixed
+      description: "Fixed nanny's RoleBinding which contained a hard-coded namespace instead of the Helm's release namespace."
diff --git a/charts/metrics-server/templates/deployment.yaml b/charts/metrics-server/templates/deployment.yaml
index dd628f9bd..37e7f953b 100644
--- a/charts/metrics-server/templates/deployment.yaml
+++ b/charts/metrics-server/templates/deployment.yaml
@@ -11,8 +11,8 @@ metadata:
   {{- end }}
 spec:
   replicas: {{ .Values.replicas }}
-  {{- if or (kindIs "float64" .Values.revisionHistoryLimit) (kindIs "int64" .Values.revisionHistoryLimit) }}
-  revisionHistoryLimit: {{ .Values.revisionHistoryLimit | int64 }}
+  {{- if not (has (quote .Values.revisionHistoryLimit) (list "" (quote ""))) }}
+  revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
   {{- end }}
   {{- with .Values.updateStrategy }}
   strategy:
diff --git a/charts/metrics-server/templates/servicemonitor.yaml b/charts/metrics-server/templates/servicemonitor.yaml
index 5c1c5b775..079318d20 100644
--- a/charts/metrics-server/templates/servicemonitor.yaml
+++ b/charts/metrics-server/templates/servicemonitor.yaml
@@ -10,7 +10,7 @@ metadata:
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
-  jobLabel: {{ .Release.Name }}
+  jobLabel: app.kubernetes.io/instance
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace }}