diff --git a/deploy/base/inflated/prometheus/charts/alertmanager/templates/configmap.yaml b/deploy/base/inflated/prometheus/charts/alertmanager/templates/configmap.yaml index 4245f7d..e0abfd2 100644 --- a/deploy/base/inflated/prometheus/charts/alertmanager/templates/configmap.yaml +++ b/deploy/base/inflated/prometheus/charts/alertmanager/templates/configmap.yaml @@ -5,10 +5,10 @@ kind: ConfigMap metadata: name: prometheus-alertmanager labels: - helm.sh/chart: alertmanager-0.33.1 + helm.sh/chart: alertmanager-1.16.1 app.kubernetes.io/name: alertmanager app.kubernetes.io/instance: prometheus - app.kubernetes.io/version: "v0.25.0" + app.kubernetes.io/version: "v0.28.1" app.kubernetes.io/managed-by: Helm namespace: default data: diff --git a/deploy/base/inflated/prometheus/charts/alertmanager/templates/serviceaccount.yaml b/deploy/base/inflated/prometheus/charts/alertmanager/templates/serviceaccount.yaml index 1540e01..9d2e8a5 100644 --- a/deploy/base/inflated/prometheus/charts/alertmanager/templates/serviceaccount.yaml +++ b/deploy/base/inflated/prometheus/charts/alertmanager/templates/serviceaccount.yaml @@ -5,10 +5,10 @@ kind: ServiceAccount metadata: name: prometheus-alertmanager labels: - helm.sh/chart: alertmanager-0.33.1 + helm.sh/chart: alertmanager-1.16.1 app.kubernetes.io/name: alertmanager app.kubernetes.io/instance: prometheus - app.kubernetes.io/version: "v0.25.0" + app.kubernetes.io/version: "v0.28.1" app.kubernetes.io/managed-by: Helm namespace: default automountServiceAccountToken: true diff --git a/deploy/base/inflated/prometheus/charts/alertmanager/templates/services.yaml b/deploy/base/inflated/prometheus/charts/alertmanager/templates/services.yaml index 396d625..6819a50 100644 --- a/deploy/base/inflated/prometheus/charts/alertmanager/templates/services.yaml +++ b/deploy/base/inflated/prometheus/charts/alertmanager/templates/services.yaml @@ -5,10 +5,10 @@ kind: Service metadata: name: prometheus-alertmanager labels: - helm.sh/chart: alertmanager-0.33.1 + helm.sh/chart: alertmanager-1.16.1 app.kubernetes.io/name: alertmanager app.kubernetes.io/instance: prometheus - app.kubernetes.io/version: "v0.25.0" + app.kubernetes.io/version: "v0.28.1" app.kubernetes.io/managed-by: Helm namespace: default spec: @@ -28,10 +28,10 @@ kind: Service metadata: name: prometheus-alertmanager-headless labels: - helm.sh/chart: alertmanager-0.33.1 + helm.sh/chart: alertmanager-1.16.1 app.kubernetes.io/name: alertmanager app.kubernetes.io/instance: prometheus - app.kubernetes.io/version: "v0.25.0" + app.kubernetes.io/version: "v0.28.1" app.kubernetes.io/managed-by: Helm namespace: default spec: diff --git a/deploy/base/inflated/prometheus/charts/alertmanager/templates/statefulset.yaml b/deploy/base/inflated/prometheus/charts/alertmanager/templates/statefulset.yaml index 9c17369..78a82f4 100644 --- a/deploy/base/inflated/prometheus/charts/alertmanager/templates/statefulset.yaml +++ b/deploy/base/inflated/prometheus/charts/alertmanager/templates/statefulset.yaml @@ -5,14 +5,16 @@ kind: StatefulSet metadata: name: prometheus-alertmanager labels: - helm.sh/chart: alertmanager-0.33.1 + helm.sh/chart: alertmanager-1.16.1 app.kubernetes.io/name: alertmanager app.kubernetes.io/instance: prometheus - app.kubernetes.io/version: "v0.25.0" + app.kubernetes.io/version: "v0.28.1" app.kubernetes.io/managed-by: Helm namespace: default spec: replicas: 1 + minReadySeconds: 0 + revisionHistoryLimit: 10 selector: matchLabels: app.kubernetes.io/name: alertmanager @@ -24,7 +26,7 @@ spec: app.kubernetes.io/name: alertmanager app.kubernetes.io/instance: prometheus annotations: - checksum/config: 25406287f5528bc29842743c5931229856284a49f3871c27ceeac453455b898e + checksum/config: 86bff46324003d97b5e3fb2f03e7e5f42f6d32d8e8463340e3813a5836f1cfe8 spec: automountServiceAccountToken: true serviceAccountName: prometheus-alertmanager @@ -39,7 +41,7 @@ spec: runAsGroup: 65534 runAsNonRoot: true runAsUser: 65534 - image: "quay.io/prometheus/alertmanager:v0.25.0" + image: "quay.io/prometheus/alertmanager:v0.28.1" imagePullPolicy: IfNotPresent env: - name: POD_IP diff --git a/deploy/base/inflated/prometheus/charts/kube-state-metrics/templates/clusterrolebinding.yaml b/deploy/base/inflated/prometheus/charts/kube-state-metrics/templates/clusterrolebinding.yaml index 10fa326..f5a7e7f 100644 --- 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-5.8.2 + helm.sh/chart: kube-state-metrics-5.32.0 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.9.2" + app.kubernetes.io/version: "2.15.0" name: prometheus-kube-state-metrics roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/deploy/base/inflated/prometheus/charts/kube-state-metrics/templates/deployment.yaml b/deploy/base/inflated/prometheus/charts/kube-state-metrics/templates/deployment.yaml index 5aba5a4..c908dc3 100644 --- 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,30 +6,34 @@ metadata: name: prometheus-kube-state-metrics namespace: default labels: - helm.sh/chart: kube-state-metrics-5.8.2 + helm.sh/chart: kube-state-metrics-5.32.0 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.9.2" + app.kubernetes.io/version: "2.15.0" spec: selector: matchLabels: app.kubernetes.io/name: kube-state-metrics app.kubernetes.io/instance: prometheus replicas: 1 + strategy: + type: RollingUpdate + revisionHistoryLimit: 10 template: metadata: labels: - helm.sh/chart: kube-state-metrics-5.8.2 + helm.sh/chart: kube-state-metrics-5.32.0 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.9.2" + app.kubernetes.io/version: "2.15.0" spec: + automountServiceAccountToken: true hostNetwork: false serviceAccountName: prometheus-kube-state-metrics securityContext: @@ -39,30 +43,44 @@ spec: runAsUser: 65534 seccompProfile: type: RuntimeDefault + dnsPolicy: ClusterFirst 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.9.2 + image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.15.0 ports: - containerPort: 8080 name: "http" livenessProbe: + failureThreshold: 3 httpGet: - path: /healthz + httpHeaders: + path: /livez port: 8080 + scheme: HTTP initialDelaySeconds: 5 + periodSeconds: 10 + successThreshold: 1 timeoutSeconds: 5 readinessProbe: + failureThreshold: 3 httpGet: - path: / - port: 8080 + httpHeaders: + path: /readyz + port: 8081 + scheme: HTTP initialDelaySeconds: 5 + periodSeconds: 10 + successThreshold: 1 timeoutSeconds: 5 + resources: + {} securityContext: allowPrivilegeEscalation: false capabilities: drop: - ALL + readOnlyRootFilesystem: true diff --git a/deploy/base/inflated/prometheus/charts/kube-state-metrics/templates/role.yaml b/deploy/base/inflated/prometheus/charts/kube-state-metrics/templates/role.yaml index e99883b..8c1bb35 100644 --- 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-5.8.2 + helm.sh/chart: kube-state-metrics-5.32.0 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.9.2" + app.kubernetes.io/version: "2.15.0" name: prometheus-kube-state-metrics rules: diff --git a/deploy/base/inflated/prometheus/charts/kube-state-metrics/templates/service.yaml b/deploy/base/inflated/prometheus/charts/kube-state-metrics/templates/service.yaml index 86ded1e..e373f3e 100644 --- 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-5.8.2 + helm.sh/chart: kube-state-metrics-5.32.0 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.9.2" + app.kubernetes.io/version: "2.15.0" annotations: prometheus.io/scrape: 'true' spec: diff --git a/deploy/base/inflated/prometheus/charts/kube-state-metrics/templates/serviceaccount.yaml b/deploy/base/inflated/prometheus/charts/kube-state-metrics/templates/serviceaccount.yaml index 553a414..63a2d08 100644 --- a/deploy/base/inflated/prometheus/charts/kube-state-metrics/templates/serviceaccount.yaml +++ b/deploy/base/inflated/prometheus/charts/kube-state-metrics/templates/serviceaccount.yaml @@ -2,15 +2,15 @@ # Source: prometheus/charts/kube-state-metrics/templates/serviceaccount.yaml apiVersion: v1 kind: ServiceAccount +automountServiceAccountToken: true metadata: labels: - helm.sh/chart: kube-state-metrics-5.8.2 + helm.sh/chart: kube-state-metrics-5.32.0 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.9.2" + app.kubernetes.io/version: "2.15.0" name: prometheus-kube-state-metrics namespace: default -imagePullSecrets: diff --git a/deploy/base/inflated/prometheus/charts/prometheus-node-exporter/templates/daemonset.yaml b/deploy/base/inflated/prometheus/charts/prometheus-node-exporter/templates/daemonset.yaml index 4cfd266..7d5e34b 100644 --- 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,18 +6,19 @@ metadata: name: prometheus-prometheus-node-exporter namespace: default labels: - helm.sh/chart: prometheus-node-exporter-4.18.1 + helm.sh/chart: prometheus-node-exporter-4.45.2 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.6.0" + app.kubernetes.io/version: "1.9.1" spec: selector: matchLabels: app.kubernetes.io/name: prometheus-node-exporter app.kubernetes.io/instance: prometheus + revisionHistoryLimit: 10 updateStrategy: rollingUpdate: maxUnavailable: 1 @@ -27,13 +28,13 @@ spec: annotations: cluster-autoscaler.kubernetes.io/safe-to-evict: "true" labels: - helm.sh/chart: prometheus-node-exporter-4.18.1 + helm.sh/chart: prometheus-node-exporter-4.45.2 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.6.0" + app.kubernetes.io/version: "1.9.1" spec: automountServiceAccountToken: false securityContext: @@ -44,7 +45,7 @@ spec: serviceAccountName: prometheus-prometheus-node-exporter containers: - name: node-exporter - image: quay.io/prometheus/node-exporter:v1.6.0 + image: quay.io/prometheus/node-exporter:v1.9.1 imagePullPolicy: IfNotPresent args: - --path.procfs=/host/proc @@ -97,6 +98,20 @@ spec: readOnly: true hostNetwork: true hostPID: true + hostIPC: false + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: eks.amazonaws.com/compute-type + operator: NotIn + values: + - fargate + - key: type + operator: NotIn + values: + - virtual-kubelet nodeSelector: kubernetes.io/os: linux tolerations: diff --git a/deploy/base/inflated/prometheus/charts/prometheus-node-exporter/templates/service.yaml b/deploy/base/inflated/prometheus/charts/prometheus-node-exporter/templates/service.yaml index d49e7bc..4f0a182 100644 --- 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.18.1 + helm.sh/chart: prometheus-node-exporter-4.45.2 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.6.0" + app.kubernetes.io/version: "1.9.1" annotations: prometheus.io/scrape: "true" spec: diff --git a/deploy/base/inflated/prometheus/charts/prometheus-node-exporter/templates/serviceaccount.yaml b/deploy/base/inflated/prometheus/charts/prometheus-node-exporter/templates/serviceaccount.yaml index 97bbd20..69e1cb5 100644 --- 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,11 @@ metadata: name: prometheus-prometheus-node-exporter namespace: default labels: - helm.sh/chart: prometheus-node-exporter-4.18.1 + helm.sh/chart: prometheus-node-exporter-4.45.2 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.6.0" + app.kubernetes.io/version: "1.9.1" +automountServiceAccountToken: false diff --git a/deploy/base/inflated/prometheus/charts/prometheus-pushgateway/templates/deployment.yaml b/deploy/base/inflated/prometheus/charts/prometheus-pushgateway/templates/deployment.yaml index f5b3655..9f5cd01 100644 --- a/deploy/base/inflated/prometheus/charts/prometheus-pushgateway/templates/deployment.yaml +++ b/deploy/base/inflated/prometheus/charts/prometheus-pushgateway/templates/deployment.yaml @@ -4,10 +4,10 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - helm.sh/chart: prometheus-pushgateway-2.4.0 + helm.sh/chart: prometheus-pushgateway-3.1.0 app.kubernetes.io/name: prometheus-pushgateway app.kubernetes.io/instance: prometheus - app.kubernetes.io/version: "v1.6.0" + app.kubernetes.io/version: "v1.11.0" app.kubernetes.io/managed-by: Helm name: prometheus-prometheus-pushgateway namespace: default @@ -22,16 +22,17 @@ spec: template: metadata: labels: - helm.sh/chart: prometheus-pushgateway-2.4.0 + helm.sh/chart: prometheus-pushgateway-3.1.0 app.kubernetes.io/name: prometheus-pushgateway app.kubernetes.io/instance: prometheus - app.kubernetes.io/version: "v1.6.0" + app.kubernetes.io/version: "v1.11.0" app.kubernetes.io/managed-by: Helm spec: serviceAccountName: prometheus-prometheus-pushgateway + automountServiceAccountToken: true containers: - name: pushgateway - image: "quay.io/prometheus/pushgateway:v1.6.0" + image: "quay.io/prometheus/pushgateway:v1.11.0" imagePullPolicy: IfNotPresent ports: - name: metrics diff --git a/deploy/base/inflated/prometheus/charts/prometheus-pushgateway/templates/service.yaml b/deploy/base/inflated/prometheus/charts/prometheus-pushgateway/templates/service.yaml index aa6cbce..c85948e 100644 --- a/deploy/base/inflated/prometheus/charts/prometheus-pushgateway/templates/service.yaml +++ b/deploy/base/inflated/prometheus/charts/prometheus-pushgateway/templates/service.yaml @@ -6,10 +6,10 @@ metadata: annotations: prometheus.io/probe: pushgateway labels: - helm.sh/chart: prometheus-pushgateway-2.4.0 + helm.sh/chart: prometheus-pushgateway-3.1.0 app.kubernetes.io/name: prometheus-pushgateway app.kubernetes.io/instance: prometheus - app.kubernetes.io/version: "v1.6.0" + app.kubernetes.io/version: "v1.11.0" app.kubernetes.io/managed-by: Helm name: prometheus-prometheus-pushgateway namespace: default diff --git a/deploy/base/inflated/prometheus/charts/prometheus-pushgateway/templates/serviceaccount.yaml b/deploy/base/inflated/prometheus/charts/prometheus-pushgateway/templates/serviceaccount.yaml index 786b4d2..a90a4ae 100644 --- a/deploy/base/inflated/prometheus/charts/prometheus-pushgateway/templates/serviceaccount.yaml +++ b/deploy/base/inflated/prometheus/charts/prometheus-pushgateway/templates/serviceaccount.yaml @@ -4,10 +4,11 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - helm.sh/chart: prometheus-pushgateway-2.4.0 + helm.sh/chart: prometheus-pushgateway-3.1.0 app.kubernetes.io/name: prometheus-pushgateway app.kubernetes.io/instance: prometheus - app.kubernetes.io/version: "v1.6.0" + app.kubernetes.io/version: "v1.11.0" app.kubernetes.io/managed-by: Helm name: prometheus-prometheus-pushgateway namespace: default +automountServiceAccountToken: true diff --git a/deploy/base/inflated/prometheus/templates/clusterrole.yaml b/deploy/base/inflated/prometheus/templates/clusterrole.yaml index b2bc5a3..2c96bd9 100644 --- a/deploy/base/inflated/prometheus/templates/clusterrole.yaml +++ b/deploy/base/inflated/prometheus/templates/clusterrole.yaml @@ -7,9 +7,8 @@ metadata: 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/version: v3.3.0 + helm.sh/chart: prometheus-27.11.0 app.kubernetes.io/part-of: prometheus name: prometheus-server rules: @@ -38,6 +37,14 @@ rules: - get - list - watch + - apiGroups: + - "discovery.k8s.io" + resources: + - endpointslices + verbs: + - get + - list + - watch - nonResourceURLs: - "/metrics" verbs: diff --git a/deploy/base/inflated/prometheus/templates/clusterrolebinding.yaml b/deploy/base/inflated/prometheus/templates/clusterrolebinding.yaml index 75a1798..3befea9 100644 --- a/deploy/base/inflated/prometheus/templates/clusterrolebinding.yaml +++ b/deploy/base/inflated/prometheus/templates/clusterrolebinding.yaml @@ -7,9 +7,8 @@ metadata: 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/version: v3.3.0 + helm.sh/chart: prometheus-27.11.0 app.kubernetes.io/part-of: prometheus name: prometheus-server subjects: diff --git a/deploy/base/inflated/prometheus/templates/cm.yaml b/deploy/base/inflated/prometheus/templates/cm.yaml index 2423fc9..635a690 100644 --- a/deploy/base/inflated/prometheus/templates/cm.yaml +++ b/deploy/base/inflated/prometheus/templates/cm.yaml @@ -7,9 +7,8 @@ metadata: 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/version: v3.3.0 + helm.sh/chart: prometheus-27.11.0 app.kubernetes.io/part-of: prometheus name: prometheus-server namespace: default @@ -48,7 +47,6 @@ data: scheme: https tls_config: ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt - insecure_skip_verify: true - bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token job_name: kubernetes-nodes kubernetes_sd_configs: @@ -66,7 +64,6 @@ data: scheme: https tls_config: ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt - insecure_skip_verify: true - bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token job_name: kubernetes-nodes-cadvisor kubernetes_sd_configs: @@ -84,7 +81,6 @@ data: scheme: https tls_config: ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt - insecure_skip_verify: true - honor_labels: true job_name: kubernetes-service-endpoints kubernetes_sd_configs: diff --git a/deploy/base/inflated/prometheus/templates/deploy.yaml b/deploy/base/inflated/prometheus/templates/deploy.yaml index ee81e1d..ba123aa 100644 --- a/deploy/base/inflated/prometheus/templates/deploy.yaml +++ b/deploy/base/inflated/prometheus/templates/deploy.yaml @@ -7,9 +7,8 @@ metadata: 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/version: v3.3.0 + helm.sh/chart: prometheus-27.11.0 app.kubernetes.io/part-of: prometheus name: prometheus-server namespace: default @@ -20,6 +19,7 @@ spec: app.kubernetes.io/name: prometheus app.kubernetes.io/instance: prometheus replicas: 1 + revisionHistoryLimit: 10 strategy: type: Recreate rollingUpdate: null @@ -29,29 +29,43 @@ spec: 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/version: v3.3.0 + helm.sh/chart: prometheus-27.11.0 app.kubernetes.io/part-of: prometheus spec: enableServiceLinks: true serviceAccountName: prometheus-server containers: - name: prometheus-server-configmap-reload - image: "quay.io/prometheus-operator/prometheus-config-reloader:v0.66.0" + image: "quay.io/prometheus-operator/prometheus-config-reloader:v0.82.0" imagePullPolicy: "IfNotPresent" args: - --watched-dir=/etc/config + - --listen-address=0.0.0.0:8080 - --reload-url=http://127.0.0.1:9090/-/reload - resources: - {} + ports: + - containerPort: 8080 + name: metrics + livenessProbe: + httpGet: + path: /healthz + port: metrics + scheme: HTTP + initialDelaySeconds: 2 + periodSeconds: 10 + readinessProbe: + httpGet: + path: /healthz + port: metrics + scheme: HTTP + periodSeconds: 10 volumeMounts: - name: config-volume mountPath: /etc/config readOnly: true - name: prometheus-server - image: "quay.io/prometheus/prometheus:v2.45.0" + image: "quay.io/prometheus/prometheus:v3.3.0" imagePullPolicy: "IfNotPresent" args: - --storage.tsdb.retention.time=15d @@ -82,8 +96,6 @@ spec: timeoutSeconds: 10 failureThreshold: 3 successThreshold: 1 - resources: - {} volumeMounts: - name: config-volume mountPath: /etc/config diff --git a/deploy/base/inflated/prometheus/templates/pvc.yaml b/deploy/base/inflated/prometheus/templates/pvc.yaml index e198fe4..ba6a986 100644 --- a/deploy/base/inflated/prometheus/templates/pvc.yaml +++ b/deploy/base/inflated/prometheus/templates/pvc.yaml @@ -7,9 +7,8 @@ metadata: 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/version: v3.3.0 + helm.sh/chart: prometheus-27.11.0 app.kubernetes.io/part-of: prometheus name: prometheus-server namespace: default diff --git a/deploy/base/inflated/prometheus/templates/service.yaml b/deploy/base/inflated/prometheus/templates/service.yaml index 1229834..5bf2daf 100644 --- a/deploy/base/inflated/prometheus/templates/service.yaml +++ b/deploy/base/inflated/prometheus/templates/service.yaml @@ -7,9 +7,8 @@ metadata: 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/version: v3.3.0 + helm.sh/chart: prometheus-27.11.0 app.kubernetes.io/part-of: prometheus name: prometheus-server namespace: default diff --git a/deploy/base/inflated/prometheus/templates/serviceaccount.yaml b/deploy/base/inflated/prometheus/templates/serviceaccount.yaml index 4faf2c3..ecf8d26 100644 --- a/deploy/base/inflated/prometheus/templates/serviceaccount.yaml +++ b/deploy/base/inflated/prometheus/templates/serviceaccount.yaml @@ -7,9 +7,8 @@ metadata: 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/version: v3.3.0 + helm.sh/chart: prometheus-27.11.0 app.kubernetes.io/part-of: prometheus name: prometheus-server namespace: default