charts,salt,build: Bump prometheus-adapter chart to 4.7.0

Bump the prometheus-adapter chart to 4.7.0 and also bump the image to v0.11.1 Upgrade Prometheus Adapter chart using: ``` rm -rf charts/prometheus-adapter/ helm repo add prometheus-community https://prometheus-community.github.io/helm-charts helm repo update helm fetch -d charts --untar prometheus-community/prometheus-adapter ``` Re-render salt state using: ``` ./doit.sh codegen:chart_prometheus-adapter ```
scality · Oct 9, 2023 · 342e7aa · 342e7aa
1 parent 387ddb7
commit 342e7aa
Show file tree

Hide file tree

Showing 7 changed files with 71 additions and 45 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -46,6 +46,12 @@
   - Bump prometheus-operator and prometheus-config-reloader containers version to
     [0.68.0](https://github.com/prometheus-operator/prometheus-operator/releases/tag/v0.68.0)
 
+- Bump Prometheus Adapter chart version to
+  [4.7.0](https://github.com/prometheus-community/helm-charts/releases/tag/prometheus-adapter-4.7.0)
+  The prometheus-adapter image has been bumped accordingly to
+  [v0.11.1](https://github.com/kubernetes-sigs/prometheus-adapter/releases/tag/v0.11.1)
+  (PR[#4174](https://github.com/scality/metalk8s/pull/4174))
+
 - Bump nginx image to [1.25.2-alpine](https://github.com/nginx/nginx/releases/tag/release-1.25.2)
   (PR[#4165](https://github.com/scality/metalk8s/pull/4165))
 

diff --git a/buildchain/buildchain/versions.py b/buildchain/buildchain/versions.py
@@ -202,8 +202,8 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     ),
     Image(
         name="prometheus-adapter",
-        version="v0.10.0",
-        digest="sha256:2f34cb3a04a0fee6034f4d63ce3ee7786c0f762dc9f3bf196c70e894dd92edd1",
+        version="v0.11.1",
+        digest="sha256:e6a43c83ab1656f5371f27dedbb4d99e3c60922af439f1868c7efa5e066c6633",
     ),
     Image(
         name="prometheus-config-reloader",

diff --git a/charts/prometheus-adapter/Chart.yaml b/charts/prometheus-adapter/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: v0.10.0
+appVersion: v0.11.1
 description: A Helm chart for k8s prometheus adapter
 home: https://github.com/kubernetes-sigs/prometheus-adapter
 keywords:
@@ -17,4 +17,4 @@ name: prometheus-adapter
 sources:
 - https://github.com/kubernetes/charts
 - https://github.com/kubernetes-sigs/prometheus-adapter
-version: 4.2.0
+version: 4.7.0
diff --git a/charts/prometheus-adapter/templates/deployment.yaml b/charts/prometheus-adapter/templates/deployment.yaml
@@ -44,9 +44,13 @@ spec:
       {{- if .Values.dnsPolicy }}
       dnsPolicy: {{ .Values.dnsPolicy }}
       {{- end}}
+      {{- with .Values.dnsConfig }}
+      dnsConfig:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
       - name: {{ .Chart.Name }}
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+        image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         {{- with .Values.env }}
         env:
@@ -60,7 +64,6 @@ spec:
         - --tls-private-key-file=/var/run/serving-cert/tls.key
         {{- end }}
         - --cert-dir=/tmp/cert
-        - --logtostderr=true
         - --prometheus-url={{ tpl .Values.prometheus.url . }}{{ if .Values.prometheus.port }}:{{ .Values.prometheus.port }}{{end}}{{ .Values.prometheus.path }}
         - --metrics-relist-interval={{ .Values.metricsRelistInterval }}
         - --v={{ .Values.logLevel }}
@@ -79,14 +82,14 @@ spec:
         readinessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end }}
+        {{- with .Values.startupProbe }}
+        startupProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
         {{- if .Values.resources }}
         resources:
           {{- toYaml .Values.resources | nindent 10 }}
         {{- end }}
-        {{- with .Values.dnsConfig }}
-        dnsConfig:
-        {{ toYaml . | indent 8 }}
-        {{- end }}
         {{- with .Values.securityContext }}
         securityContext:
           {{- toYaml . | nindent 10 }}
@@ -105,6 +108,9 @@ spec:
           name: volume-serving-cert
           readOnly: true
         {{- end }}
+      {{- with .Values.extraContainers }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
       nodeSelector:
         {{- toYaml .Values.nodeSelector | nindent 8 }}
       affinity:

diff --git a/charts/prometheus-adapter/templates/service.yaml b/charts/prometheus-adapter/templates/service.yaml
@@ -15,6 +15,10 @@ metadata:
   name: {{ template "k8s-prometheus-adapter.fullname" . }}
   namespace: {{ include "k8s-prometheus-adapter.namespace" . }}
 spec:
+{{- if .Values.service.ipDualStack.enabled }}
+  ipFamilies: {{ toYaml .Values.service.ipDualStack.ipFamilies | nindent 4 }}
+  ipFamilyPolicy: {{ .Values.service.ipDualStack.ipFamilyPolicy }}
+{{- end }}
   ports:
   - port: {{ .Values.service.port }}
     protocol: TCP

diff --git a/charts/prometheus-adapter/values.yaml b/charts/prometheus-adapter/values.yaml
@@ -4,7 +4,8 @@ topologySpreadConstraints: []
 
 image:
   repository: registry.k8s.io/prometheus-adapter/prometheus-adapter
-  tag: v0.10.0
+  # if not set appVersion field from Chart.yaml is used
+  tag: ""
   pullPolicy: IfNotPresent
 
 logLevel: 4
@@ -112,6 +113,10 @@ readinessProbe:
   initialDelaySeconds: 30
   timeoutSeconds: 5
 
+# Configure startup probe
+# Use if prometheus-adapter takes a long time to finish startup e.g. polling a lot of API versions in cluster
+startupProbe: {}
+
 rules:
   default: true
 
@@ -183,7 +188,10 @@ service:
   port: 443
   type: ClusterIP
   # clusterIP: 1.2.3.4
-
+  ipDualStack:
+    enabled: false
+    ipFamilies: ["IPv6", "IPv4"]
+    ipFamilyPolicy: "PreferDualStack"
 tls:
   enable: false
   ca: |-
@@ -209,6 +217,9 @@ extraArguments: []
   # - --tls-private-key-file=/etc/tls/tls.key
   # - --tls-cert-file=/etc/tls/tls.crt
 
+# Additional containers to add to the pod
+extraContainers: []
+
 # Any extra volumes
 extraVolumes: []
   # - name: example-name

diff --git a/salt/metalk8s/addons/prometheus-adapter/deployed/chart.sls b/salt/metalk8s/addons/prometheus-adapter/deployed/chart.sls
@@ -16,8 +16,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: v0.10.0
-    helm.sh/chart: prometheus-adapter-4.2.0
+    app.kubernetes.io/version: v0.11.1
+    helm.sh/chart: prometheus-adapter-4.7.0
     heritage: metalk8s
   name: prometheus-adapter
   namespace: metalk8s-monitoring
@@ -129,8 +129,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: v0.10.0
-    helm.sh/chart: prometheus-adapter-4.2.0
+    app.kubernetes.io/version: v0.11.1
+    helm.sh/chart: prometheus-adapter-4.7.0
     heritage: metalk8s
   name: prometheus-adapter
   namespace: metalk8s-monitoring
@@ -144,8 +144,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: v0.10.0
-    helm.sh/chart: prometheus-adapter-4.2.0
+    app.kubernetes.io/version: v0.11.1
+    helm.sh/chart: prometheus-adapter-4.7.0
     heritage: metalk8s
   name: prometheus-adapter-resource-reader
   namespace: metalk8s-monitoring
@@ -171,8 +171,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: v0.10.0
-    helm.sh/chart: prometheus-adapter-4.2.0
+    app.kubernetes.io/version: v0.11.1
+    helm.sh/chart: prometheus-adapter-4.7.0
     heritage: metalk8s
   name: prometheus-adapter-server-resources
   namespace: metalk8s-monitoring
@@ -193,8 +193,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: v0.10.0
-    helm.sh/chart: prometheus-adapter-4.2.0
+    app.kubernetes.io/version: v0.11.1
+    helm.sh/chart: prometheus-adapter-4.7.0
     heritage: metalk8s
   name: prometheus-adapter-metrics
   namespace: metalk8s-monitoring
@@ -219,8 +219,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: v0.10.0
-    helm.sh/chart: prometheus-adapter-4.2.0
+    app.kubernetes.io/version: v0.11.1
+    helm.sh/chart: prometheus-adapter-4.7.0
     heritage: metalk8s
   name: prometheus-adapter-system-auth-delegator
   namespace: metalk8s-monitoring
@@ -242,8 +242,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: v0.10.0
-    helm.sh/chart: prometheus-adapter-4.2.0
+    app.kubernetes.io/version: v0.11.1
+    helm.sh/chart: prometheus-adapter-4.7.0
     heritage: metalk8s
   name: prometheus-adapter-resource-reader
   namespace: metalk8s-monitoring
@@ -265,8 +265,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: v0.10.0
-    helm.sh/chart: prometheus-adapter-4.2.0
+    app.kubernetes.io/version: v0.11.1
+    helm.sh/chart: prometheus-adapter-4.7.0
     heritage: metalk8s
   name: prometheus-adapter-hpa-controller
   namespace: metalk8s-monitoring
@@ -288,8 +288,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: v0.10.0
-    helm.sh/chart: prometheus-adapter-4.2.0
+    app.kubernetes.io/version: v0.11.1
+    helm.sh/chart: prometheus-adapter-4.7.0
     heritage: metalk8s
   name: prometheus-adapter-hpa-controller-metrics
   namespace: metalk8s-monitoring
@@ -311,8 +311,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: v0.10.0
-    helm.sh/chart: prometheus-adapter-4.2.0
+    app.kubernetes.io/version: v0.11.1
+    helm.sh/chart: prometheus-adapter-4.7.0
     heritage: metalk8s
   name: prometheus-adapter-auth-reader
   namespace: kube-system
@@ -334,8 +334,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: v0.10.0
-    helm.sh/chart: prometheus-adapter-4.2.0
+    app.kubernetes.io/version: v0.11.1
+    helm.sh/chart: prometheus-adapter-4.7.0
     heritage: metalk8s
   name: prometheus-adapter
   namespace: metalk8s-monitoring
@@ -358,8 +358,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: v0.10.0
-    helm.sh/chart: prometheus-adapter-4.2.0
+    app.kubernetes.io/version: v0.11.1
+    helm.sh/chart: prometheus-adapter-4.7.0
     heritage: metalk8s
   name: prometheus-adapter
   namespace: metalk8s-monitoring
@@ -377,15 +377,15 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: fd1e98c7830b14b4d725f37132d3497219ca9d60e135489d8761488ee973f6ba
+        checksum/config: 753da3cc0d3cfffe824548ce0e09def1306a96ba94e0661e56ad5560c982c6c0
       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.10.0
-        helm.sh/chart: prometheus-adapter-4.2.0
+        app.kubernetes.io/version: v0.11.1
+        helm.sh/chart: prometheus-adapter-4.7.0
         heritage: metalk8s
       name: prometheus-adapter
     spec:
@@ -395,13 +395,12 @@ spec:
         - /adapter
         - --secure-port=6443
         - --cert-dir=/tmp/cert
-        - --logtostderr=true
         - --prometheus-url=http://prometheus-operator-prometheus:9090
         - --metrics-relist-interval=1m
         - --v=4
         - --config=/etc/adapter/config.yaml
         image: '{%- endraw -%}{{ build_image_name("prometheus-adapter", False) }}{%-
-          raw -%}:v0.10.0'
+          raw -%}:v0.11.1'
         imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:
@@ -467,8 +466,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: v0.10.0
-    helm.sh/chart: prometheus-adapter-4.2.0
+    app.kubernetes.io/version: v0.11.1
+    helm.sh/chart: prometheus-adapter-4.7.0
     heritage: metalk8s
   name: v1beta1.custom.metrics.k8s.io
   namespace: metalk8s-monitoring
@@ -491,8 +490,8 @@ metadata:
     app.kubernetes.io/managed-by: salt
     app.kubernetes.io/name: prometheus-adapter
     app.kubernetes.io/part-of: metalk8s
-    app.kubernetes.io/version: v0.10.0
-    helm.sh/chart: prometheus-adapter-4.2.0
+    app.kubernetes.io/version: v0.11.1
+    helm.sh/chart: prometheus-adapter-4.7.0
     heritage: metalk8s
   name: v1beta1.metrics.k8s.io
   namespace: metalk8s-monitoring