feat(vertical-pod-autoscaler): Updated image to v1.1.1 (#945)

Signed-off-by: Steve Hipwell <[email protected]>
stevehipwell · Apr 26, 2024 · ff2bbf6 · ff2bbf6
1 parent 0aeb80f
commit ff2bbf6
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 39 deletions.
diff --git a/charts/thanos/README.md b/charts/thanos/README.md
@@ -1,6 +1,6 @@
 # thanos
 
-![Version: 1.16.4](https://img.shields.io/badge/Version-1.16.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.34.1](https://img.shields.io/badge/AppVersion-0.34.1-informational?style=flat-square)
+![Version: 1.16.5](https://img.shields.io/badge/Version-1.16.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.34.1](https://img.shields.io/badge/AppVersion-0.34.1-informational?style=flat-square)
 
 Helm chart to install Thanos; a set of components that can be composed into a highly available metric system with unlimited storage capacity, which can be added seamlessly on top of existing Prometheus deployments.
 
@@ -25,15 +25,15 @@ Helm chart to install Thanos; a set of components that can be composed into a hi
 To install the chart using the recommended OCI method you can use the following command.
 
 ```shell
-helm upgrade --install thanos oci://ghcr.io/stevehipwell/helm-charts/thanos --version 1.16.4
+helm upgrade --install thanos oci://ghcr.io/stevehipwell/helm-charts/thanos --version 1.16.5
 ```
 
 #### Verification
 
 As the OCI chart release is signed by [Cosign](https://github.com/sigstore/cosign) you can verify the chart before installing it by running the following command.
 
 ```shell
-cosign verify --certificate-oidc-issuer https://token.actions.githubusercontent.com --certificate-identity-regexp 'https://github\.com/action-stars/helm-workflows/\.github/workflows/release\.yaml@.+' --certificate-github-workflow-repository stevehipwell/helm-charts --certificate-github-workflow-name Release ghcr.io/stevehipwell/helm-charts/thanos:1.16.4
+cosign verify --certificate-oidc-issuer https://token.actions.githubusercontent.com --certificate-identity-regexp 'https://github\.com/action-stars/helm-workflows/\.github/workflows/release\.yaml@.+' --certificate-github-workflow-repository stevehipwell/helm-charts --certificate-github-workflow-name Release ghcr.io/stevehipwell/helm-charts/thanos:1.16.5
 ```
 
 ### Non-OCI Repository
@@ -42,7 +42,7 @@ Alternatively you can use the legacy non-OCI method via the following commands.
 
 ```shell
 helm repo add stevehipwell https://stevehipwell.github.io/helm-charts/
-helm upgrade --install thanos stevehipwell/thanos --version 1.16.4
+helm upgrade --install thanos stevehipwell/thanos --version 1.16.5
 ```
 
 ## Values

diff --git a/charts/vertical-pod-autoscaler/CHANGELOG.md b/charts/vertical-pod-autoscaler/CHANGELOG.md
@@ -14,6 +14,12 @@
 
 ## [UNRELEASED]
 
+## [v1.6.1] - 2024-04-26
+
+### Changed
+
+- Updated the _Vertical Pod Autoscaler_ OCI image version to [v1.1.1](https://github.com/kubernetes/autoscaler/releases/tag/vertical-pod-autoscaler-1.1.1).
+
 ### Fixed
 
 - Fixed incorrect `ServiceMonitor` name via the `jobLabel` field.
@@ -72,6 +78,7 @@
 RELEASE LINKS
 -->
 [UNRELEASED]: https://github.com/stevehipwell/helm-charts/tree/main/charts/vertical-pod-autoscaler
+[v1.6.1]: https://github.com/stevehipwell/helm-charts/releases/tag/vertical-pod-autoscaler-1.6.1
 [v1.6.0]: https://github.com/stevehipwell/helm-charts/releases/tag/vertical-pod-autoscaler-1.6.0
 [v1.5.0]: https://github.com/stevehipwell/helm-charts/releases/tag/vertical-pod-autoscaler-1.5.0
 [v1.4.0]: https://github.com/stevehipwell/helm-charts/releases/tag/vertical-pod-autoscaler-1.4.0

diff --git a/charts/vertical-pod-autoscaler/Chart.yaml b/charts/vertical-pod-autoscaler/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: vertical-pod-autoscaler
 description: Helm chart for the Vertical Pod Autoscaler.
 type: application
-version: 1.6.0
-appVersion: 1.1.0
+version: 1.6.1
+appVersion: 1.1.1
 keywords:
   - kubernetes
   - autoscale
@@ -30,4 +30,6 @@ annotations:
       description: Represents the configuration for a vertical pod autoscaler, which automatically manages pod resources based on historical and real time resource utilization.
   artifacthub.io/changes: |
     - kind: changed
-      description: "Updated the _Vertical Pod Autoscaler_ OCI image version to [v1.1.0](https://github.com/kubernetes/autoscaler/releases/tag/vertical-pod-autoscaler-1.1.0)."
+      description: "Updated the _Vertical Pod Autoscaler_ OCI image version to [v1.1.1](https://github.com/kubernetes/autoscaler/releases/tag/vertical-pod-autoscaler-1.1.1)."
+    - kind: fixed
+      description: "Fixed incorrect `ServiceMonitor` name via the `jobLabel` field."
diff --git a/charts/vertical-pod-autoscaler/README.md b/charts/vertical-pod-autoscaler/README.md
@@ -1,6 +1,6 @@
 # vertical-pod-autoscaler
 
-![Version: 1.6.0](https://img.shields.io/badge/Version-1.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.1.0](https://img.shields.io/badge/AppVersion-1.1.0-informational?style=flat-square)
+![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.1.1](https://img.shields.io/badge/AppVersion-1.1.1-informational?style=flat-square)
 
 The [Vertical Pod Autoscaler](https://github.com/kubernetes/autoscaler/tree/master/vertical-pod-autoscaler/) (VPA) frees the users from necessity of setting up-to-date resource limits and requests for the containers in their pods. When configured, it will set the requests automatically based on usage and thus allow proper scheduling onto nodes so that appropriate resource amount is available for each pod. It will also maintain ratios between limits and requests that were specified in initial containers configuration.
 
@@ -33,15 +33,15 @@ This chart manages the `MutatingWebhookConfiguration` outside of the workload so
 To install the chart using the recommended OCI method you can use the following command.
 
 ```shell
-helm upgrade --install vertical-pod-autoscaler oci://ghcr.io/stevehipwell/helm-charts/vertical-pod-autoscaler --version 1.6.0
+helm upgrade --install vertical-pod-autoscaler oci://ghcr.io/stevehipwell/helm-charts/vertical-pod-autoscaler --version 1.6.1
 ```
 
 #### Verification
 
 As the OCI chart release is signed by [Cosign](https://github.com/sigstore/cosign) you can verify the chart before installing it by running the following command.
 
 ```shell
-cosign verify --certificate-oidc-issuer https://token.actions.githubusercontent.com --certificate-identity-regexp 'https://github\.com/action-stars/helm-workflows/\.github/workflows/release\.yaml@.+' --certificate-github-workflow-repository stevehipwell/helm-charts --certificate-github-workflow-name Release ghcr.io/stevehipwell/helm-charts/vertical-pod-autoscaler:1.6.0
+cosign verify --certificate-oidc-issuer https://token.actions.githubusercontent.com --certificate-identity-regexp 'https://github\.com/action-stars/helm-workflows/\.github/workflows/release\.yaml@.+' --certificate-github-workflow-repository stevehipwell/helm-charts --certificate-github-workflow-name Release ghcr.io/stevehipwell/helm-charts/vertical-pod-autoscaler:1.6.1
 ```
 
 ### Non-OCI Repository
@@ -50,7 +50,7 @@ Alternatively you can use the legacy non-OCI method via the following commands.
 
 ```shell
 helm repo add stevehipwell https://stevehipwell.github.io/helm-charts/
-helm upgrade --install vertical-pod-autoscaler stevehipwell/vertical-pod-autoscaler --version 1.6.0
+helm upgrade --install vertical-pod-autoscaler stevehipwell/vertical-pod-autoscaler --version 1.6.1
 ```
 
 ### Non-OCI Repository
@@ -59,7 +59,7 @@ Alternatively you can use the legacy non-OCI method via the following commands.
 
 ```shell
 helm repo add stevehipwell https://stevehipwell.github.io/helm-charts/
-helm upgrade --install vertical-pod-autoscaler stevehipwell/vertical-pod-autoscaler --version 1.6.0
+helm upgrade --install vertical-pod-autoscaler stevehipwell/vertical-pod-autoscaler --version 1.6.1
 ```
 
 ## Values

diff --git a/charts/vertical-pod-autoscaler/templates/admission-controller/_helpers.tpl b/charts/vertical-pod-autoscaler/templates/admission-controller/_helpers.tpl
@@ -11,6 +11,7 @@ Common labels
 {{- define "vertical-pod-autoscaler.admissionController.labels" -}}
 {{ include "vertical-pod-autoscaler.labels" . }}
 app.kubernetes.io/component: admission-controller
+app.kubernetes.io/component-instance: {{ .Release.Name }}-admission-controller
 {{- end }}
 
 {{/*
@@ -94,10 +95,10 @@ Patch affinity
 */}}
 {{- define "vertical-pod-autoscaler.admissionController.patchAffinity" -}}
 {{- if (hasKey .Values.admissionController.affinity "podAffinity") }}
-{{- include "vertical-pod-autoscaler.patchPodAffinity" (merge (dict "_podAffinity" .Values.admissionController.affinity.podAffinity "_selectorLabelsTemplate" "vertical-pod-autoscaler.admissionController.selectorLabels") .) }}
+{{- include "vertical-pod-autoscaler.patchPodAffinity" (merge (dict "_podAffinity" (dig "podAffinity" nil .Values.admissionController.affinity) "_selectorLabelsTemplate" "vertical-pod-autoscaler.admissionController.selectorLabels") .) }}
 {{- end }}
 {{- if (hasKey .Values.admissionController.affinity "podAntiAffinity") }}
-{{- include "vertical-pod-autoscaler.patchPodAffinity" (merge (dict "_podAffinity" .Values.admissionController.affinity.podAntiAffinity "_selectorLabelsTemplate" "vertical-pod-autoscaler.admissionController.selectorLabels") .) }}
+{{- include "vertical-pod-autoscaler.patchPodAffinity" (merge (dict "_podAffinity" (dig "podAntiAffinity" nil .Values.admissionController.affinity) "_selectorLabelsTemplate" "vertical-pod-autoscaler.admissionController.selectorLabels") .) }}
 {{- end }}
 {{- end }}
 

diff --git a/charts/vertical-pod-autoscaler/templates/admission-controller/servicemonitor.yaml b/charts/vertical-pod-autoscaler/templates/admission-controller/servicemonitor.yaml
@@ -10,7 +10,7 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  jobLabel: app.kubernetes.io/instance
+  jobLabel: app.kubernetes.io/component-instance
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace }}
@@ -20,11 +20,7 @@ spec:
   endpoints:
     - port: http-metrics
       path: /metrics
-    {{- if .Values.serviceMonitor.endpointConfig }}
-      {{- toYaml .Values.serviceMonitor.endpointConfig | nindent 6 }}
-    {{- else }}
-    {{- with .Values.serviceMonitor.interval }}
-      interval: {{ . }}
-    {{- end }}
+    {{- with .Values.serviceMonitor.endpointConfig }}
+      {{- toYaml . | nindent 6 }}
     {{- end }}
 {{- end -}}
diff --git a/charts/vertical-pod-autoscaler/templates/recommender/_helpers.tpl b/charts/vertical-pod-autoscaler/templates/recommender/_helpers.tpl
@@ -11,6 +11,7 @@ Common labels
 {{- define "vertical-pod-autoscaler.recommender.labels" -}}
 {{ include "vertical-pod-autoscaler.labels" . }}
 app.kubernetes.io/component: recommender
+app.kubernetes.io/component-instance: {{ .Release.Name }}-recommender
 {{- end }}
 
 {{/*
@@ -44,10 +45,10 @@ Patch affinity
 */}}
 {{- define "vertical-pod-autoscaler.recommender.patchAffinity" -}}
 {{- if (hasKey .Values.recommender.affinity "podAffinity") }}
-{{- include "vertical-pod-autoscaler.patchPodAffinity" (merge (dict "_podAffinity" .Values.recommender.affinity.podAffinity "_selectorLabelsTemplate" "vertical-pod-autoscaler.recommender.selectorLabels") .) }}
+{{- include "vertical-pod-autoscaler.patchPodAffinity" (merge (dict "_podAffinity" (dig "podAffinity" nil .Values.recommender.affinity) "_selectorLabelsTemplate" "vertical-pod-autoscaler.recommender.selectorLabels") .) }}
 {{- end }}
 {{- if (hasKey .Values.recommender.affinity "podAntiAffinity") }}
-{{- include "vertical-pod-autoscaler.patchPodAffinity" (merge (dict "_podAffinity" .Values.recommender.affinity.podAntiAffinity "_selectorLabelsTemplate" "vertical-pod-autoscaler.recommender.selectorLabels") .) }}
+{{- include "vertical-pod-autoscaler.patchPodAffinity" (merge (dict "_podAffinity" (dig "podAntiAffinity" nil .Values.recommender.affinity) "_selectorLabelsTemplate" "vertical-pod-autoscaler.recommender.selectorLabels") .) }}
 {{- end }}
 {{- end }}
 

diff --git a/charts/vertical-pod-autoscaler/templates/recommender/servicemonitor.yaml b/charts/vertical-pod-autoscaler/templates/recommender/servicemonitor.yaml
@@ -10,7 +10,7 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  jobLabel: app.kubernetes.io/instance
+  jobLabel: app.kubernetes.io/component-instance
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace }}
@@ -20,11 +20,7 @@ spec:
   endpoints:
     - port: http-metrics
       path: /metrics
-    {{- if .Values.serviceMonitor.endpointConfig }}
-      {{- toYaml .Values.serviceMonitor.endpointConfig | nindent 6 }}
-    {{- else }}
-    {{- with .Values.serviceMonitor.interval }}
-      interval: {{ . }}
-    {{- end }}
+    {{- with .Values.serviceMonitor.endpointConfig }}
+      {{- toYaml . | nindent 6 }}
     {{- end }}
 {{- end -}}
diff --git a/charts/vertical-pod-autoscaler/templates/updater/_helpers.tpl b/charts/vertical-pod-autoscaler/templates/updater/_helpers.tpl
@@ -11,6 +11,7 @@ Common labels
 {{- define "vertical-pod-autoscaler.updater.labels" -}}
 {{ include "vertical-pod-autoscaler.labels" . }}
 app.kubernetes.io/component: updater
+app.kubernetes.io/component-instance: {{ .Release.Name }}-updater
 {{- end }}
 
 {{/*
@@ -44,10 +45,10 @@ Patch affinity
 */}}
 {{- define "vertical-pod-autoscaler.updater.patchAffinity" -}}
 {{- if (hasKey .Values.updater.affinity "podAffinity") }}
-{{- include "vertical-pod-autoscaler.patchPodAffinity" (merge (dict "_podAffinity" .Values.updater.affinity.podAffinity "_selectorLabelsTemplate" "vertical-pod-autoscaler.updater.selectorLabels") .) }}
+{{- include "vertical-pod-autoscaler.patchPodAffinity" (merge (dict "_podAffinity" (dig "podAffinity" nil .Values.updater.affinity) "_selectorLabelsTemplate" "vertical-pod-autoscaler.updater.selectorLabels") .) }}
 {{- end }}
 {{- if (hasKey .Values.updater.affinity "podAntiAffinity") }}
-{{- include "vertical-pod-autoscaler.patchPodAffinity" (merge (dict "_podAffinity" .Values.updater.affinity.podAntiAffinity "_selectorLabelsTemplate" "vertical-pod-autoscaler.updater.selectorLabels") .) }}
+{{- include "vertical-pod-autoscaler.patchPodAffinity" (merge (dict "_podAffinity" (dig "podAntiAffinity" nil .Values.updater.affinity) "_selectorLabelsTemplate" "vertical-pod-autoscaler.updater.selectorLabels") .) }}
 {{- end }}
 {{- end }}
 

diff --git a/charts/vertical-pod-autoscaler/templates/updater/servicemonitor.yaml b/charts/vertical-pod-autoscaler/templates/updater/servicemonitor.yaml
@@ -10,7 +10,7 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  jobLabel: app.kubernetes.io/instance
+  jobLabel: app.kubernetes.io/component-instance
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace }}
@@ -20,11 +20,7 @@ spec:
   endpoints:
     - port: http-metrics
       path: /metrics
-    {{- if .Values.serviceMonitor.endpointConfig }}
-      {{- toYaml .Values.serviceMonitor.endpointConfig | nindent 6 }}
-    {{- else }}
-    {{- with .Values.serviceMonitor.interval }}
-      interval: {{ . }}
-    {{- end }}
+    {{- with .Values.serviceMonitor.endpointConfig }}
+      {{- toYaml . | nindent 6 }}
     {{- end }}
 {{- end -}}