Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev: bump prometheus to 2.31.1 #1237

Merged
merged 3 commits into from
Nov 29, 2021

Conversation

mayocream
Copy link
Member

@mayocream mayocream commented Nov 24, 2021

ref: #1224
diff with https://github.com/prometheus-operator/kube-prometheus/blob/0a5b89954a2c6d2ced4ca79c2a24bd094e7c9247/manifests/prometheus-prometheus.yaml

diff --git a/manifests/infra/prometheus/base/prometheus.yaml b/manifests/infra/prometheus/base/prometheus.yaml
index b6ef5b78..09d770b2 100644
--- a/manifests/infra/prometheus/base/prometheus.yaml
+++ b/manifests/infra/prometheus/base/prometheus.yaml
@@ -118,7 +118,7 @@ metadata:
     app.kubernetes.io/component: prometheus
     app.kubernetes.io/name: prometheus
     app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 2.26.0
+    app.kubernetes.io/version: 2.31.1
     prometheus: k8s
   name: k8s
   namespace: monitoring
@@ -129,8 +129,9 @@ spec:
       name: alertmanager-main
       namespace: monitoring
       port: web
+  enableFeatures: []
   externalLabels: {}
-  image: quay.io/prometheus/prometheus:v2.26.0
+  image: quay.io/prometheus/prometheus:v2.31.1
   nodeSelector:
     kubernetes.io/os: linux
   podMetadata:
@@ -138,7 +139,8 @@ spec:
       app.kubernetes.io/component: prometheus
       app.kubernetes.io/name: prometheus
       app.kubernetes.io/part-of: kube-prometheus
-      app.kubernetes.io/version: 2.26.0
+      app.kubernetes.io/version: 2.31.1
+      prometheus: k8s
   podMonitorNamespaceSelector: {}
   podMonitorSelector: {}
   probeNamespaceSelector: {}
@@ -147,10 +149,8 @@ spec:
   resources:
     requests:
       memory: 400Mi
-  ruleSelector:
-    matchLabels:
-      prometheus: k8s
-      role: alert-rules
+  ruleNamespaceSelector: {}
+  ruleSelector: {}
   securityContext:
     fsGroup: 2000
     runAsNonRoot: true
@@ -158,7 +158,7 @@ spec:
   serviceAccountName: prometheus-k8s
   serviceMonitorNamespaceSelector: {}
   serviceMonitorSelector: {}
-  version: 2.26.0
+  version: 2.31.1
 ---
 # prometheus-service.yaml
 apiVersion: v1

@inductor
Copy link
Member

Hi, could you check about compatibility about this one too?

@mayocream
Copy link
Member Author

2.29.0 / 2021-08-11

[CHANGE] Promote --storage.tsdb.allow-overlapping-blocks flag to stable. #9117
[CHANGE] Promote --storage.tsdb.retention.size flag to stable. #9004

2.27.0 / 2021-05-12

[CHANGE] Remote write: Metric prometheus_remote_storage_samples_bytes_total renamed to prometheus_remote_storage_bytes_total. #8296

互換性に影響がないみたい。

@inductor

@inductor inductor merged commit fe5c048 into cloudnativedaysjp:main Nov 29, 2021
@inductor
Copy link
Member

@mayocream Please validate the changes on staging and then make a PR for production too.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants