Merge branch 'master' of https://github.com/tkestack/kvass

# Conflicts: # examples/prometheus-rep-0.yaml
tkestack · Apr 21, 2021 · 103c69c · 103c69c
2 parents a3a97d0 + e4fd72b
commit 103c69c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/examples/config.yaml b/examples/config.yaml
@@ -48,7 +48,7 @@ data:
     - name: count
       rules:
       - expr: |
-          count(metrics0)
+          count(a00000000000metrics0)
         record: metrics_count
 
 
diff --git a/examples/prometheus-rep-0.yaml b/examples/prometheus-rep-0.yaml
@@ -42,7 +42,7 @@ spec:
     spec:
       containers:
         - name: thanos
-          image: thanosio/thanos:v0.16.0-rc.1
+          image: thanosio/thanos:v0.18.0
           args:
             - sidecar
             - --tsdb.path=/prometheus
@@ -134,6 +134,7 @@ spec:
         resources:
           requests:
             storage: 10Gi
+        storageClassName: cbs
         volumeMode: Filesystem
   updateStrategy:
     rollingUpdate:

diff --git a/examples/thanos-query.yaml b/examples/thanos-query.yaml
@@ -40,9 +40,15 @@ spec:
             - --grpc-address=0.0.0.0:10901
             - --http-address=0.0.0.0:9090
             - --query.partial-response
-            - --store=dnssrv+_grpc._tcp.prometheus.default.svc.cluster.local
-            - --store=dnssrv+_grpc._tcp.thanos-rule.default.svc.cluster.local
-          image: thanosio/thanos:v0.16.0-rc.1
+            - --store=dnssrv+_grpc._tcp.prometheus.$(NAMESPACE).svc.cluster.local
+            - --store=dnssrv+_grpc._tcp.thanos-rule.$(NAMESPACE).svc.cluster.local
+          image: thanosio/thanos:v0.18.0
+          env:
+            - name: NAMESPACE
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: metadata.namespace
           livenessProbe:
             failureThreshold: 4
             httpGet:

diff --git a/examples/thanos-rule.yaml b/examples/thanos-rule.yaml
@@ -45,10 +45,16 @@ spec:
             - --grpc-address=:10901
             - --http-address=:10902
             - --data-dir=/var/thanos/rule
-            - --query=dnssrv+_http._tcp.thanos-query.default.svc.cluster.local
+            - --query=dnssrv+_http._tcp.thanos-query.$(NAMESPACE).svc.cluster.local
             - --eval-interval=10s
             - --tsdb.retention=3h
-          image: thanosio/thanos:v0.16.0-rc.1
+          env:
+            - name: NAMESPACE
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: metadata.namespace
+          image: thanosio/thanos:v0.18.0
           volumeMounts:
           - mountPath: /etc/thanos/rules
             name: rules