chore: update Prometheus

2023-07-16 08:22:33 +02:00 · 2023-07-16 08:22:33 +02:00 · 9240de120e
parent 3173635b77
commit 9240de120e
24 changed files with 160 additions and 123 deletions
--- a/deploy/base/inflated/prometheus/charts/alertmanager/templates/configmap.yaml
+++ b/deploy/base/inflated/prometheus/charts/alertmanager/templates/configmap.yaml
@ -5,11 +5,12 @@ kind: ConfigMap
 metadata:
  name: prometheus-alertmanager
  labels:
-    helm.sh/chart: alertmanager-0.22.2
+    helm.sh/chart: alertmanager-0.33.1
    app.kubernetes.io/name: alertmanager
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "v0.24.0"
+    app.kubernetes.io/version: "v0.25.0"
    app.kubernetes.io/managed-by: Helm
+  namespace: default
 data:
  alertmanager.yml: |
    global: {}
--- a/deploy/base/inflated/prometheus/charts/alertmanager/templates/serviceaccount.yaml
+++ b/deploy/base/inflated/prometheus/charts/alertmanager/templates/serviceaccount.yaml
@ -5,8 +5,10 @@ kind: ServiceAccount
 metadata:
  name: prometheus-alertmanager
  labels:
-    helm.sh/chart: alertmanager-0.22.2
+    helm.sh/chart: alertmanager-0.33.1
    app.kubernetes.io/name: alertmanager
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "v0.24.0"
+    app.kubernetes.io/version: "v0.25.0"
    app.kubernetes.io/managed-by: Helm
+  namespace: default
+automountServiceAccountToken: true
--- a/deploy/base/inflated/prometheus/charts/alertmanager/templates/services.yaml
+++ b/deploy/base/inflated/prometheus/charts/alertmanager/templates/services.yaml
@ -5,11 +5,12 @@ kind: Service
 metadata:
  name: prometheus-alertmanager
  labels:
-    helm.sh/chart: alertmanager-0.22.2
+    helm.sh/chart: alertmanager-0.33.1
    app.kubernetes.io/name: alertmanager
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "v0.24.0"
+    app.kubernetes.io/version: "v0.25.0"
    app.kubernetes.io/managed-by: Helm
+  namespace: default
 spec:
  type: ClusterIP
  ports:
@ -27,11 +28,12 @@ kind: Service
 metadata:
  name: prometheus-alertmanager-headless
  labels:
-    helm.sh/chart: alertmanager-0.22.2
+    helm.sh/chart: alertmanager-0.33.1
    app.kubernetes.io/name: alertmanager
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "v0.24.0"
+    app.kubernetes.io/version: "v0.25.0"
    app.kubernetes.io/managed-by: Helm
+  namespace: default
 spec:
  clusterIP: None
  ports:
--- a/deploy/base/inflated/prometheus/charts/alertmanager/templates/statefulset.yaml
+++ b/deploy/base/inflated/prometheus/charts/alertmanager/templates/statefulset.yaml
@ -5,11 +5,12 @@ kind: StatefulSet
 metadata:
  name: prometheus-alertmanager
  labels:
-    helm.sh/chart: alertmanager-0.22.2
+    helm.sh/chart: alertmanager-0.33.1
    app.kubernetes.io/name: alertmanager
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "v0.24.0"
+    app.kubernetes.io/version: "v0.25.0"
    app.kubernetes.io/managed-by: Helm
+  namespace: default
 spec:
  replicas: 1
  selector:
@ -23,8 +24,9 @@ spec:
        app.kubernetes.io/name: alertmanager
        app.kubernetes.io/instance: prometheus
      annotations:
-        checksum/config: d22f3c67cff89938da2f783e00040109619b87e969186bf3b190d32dc540202c
+        checksum/config: 25406287f5528bc29842743c5931229856284a49f3871c27ceeac453455b898e
    spec:
+      automountServiceAccountToken: true
      serviceAccountName: prometheus-alertmanager
      securityContext:
        fsGroup: 65534
@ -37,7 +39,7 @@ spec:
            runAsGroup: 65534
            runAsNonRoot: true
            runAsUser: 65534
-          image: "quay.io/prometheus/alertmanager:v0.24.0"
+          image: "quay.io/prometheus/alertmanager:v0.25.0"
          imagePullPolicy: IfNotPresent
          env:
            - name: POD_IP
--- a/deploy/base/inflated/prometheus/charts/alertmanager/templates/tests/test-connection.yaml
+++ b/deploy/base/inflated/prometheus/charts/alertmanager/templates/tests/test-connection.yaml
@ -1,21 +0,0 @@
---
-# Source: prometheus/charts/alertmanager/templates/tests/test-connection.yaml
-apiVersion: v1
-kind: Pod
-metadata:
-  name: "prometheus-alertmanager-test-connection"
-  labels:
-    helm.sh/chart: alertmanager-0.22.2
-    app.kubernetes.io/name: alertmanager
-    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "v0.24.0"
-    app.kubernetes.io/managed-by: Helm
-  annotations:
-    "helm.sh/hook": test-success
-spec:
-  containers:
-    - name: wget
-      image: busybox
-      command: ['wget']
-      args: ['prometheus-alertmanager:9093']
-  restartPolicy: Never
--- a/deploy/base/inflated/prometheus/charts/kube-state-metrics/templates/clusterrolebinding.yaml
+++ b/deploy/base/inflated/prometheus/charts/kube-state-metrics/templates/clusterrolebinding.yaml
@ -4,13 +4,13 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
  labels:    
-    helm.sh/chart: kube-state-metrics-4.24.0
+    helm.sh/chart: kube-state-metrics-5.8.2
    app.kubernetes.io/managed-by: Helm
    app.kubernetes.io/component: metrics
    app.kubernetes.io/part-of: kube-state-metrics
    app.kubernetes.io/name: kube-state-metrics
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "2.7.0"
+    app.kubernetes.io/version: "2.9.2"
  name: prometheus-kube-state-metrics
 roleRef:
  apiGroup: rbac.authorization.k8s.io
--- a/deploy/base/inflated/prometheus/charts/kube-state-metrics/templates/deployment.yaml
+++ b/deploy/base/inflated/prometheus/charts/kube-state-metrics/templates/deployment.yaml
@ -6,13 +6,13 @@ metadata:
  name: prometheus-kube-state-metrics
  namespace: default
  labels:    
-    helm.sh/chart: kube-state-metrics-4.24.0
+    helm.sh/chart: kube-state-metrics-5.8.2
    app.kubernetes.io/managed-by: Helm
    app.kubernetes.io/component: metrics
    app.kubernetes.io/part-of: kube-state-metrics
    app.kubernetes.io/name: kube-state-metrics
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "2.7.0"
+    app.kubernetes.io/version: "2.9.2"
 spec:
  selector:
    matchLabels:      
@ -22,27 +22,30 @@ spec:
  template:
    metadata:
      labels:        
-        helm.sh/chart: kube-state-metrics-4.24.0
+        helm.sh/chart: kube-state-metrics-5.8.2
        app.kubernetes.io/managed-by: Helm
        app.kubernetes.io/component: metrics
        app.kubernetes.io/part-of: kube-state-metrics
        app.kubernetes.io/name: kube-state-metrics
        app.kubernetes.io/instance: prometheus
-        app.kubernetes.io/version: "2.7.0"
+        app.kubernetes.io/version: "2.9.2"
    spec:
      hostNetwork: false
      serviceAccountName: prometheus-kube-state-metrics
      securityContext:
        fsGroup: 65534
        runAsGroup: 65534
+        runAsNonRoot: true
        runAsUser: 65534
+        seccompProfile:
+          type: RuntimeDefault
      containers:
      - name: kube-state-metrics
        args:
        - --port=8080
        - --resources=certificatesigningrequests,configmaps,cronjobs,daemonsets,deployments,endpoints,horizontalpodautoscalers,ingresses,jobs,leases,limitranges,mutatingwebhookconfigurations,namespaces,networkpolicies,nodes,persistentvolumeclaims,persistentvolumes,poddisruptionbudgets,pods,replicasets,replicationcontrollers,resourcequotas,secrets,services,statefulsets,storageclasses,validatingwebhookconfigurations,volumeattachments
        imagePullPolicy: IfNotPresent
-        image: "registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.7.0"
+        image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.9.2
        ports:
        - containerPort: 8080
          name: "http"
@ -58,3 +61,8 @@ spec:
            port: 8080
          initialDelaySeconds: 5
          timeoutSeconds: 5
+        securityContext:
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+            - ALL
--- a/deploy/base/inflated/prometheus/charts/kube-state-metrics/templates/role.yaml
+++ b/deploy/base/inflated/prometheus/charts/kube-state-metrics/templates/role.yaml
@ -4,13 +4,13 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
  labels:    
-    helm.sh/chart: kube-state-metrics-4.24.0
+    helm.sh/chart: kube-state-metrics-5.8.2
    app.kubernetes.io/managed-by: Helm
    app.kubernetes.io/component: metrics
    app.kubernetes.io/part-of: kube-state-metrics
    app.kubernetes.io/name: kube-state-metrics
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "2.7.0"
+    app.kubernetes.io/version: "2.9.2"
  name: prometheus-kube-state-metrics
 rules:

--- a/deploy/base/inflated/prometheus/charts/kube-state-metrics/templates/service.yaml
+++ b/deploy/base/inflated/prometheus/charts/kube-state-metrics/templates/service.yaml
@ -6,13 +6,13 @@ metadata:
  name: prometheus-kube-state-metrics
  namespace: default
  labels:    
-    helm.sh/chart: kube-state-metrics-4.24.0
+    helm.sh/chart: kube-state-metrics-5.8.2
    app.kubernetes.io/managed-by: Helm
    app.kubernetes.io/component: metrics
    app.kubernetes.io/part-of: kube-state-metrics
    app.kubernetes.io/name: kube-state-metrics
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "2.7.0"
+    app.kubernetes.io/version: "2.9.2"
  annotations:
    prometheus.io/scrape: 'true'
 spec:
--- a/deploy/base/inflated/prometheus/charts/kube-state-metrics/templates/serviceaccount.yaml
+++ b/deploy/base/inflated/prometheus/charts/kube-state-metrics/templates/serviceaccount.yaml
@ -4,14 +4,13 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
  labels:    
-    helm.sh/chart: kube-state-metrics-4.24.0
+    helm.sh/chart: kube-state-metrics-5.8.2
    app.kubernetes.io/managed-by: Helm
    app.kubernetes.io/component: metrics
    app.kubernetes.io/part-of: kube-state-metrics
    app.kubernetes.io/name: kube-state-metrics
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "2.7.0"
+    app.kubernetes.io/version: "2.9.2"
  name: prometheus-kube-state-metrics
  namespace: default
 imagePullSecrets:
-  []
--- a/deploy/base/inflated/prometheus/charts/prometheus-node-exporter/templates/daemonset.yaml
+++ b/deploy/base/inflated/prometheus/charts/prometheus-node-exporter/templates/daemonset.yaml
@ -6,13 +6,13 @@ metadata:
  name: prometheus-prometheus-node-exporter
  namespace: default
  labels:
-    helm.sh/chart: prometheus-node-exporter-4.8.0
+    helm.sh/chart: prometheus-node-exporter-4.18.1
    app.kubernetes.io/managed-by: Helm
    app.kubernetes.io/component: metrics
    app.kubernetes.io/part-of: prometheus-node-exporter
    app.kubernetes.io/name: prometheus-node-exporter
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "1.5.0"
+    app.kubernetes.io/version: "1.6.0"
 spec:
  selector:
    matchLabels:
@ -27,13 +27,13 @@ spec:
      annotations:
        cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
      labels:
-        helm.sh/chart: prometheus-node-exporter-4.8.0
+        helm.sh/chart: prometheus-node-exporter-4.18.1
        app.kubernetes.io/managed-by: Helm
        app.kubernetes.io/component: metrics
        app.kubernetes.io/part-of: prometheus-node-exporter
        app.kubernetes.io/name: prometheus-node-exporter
        app.kubernetes.io/instance: prometheus
-        app.kubernetes.io/version: "1.5.0"
+        app.kubernetes.io/version: "1.6.0"
    spec:
      automountServiceAccountToken: false
      securityContext:
@ -44,15 +44,17 @@ spec:
      serviceAccountName: prometheus-prometheus-node-exporter
      containers:
        - name: node-exporter
-          image: quay.io/prometheus/node-exporter:v1.5.0
+          image: quay.io/prometheus/node-exporter:v1.6.0
          imagePullPolicy: IfNotPresent
          args:
            - --path.procfs=/host/proc
            - --path.sysfs=/host/sys
            - --path.rootfs=/host/root
+            - --path.udev.data=/host/root/run/udev/data
            - --web.listen-address=[$(HOST_IP)]:9100
          securityContext:
            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
          env:
            - name: HOST_IP
              value: 0.0.0.0
@ -95,6 +97,8 @@ spec:
              readOnly: true
      hostNetwork: true
      hostPID: true
+      nodeSelector:
+        kubernetes.io/os: linux
      tolerations:
        - effect: NoSchedule
          operator: Exists
--- a/deploy/base/inflated/prometheus/charts/prometheus-node-exporter/templates/service.yaml
+++ b/deploy/base/inflated/prometheus/charts/prometheus-node-exporter/templates/service.yaml
@ -6,13 +6,13 @@ metadata:
  name: prometheus-prometheus-node-exporter
  namespace: default
  labels:
-    helm.sh/chart: prometheus-node-exporter-4.8.0
+    helm.sh/chart: prometheus-node-exporter-4.18.1
    app.kubernetes.io/managed-by: Helm
    app.kubernetes.io/component: metrics
    app.kubernetes.io/part-of: prometheus-node-exporter
    app.kubernetes.io/name: prometheus-node-exporter
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "1.5.0"
+    app.kubernetes.io/version: "1.6.0"
  annotations:
    prometheus.io/scrape: "true"
 spec:
--- a/deploy/base/inflated/prometheus/charts/prometheus-node-exporter/templates/serviceaccount.yaml
+++ b/deploy/base/inflated/prometheus/charts/prometheus-node-exporter/templates/serviceaccount.yaml
@ -6,10 +6,10 @@ metadata:
  name: prometheus-prometheus-node-exporter
  namespace: default
  labels:
-    helm.sh/chart: prometheus-node-exporter-4.8.0
+    helm.sh/chart: prometheus-node-exporter-4.18.1
    app.kubernetes.io/managed-by: Helm
    app.kubernetes.io/component: metrics
    app.kubernetes.io/part-of: prometheus-node-exporter
    app.kubernetes.io/name: prometheus-node-exporter
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "1.5.0"
+    app.kubernetes.io/version: "1.6.0"
--- a/deploy/base/inflated/prometheus/charts/prometheus-pushgateway/templates/deployment.yaml
+++ b/deploy/base/inflated/prometheus/charts/prometheus-pushgateway/templates/deployment.yaml
@ -4,12 +4,13 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
  labels:
-    helm.sh/chart: prometheus-pushgateway-2.0.2
+    helm.sh/chart: prometheus-pushgateway-2.4.0
    app.kubernetes.io/name: prometheus-pushgateway
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "v1.5.1"
+    app.kubernetes.io/version: "v1.6.0"
    app.kubernetes.io/managed-by: Helm
  name: prometheus-prometheus-pushgateway
+  namespace: default
 spec:
  replicas: 1
  strategy:
@ -21,16 +22,16 @@ spec:
  template:
    metadata:
      labels:
-        helm.sh/chart: prometheus-pushgateway-2.0.2
+        helm.sh/chart: prometheus-pushgateway-2.4.0
        app.kubernetes.io/name: prometheus-pushgateway
        app.kubernetes.io/instance: prometheus
-        app.kubernetes.io/version: "v1.5.1"
+        app.kubernetes.io/version: "v1.6.0"
        app.kubernetes.io/managed-by: Helm
    spec:
      serviceAccountName: prometheus-prometheus-pushgateway
      containers:
        - name: pushgateway
-          image: "prom/pushgateway:v1.5.1"
+          image: "quay.io/prometheus/pushgateway:v1.6.0"
          imagePullPolicy: IfNotPresent
          ports:
            - name: metrics
@ -38,7 +39,7 @@ spec:
              protocol: TCP
          livenessProbe:
            httpGet:
-              path: /-/ready
+              path: /-/healthy
              port: 9091
            initialDelaySeconds: 10
            timeoutSeconds: 10
--- a/deploy/base/inflated/prometheus/charts/prometheus-pushgateway/templates/service.yaml
+++ b/deploy/base/inflated/prometheus/charts/prometheus-pushgateway/templates/service.yaml
@ -6,12 +6,13 @@ metadata:
  annotations:
    prometheus.io/probe: pushgateway
  labels:
-    helm.sh/chart: prometheus-pushgateway-2.0.2
+    helm.sh/chart: prometheus-pushgateway-2.4.0
    app.kubernetes.io/name: prometheus-pushgateway
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "v1.5.1"
+    app.kubernetes.io/version: "v1.6.0"
    app.kubernetes.io/managed-by: Helm
  name: prometheus-prometheus-pushgateway
+  namespace: default
 spec:
  type: ClusterIP
  ports:
--- a/deploy/base/inflated/prometheus/charts/prometheus-pushgateway/templates/serviceaccount.yaml
+++ b/deploy/base/inflated/prometheus/charts/prometheus-pushgateway/templates/serviceaccount.yaml
@ -4,9 +4,10 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
  labels:
-    helm.sh/chart: prometheus-pushgateway-2.0.2
+    helm.sh/chart: prometheus-pushgateway-2.4.0
    app.kubernetes.io/name: prometheus-pushgateway
    app.kubernetes.io/instance: prometheus
-    app.kubernetes.io/version: "v1.5.1"
+    app.kubernetes.io/version: "v1.6.0"
    app.kubernetes.io/managed-by: Helm
  name: prometheus-prometheus-pushgateway
+  namespace: default
--- a/deploy/base/inflated/prometheus/templates/clusterrole.yaml
+++ b/deploy/base/inflated/prometheus/templates/clusterrole.yaml
@ -4,11 +4,13 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
  labels:
-    component: "server"
-    app: prometheus
-    release: prometheus
-    chart: prometheus-19.0.2
-    heritage: Helm
+    app.kubernetes.io/component: server
+    app.kubernetes.io/name: prometheus
+    app.kubernetes.io/instance: prometheus
+    app.kubernetes.io/version: v2.45.0
+    helm.sh/chart: prometheus-23.1.0
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/part-of: prometheus
  name: prometheus-server
 rules:
  - apiGroups:
--- a/deploy/base/inflated/prometheus/templates/clusterrolebinding.yaml
+++ b/deploy/base/inflated/prometheus/templates/clusterrolebinding.yaml
@ -4,11 +4,13 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
  labels:
-    component: "server"
-    app: prometheus
-    release: prometheus
-    chart: prometheus-19.0.2
-    heritage: Helm
+    app.kubernetes.io/component: server
+    app.kubernetes.io/name: prometheus
+    app.kubernetes.io/instance: prometheus
+    app.kubernetes.io/version: v2.45.0
+    helm.sh/chart: prometheus-23.1.0
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/part-of: prometheus
  name: prometheus-server
 subjects:
  - kind: ServiceAccount
--- a/deploy/base/inflated/prometheus/templates/cm.yaml
+++ b/deploy/base/inflated/prometheus/templates/cm.yaml
@ -4,11 +4,13 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
  labels:
-    component: "server"
-    app: prometheus
-    release: prometheus
-    chart: prometheus-19.0.2
-    heritage: Helm
+    app.kubernetes.io/component: server
+    app.kubernetes.io/name: prometheus
+    app.kubernetes.io/instance: prometheus
+    app.kubernetes.io/version: v2.45.0
+    helm.sh/chart: prometheus-23.1.0
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/part-of: prometheus
  name: prometheus-server
  namespace: default
 data:
@ -237,11 +239,18 @@ data:
        - __meta_kubernetes_pod_annotation_prometheus_io_path
        target_label: __metrics_path__
      - action: replace
-        regex: (.+?)(?::\d+)?;(\d+)
-        replacement: $1:$2
+        regex: (\d+);(([A-Fa-f0-9]{1,4}::?){1,7}[A-Fa-f0-9]{1,4})
+        replacement: '[$2]:$1'
        source_labels:
-        - __address__
        - __meta_kubernetes_pod_annotation_prometheus_io_port
+        - __meta_kubernetes_pod_ip
+        target_label: __address__
+      - action: replace
+        regex: (\d+);((([0-9]+?)(\.|$)){4})
+        replacement: $2:$1
+        source_labels:
+        - __meta_kubernetes_pod_annotation_prometheus_io_port
+        - __meta_kubernetes_pod_ip
        target_label: __address__
      - action: labelmap
        regex: __meta_kubernetes_pod_annotation_prometheus_io_param_(.+)
@ -260,6 +269,10 @@ data:
        regex: Pending|Succeeded|Failed|Completed
        source_labels:
        - __meta_kubernetes_pod_phase
+      - action: replace
+        source_labels:
+        - __meta_kubernetes_pod_node_name
+        target_label: node
    - honor_labels: true
      job_name: kubernetes-pods-slow
      kubernetes_sd_configs:
@ -280,11 +293,18 @@ data:
        - __meta_kubernetes_pod_annotation_prometheus_io_path
        target_label: __metrics_path__
      - action: replace
-        regex: (.+?)(?::\d+)?;(\d+)
-        replacement: $1:$2
+        regex: (\d+);(([A-Fa-f0-9]{1,4}::?){1,7}[A-Fa-f0-9]{1,4})
+        replacement: '[$2]:$1'
        source_labels:
-        - __address__
        - __meta_kubernetes_pod_annotation_prometheus_io_port
+        - __meta_kubernetes_pod_ip
+        target_label: __address__
+      - action: replace
+        regex: (\d+);((([0-9]+?)(\.|$)){4})
+        replacement: $2:$1
+        source_labels:
+        - __meta_kubernetes_pod_annotation_prometheus_io_port
+        - __meta_kubernetes_pod_ip
        target_label: __address__
      - action: labelmap
        regex: __meta_kubernetes_pod_annotation_prometheus_io_param_(.+)
@ -303,6 +323,10 @@ data:
        regex: Pending|Succeeded|Failed|Completed
        source_labels:
        - __meta_kubernetes_pod_phase
+      - action: replace
+        source_labels:
+        - __meta_kubernetes_pod_node_name
+        target_label: node
      scrape_interval: 5m
      scrape_timeout: 30s
    alerting:
--- a/deploy/base/inflated/prometheus/templates/deploy.yaml
+++ b/deploy/base/inflated/prometheus/templates/deploy.yaml
@ -4,19 +4,21 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
  labels:
-    component: "server"
-    app: prometheus
-    release: prometheus
-    chart: prometheus-19.0.2
-    heritage: Helm
+    app.kubernetes.io/component: server
+    app.kubernetes.io/name: prometheus
+    app.kubernetes.io/instance: prometheus
+    app.kubernetes.io/version: v2.45.0
+    helm.sh/chart: prometheus-23.1.0
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/part-of: prometheus
  name: prometheus-server
  namespace: default
 spec:
  selector:
    matchLabels:
-      component: "server"
-      app: prometheus
-      release: prometheus
+      app.kubernetes.io/component: server
+      app.kubernetes.io/name: prometheus
+      app.kubernetes.io/instance: prometheus
  replicas: 1
  strategy:
    type: Recreate
@ -24,21 +26,23 @@ spec:
  template:
    metadata:
      labels:
-        component: "server"
-        app: prometheus
-        release: prometheus
-        chart: prometheus-19.0.2
-        heritage: Helm
+        app.kubernetes.io/component: server
+        app.kubernetes.io/name: prometheus
+        app.kubernetes.io/instance: prometheus
+        app.kubernetes.io/version: v2.45.0
+        helm.sh/chart: prometheus-23.1.0
+        app.kubernetes.io/managed-by: Helm
+        app.kubernetes.io/part-of: prometheus
    spec:
      enableServiceLinks: true
      serviceAccountName: prometheus-server
      containers:
        - name: prometheus-server-configmap-reload
-          image: "jimmidyson/configmap-reload:v0.8.0"
+          image: "quay.io/prometheus-operator/prometheus-config-reloader:v0.66.0"
          imagePullPolicy: "IfNotPresent"
          args:
-            - --volume-dir=/etc/config
-            - --webhook-url=http://127.0.0.1:9090/-/reload
+            - --watched-dir=/etc/config
+            - --reload-url=http://127.0.0.1:9090/-/reload
          resources:
            {}
          volumeMounts:
@ -47,7 +51,7 @@ spec:
              readOnly: true

        - name: prometheus-server
-          image: "quay.io/prometheus/prometheus:v2.40.5"
+          image: "quay.io/prometheus/prometheus:v2.45.0"
          imagePullPolicy: "IfNotPresent"
          args:
            - --storage.tsdb.retention.time=15d
--- a/deploy/base/inflated/prometheus/templates/pvc.yaml
+++ b/deploy/base/inflated/prometheus/templates/pvc.yaml
@ -4,11 +4,13 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
  labels:
-    component: "server"
-    app: prometheus
-    release: prometheus
-    chart: prometheus-19.0.2
-    heritage: Helm
+    app.kubernetes.io/component: server
+    app.kubernetes.io/name: prometheus
+    app.kubernetes.io/instance: prometheus
+    app.kubernetes.io/version: v2.45.0
+    helm.sh/chart: prometheus-23.1.0
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/part-of: prometheus
  name: prometheus-server
  namespace: default
 spec:
--- a/deploy/base/inflated/prometheus/templates/service.yaml
+++ b/deploy/base/inflated/prometheus/templates/service.yaml
@ -4,11 +4,13 @@ apiVersion: v1
 kind: Service
 metadata:
  labels:
-    component: "server"
-    app: prometheus
-    release: prometheus
-    chart: prometheus-19.0.2
-    heritage: Helm
+    app.kubernetes.io/component: server
+    app.kubernetes.io/name: prometheus
+    app.kubernetes.io/instance: prometheus
+    app.kubernetes.io/version: v2.45.0
+    helm.sh/chart: prometheus-23.1.0
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/part-of: prometheus
  name: prometheus-server
  namespace: default
 spec:
@ -18,8 +20,8 @@ spec:
      protocol: TCP
      targetPort: 9090
  selector:
-    component: "server"
-    app: prometheus
-    release: prometheus
+    app.kubernetes.io/component: server
+    app.kubernetes.io/name: prometheus
+    app.kubernetes.io/instance: prometheus
  sessionAffinity: None
  type: "ClusterIP"
--- a/deploy/base/inflated/prometheus/templates/serviceaccount.yaml
+++ b/deploy/base/inflated/prometheus/templates/serviceaccount.yaml
@ -4,11 +4,13 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
  labels:
-    component: "server"
-    app: prometheus
-    release: prometheus
-    chart: prometheus-19.0.2
-    heritage: Helm
+    app.kubernetes.io/component: server
+    app.kubernetes.io/name: prometheus
+    app.kubernetes.io/instance: prometheus
+    app.kubernetes.io/version: v2.45.0
+    helm.sh/chart: prometheus-23.1.0
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/part-of: prometheus
  name: prometheus-server
  namespace: default
  annotations:
--- a/deploy/base/kustomization.yaml
+++ b/deploy/base/kustomization.yaml
@ -36,7 +36,6 @@ resources:
 - inflated/prometheus/charts/prometheus-node-exporter/templates/service.yaml
 - inflated/prometheus/charts/alertmanager/templates/serviceaccount.yaml
 - inflated/prometheus/charts/alertmanager/templates/services.yaml
- inflated/prometheus/charts/alertmanager/templates/tests/test-connection.yaml
 - inflated/prometheus/charts/alertmanager/templates/configmap.yaml
 - inflated/prometheus/charts/alertmanager/templates/statefulset.yaml
 - inflated/prometheus/charts/kube-state-metrics/templates/serviceaccount.yaml