ARTESCA-14990 - Bump prometheus-adapter chart to v0.12.0 and image to 4.14.1

CHANGELOG.md

@@ -17,6 +17,11 @@
   [v2.42.0](https://github.com/dexidp/dex/releases/tag/v2.42.0)
   (PR[#4558](https://github.com/scality/metalk8s/pull/4558))
 
+- Bump prometheus-adapter chart version to
+  [4.14.1](https://github.com/prometheus-community/helm-charts/releases/tag/prometheus-adapter-4.14.1)
+  The prometheus-adapter image has been bumped accordingly to
+  (PR[#4563](https://github.com/scality/metalk8s/pull/4563))
+
 ## Release 129.0.1 (in development)
 
 ### Enhancements

charts/prometheus-adapter/Chart.yaml

@@ -10,11 +10,14 @@ keywords:
 maintainers:
 - email: mattias.gees@jetstack.io
   name: mattiasgees
+  url: https://github.com/mattiasgees
 - name: steven-sheehy
+  url: https://github.com/steven-sheehy
 - email: hfernandez@mesosphere.com
   name: hectorj2f
+  url: https://github.com/hectorj2f
 name: prometheus-adapter
 sources:
 - https://github.com/kubernetes/charts
 - https://github.com/kubernetes-sigs/prometheus-adapter
-version: 4.11.0
+version: 4.14.1

charts/prometheus-adapter/README.md

@@ -136,15 +136,15 @@ rules:
       containerLabel: container
     memory:
       containerQuery: |
-        sum by (<<.GroupBy>>) (
+        round(sum by (<<.GroupBy>>) (
           avg_over_time(container_memory_working_set_bytes{container!="",<<.LabelMatchers>>}[3m])
-        )
+        ))
       nodeQuery: |
-        sum by (<<.GroupBy>>) (
+        round(sum by (<<.GroupBy>>) (
           avg_over_time(node_memory_MemTotal_bytes{<<.LabelMatchers>>}[3m])
           -
           avg_over_time(node_memory_MemAvailable_bytes{<<.LabelMatchers>>}[3m])
-        )
+        ))
       resources:
         overrides:
           node:

charts/prometheus-adapter/templates/certmanager.yaml

@@ -31,6 +31,9 @@ metadata:
 spec:
   secretName: {{ template "k8s-prometheus-adapter.fullname" . }}-root-cert
   duration: {{ .Values.certManager.caCertDuration }}
+  {{- with .Values.certManager.caCertRevisionHistoryLimit }}
+  revisionHistoryLimit: {{ . }}
+  {{- end }}
   issuerRef:
     name: {{ template "k8s-prometheus-adapter.fullname" . }}-self-signed-issuer
   commonName: "ca.webhook.prometheus-adapter"
@@ -67,6 +70,9 @@ metadata:
 spec:
   secretName: {{ template "k8s-prometheus-adapter.fullname" . }}
   duration: {{ .Values.certManager.certDuration }}
+  {{- with .Values.certManager.certRevisionHistoryLimit }}
+  revisionHistoryLimit: {{ . }}
+  {{- end }}
   issuerRef:
     name: {{ template "k8s-prometheus-adapter.fullname" . }}-root-issuer
   dnsNames:

charts/prometheus-adapter/templates/deployment.yaml

@@ -37,6 +37,7 @@ spec:
         {{- toYaml . | nindent 8 }}
         {{- end }}
     spec:
+      automountServiceAccountToken: {{ .Values.automountServiceAccountToken }}
       serviceAccountName: {{ template "k8s-prometheus-adapter.serviceAccountName" . }}
       {{- if .Values.hostNetwork.enabled }}
       hostNetwork: true

charts/prometheus-adapter/templates/extra-objects.yaml

@@ -0,0 +1,4 @@
+{{ range .Values.extraManifests }}
+---
+{{ tpl (toYaml .) $ }}
+{{ end }}

charts/prometheus-adapter/templates/serviceaccount.yaml

@@ -1,6 +1,7 @@
 {{- if .Values.serviceAccount.create -}}
 apiVersion: v1
 kind: ServiceAccount
+automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
 metadata:
   labels:
     {{- include "k8s-prometheus-adapter.labels" . | indent 4 }}

charts/prometheus-adapter/values.yaml

@@ -7,6 +7,8 @@ image:
   # if not set appVersion field from Chart.yaml is used
   tag: ""
   pullPolicy: IfNotPresent
+  pullSecrets: []
+    # - foo
 
 logLevel: 4
 
@@ -74,6 +76,9 @@ psp:
   ## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/#seccomp
   ## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/#sysctl
 
+# If false then the user will opt out of automounting API credentials.
+automountServiceAccountToken: true
+
 serviceAccount:
   # Specifies whether a service account should be created
   create: true
@@ -84,6 +89,8 @@ serviceAccount:
   # Use case: AWS EKS IAM roles for service accounts
   # ref: https://docs.aws.amazon.com/eks/latest/userguide/specify-service-account-role.html
   annotations: {}
+  # If false then the user will opt out of automounting API credentials.
+  automountServiceAccountToken: true
 
 # Custom DNS configuration to be added to prometheus-adapter pods
 dnsConfig: {}
@@ -290,3 +297,18 @@ certManager:
   enabled: false
   caCertDuration: 43800h0m0s
   certDuration: 8760h0m0s
+  # -- Set the revisionHistoryLimit on the Certificates. See
+  # https://cert-manager.io/docs/reference/api-docs/#cert-manager.io/v1.CertificateSpec
+  # Defaults to nil.
+  caCertRevisionHistoryLimit:
+  certRevisionHistoryLimit:
+
+## Extra manifests to deploy as an array
+extraManifests: []
+  # - apiVersion: v1
+  #   kind: ConfigMap
+  #   metadata:
+  #   labels:
+  #     name: prometheus-extra
+  #   data:
+  #     extra-data: "value"

salt/metalk8s/addons/prometheus-adapter/deployed/chart.sls

@@ -8,6 +8,7 @@
 {% raw %}
 
 apiVersion: v1
+automountServiceAccountToken: true
 kind: ServiceAccount
 metadata:
   labels:
@@ -17,7 +18,7 @@ metadata:
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
     app.kubernetes.io/version: v0.12.0
-    helm.sh/chart: prometheus-adapter-4.11.0
+    helm.sh/chart: prometheus-adapter-4.14.1
     heritage: metalk8s
   name: prometheus-adapter
   namespace: metalk8s-monitoring
@@ -130,7 +131,7 @@ metadata:
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
     app.kubernetes.io/version: v0.12.0
-    helm.sh/chart: prometheus-adapter-4.11.0
+    helm.sh/chart: prometheus-adapter-4.14.1
     heritage: metalk8s
   name: prometheus-adapter
   namespace: metalk8s-monitoring
@@ -145,7 +146,7 @@ metadata:
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
     app.kubernetes.io/version: v0.12.0
-    helm.sh/chart: prometheus-adapter-4.11.0
+    helm.sh/chart: prometheus-adapter-4.14.1
     heritage: metalk8s
   name: prometheus-adapter-resource-reader
   namespace: metalk8s-monitoring
@@ -172,7 +173,7 @@ metadata:
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
     app.kubernetes.io/version: v0.12.0
-    helm.sh/chart: prometheus-adapter-4.11.0
+    helm.sh/chart: prometheus-adapter-4.14.1
     heritage: metalk8s
   name: prometheus-adapter-server-resources
   namespace: metalk8s-monitoring
@@ -194,7 +195,7 @@ metadata:
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
     app.kubernetes.io/version: v0.12.0
-    helm.sh/chart: prometheus-adapter-4.11.0
+    helm.sh/chart: prometheus-adapter-4.14.1
     heritage: metalk8s
   name: prometheus-adapter-metrics
   namespace: metalk8s-monitoring
@@ -220,7 +221,7 @@ metadata:
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
     app.kubernetes.io/version: v0.12.0
-    helm.sh/chart: prometheus-adapter-4.11.0
+    helm.sh/chart: prometheus-adapter-4.14.1
     heritage: metalk8s
   name: prometheus-adapter-system-auth-delegator
   namespace: metalk8s-monitoring
@@ -243,7 +244,7 @@ metadata:
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
     app.kubernetes.io/version: v0.12.0
-    helm.sh/chart: prometheus-adapter-4.11.0
+    helm.sh/chart: prometheus-adapter-4.14.1
     heritage: metalk8s
   name: prometheus-adapter-resource-reader
   namespace: metalk8s-monitoring
@@ -266,7 +267,7 @@ metadata:
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
     app.kubernetes.io/version: v0.12.0
-    helm.sh/chart: prometheus-adapter-4.11.0
+    helm.sh/chart: prometheus-adapter-4.14.1
     heritage: metalk8s
   name: prometheus-adapter-hpa-controller
   namespace: metalk8s-monitoring
@@ -289,7 +290,7 @@ metadata:
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
     app.kubernetes.io/version: v0.12.0
-    helm.sh/chart: prometheus-adapter-4.11.0
+    helm.sh/chart: prometheus-adapter-4.14.1
     heritage: metalk8s
   name: prometheus-adapter-hpa-controller-metrics
   namespace: metalk8s-monitoring
@@ -312,7 +313,7 @@ metadata:
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
     app.kubernetes.io/version: v0.12.0
-    helm.sh/chart: prometheus-adapter-4.11.0
+    helm.sh/chart: prometheus-adapter-4.14.1
     heritage: metalk8s
   name: prometheus-adapter-auth-reader
   namespace: kube-system
@@ -335,7 +336,7 @@ metadata:
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
     app.kubernetes.io/version: v0.12.0
-    helm.sh/chart: prometheus-adapter-4.11.0
+    helm.sh/chart: prometheus-adapter-4.14.1
     heritage: metalk8s
   name: prometheus-adapter
   namespace: metalk8s-monitoring
@@ -360,7 +361,7 @@ metadata:
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
     app.kubernetes.io/version: v0.12.0
-    helm.sh/chart: prometheus-adapter-4.11.0
+    helm.sh/chart: prometheus-adapter-4.14.1
     heritage: metalk8s
   name: prometheus-adapter
   namespace: metalk8s-monitoring
@@ -378,19 +379,20 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 97ca6e9c3c8caba2e2aba1d72f3c8c5da8157421a2682c11ebc7e29c6980835c
+        checksum/config: 279409461d8d7b609f44dee4111e1092b02935387fb219080b82b867c3d66113
       labels:
         app.kubernetes.io/component: metrics
         app.kubernetes.io/instance: prometheus-adapter
         app.kubernetes.io/managed-by: salt
         app.kubernetes.io/name: prometheus-adapter
         app.kubernetes.io/part-of: metalk8s
         app.kubernetes.io/version: v0.12.0
-        helm.sh/chart: prometheus-adapter-4.11.0
+        helm.sh/chart: prometheus-adapter-4.14.1
         heritage: metalk8s
       name: prometheus-adapter
     spec:
       affinity: {}
+      automountServiceAccountToken: true
       containers:
       - args:
         - /adapter
@@ -467,7 +469,7 @@ metadata:
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
     app.kubernetes.io/version: v0.12.0
-    helm.sh/chart: prometheus-adapter-4.11.0
+    helm.sh/chart: prometheus-adapter-4.14.1
     heritage: metalk8s
   name: v1beta1.custom.metrics.k8s.io
   namespace: metalk8s-monitoring
@@ -491,7 +493,7 @@ metadata:
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
     app.kubernetes.io/version: v0.12.0
-    helm.sh/chart: prometheus-adapter-4.11.0
+    helm.sh/chart: prometheus-adapter-4.14.1
     heritage: metalk8s
   name: v1beta1.metrics.k8s.io
   namespace: metalk8s-monitoring