Merge pull request #62 from stefanprodan/update-istio

Update Istio to 1.13.3
stefanprodan · Apr 26, 2022 · 992d192 · 992d192
2 parents bebefd4 + 95f0027
commit 992d192
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 21 deletions.
diff --git a/istio/operator/manifests.yaml b/istio/operator/manifests.yaml
@@ -224,7 +224,7 @@ spec:
       serviceAccountName: istio-operator
       containers:
         - name: istio-operator
-          image: docker.io/istio/operator:1.12.1
+          image: docker.io/istio/operator:1.13.3
           command:
           - operator
           - server

diff --git a/istio/system/prometheus.yaml b/istio/system/prometheus.yaml
@@ -7,7 +7,7 @@ metadata:
     component: "server"
     app: prometheus
     release: prometheus
-    chart: prometheus-14.6.1
+    chart: prometheus-15.0.1
     heritage: Helm
   name: prometheus
   namespace: istio-system
@@ -22,7 +22,7 @@ metadata:
     component: "server"
     app: prometheus
     release: prometheus
-    chart: prometheus-14.6.1
+    chart: prometheus-15.0.1
     heritage: Helm
   name: prometheus
   namespace: istio-system
@@ -122,20 +122,23 @@ data:
         - __address__
         - __meta_kubernetes_service_annotation_prometheus_io_port
         target_label: __address__
+      - action: labelmap
+        regex: __meta_kubernetes_service_annotation_prometheus_io_param_(.+)
+        replacement: __param_$1
       - action: labelmap
         regex: __meta_kubernetes_service_label_(.+)
       - action: replace
         source_labels:
         - __meta_kubernetes_namespace
-        target_label: kubernetes_namespace
+        target_label: namespace
       - action: replace
         source_labels:
         - __meta_kubernetes_service_name
-        target_label: kubernetes_name
+        target_label: service
       - action: replace
         source_labels:
         - __meta_kubernetes_pod_node_name
-        target_label: kubernetes_node
+        target_label: node
     - job_name: kubernetes-service-endpoints-slow
       kubernetes_sd_configs:
       - role: endpoints
@@ -161,20 +164,23 @@ data:
         - __address__
         - __meta_kubernetes_service_annotation_prometheus_io_port
         target_label: __address__
+      - action: labelmap
+        regex: __meta_kubernetes_service_annotation_prometheus_io_param_(.+)
+        replacement: __param_$1
       - action: labelmap
         regex: __meta_kubernetes_service_label_(.+)
       - action: replace
         source_labels:
         - __meta_kubernetes_namespace
-        target_label: kubernetes_namespace
+        target_label: namespace
       - action: replace
         source_labels:
         - __meta_kubernetes_service_name
-        target_label: kubernetes_name
+        target_label: service
       - action: replace
         source_labels:
         - __meta_kubernetes_pod_node_name
-        target_label: kubernetes_node
+        target_label: node
       scrape_interval: 5m
       scrape_timeout: 30s
     - honor_labels: true
@@ -210,10 +216,10 @@ data:
         regex: __meta_kubernetes_service_label_(.+)
       - source_labels:
         - __meta_kubernetes_namespace
-        target_label: kubernetes_namespace
+        target_label: namespace
       - source_labels:
         - __meta_kubernetes_service_name
-        target_label: kubernetes_name
+        target_label: service
     - job_name: kubernetes-pods
       kubernetes_sd_configs:
       - role: pod
@@ -239,16 +245,19 @@ data:
         - __address__
         - __meta_kubernetes_pod_annotation_prometheus_io_port
         target_label: __address__
+      - action: labelmap
+        regex: __meta_kubernetes_pod_annotation_prometheus_io_param_(.+)
+        replacement: __param_$1
       - action: labelmap
         regex: __meta_kubernetes_pod_label_(.+)
       - action: replace
         source_labels:
         - __meta_kubernetes_namespace
-        target_label: kubernetes_namespace
+        target_label: namespace
       - action: replace
         source_labels:
         - __meta_kubernetes_pod_name
-        target_label: kubernetes_pod_name
+        target_label: pod
       - action: drop
         regex: Pending|Succeeded|Failed|Completed
         source_labels:
@@ -278,16 +287,19 @@ data:
         - __address__
         - __meta_kubernetes_pod_annotation_prometheus_io_port
         target_label: __address__
+      - action: labelmap
+        regex: __meta_kubernetes_pod_annotation_prometheus_io_param_(.+)
+        replacement: __param_$1
       - action: labelmap
         regex: __meta_kubernetes_pod_label_(.+)
       - action: replace
         source_labels:
         - __meta_kubernetes_namespace
-        target_label: kubernetes_namespace
+        target_label: namespace
       - action: replace
         source_labels:
         - __meta_kubernetes_pod_name
-        target_label: kubernetes_pod_name
+        target_label: pod
       - action: drop
         regex: Pending|Succeeded|Failed|Completed
         source_labels:
@@ -307,7 +319,7 @@ metadata:
     component: "server"
     app: prometheus
     release: prometheus
-    chart: prometheus-14.6.1
+    chart: prometheus-15.0.1
     heritage: Helm
   name: prometheus
 rules:
@@ -349,7 +361,7 @@ metadata:
     component: "server"
     app: prometheus
     release: prometheus
-    chart: prometheus-14.6.1
+    chart: prometheus-15.0.1
     heritage: Helm
   name: prometheus
 subjects:
@@ -369,7 +381,7 @@ metadata:
     component: "server"
     app: prometheus
     release: prometheus
-    chart: prometheus-14.6.1
+    chart: prometheus-15.0.1
     heritage: Helm
   name: prometheus
   namespace: istio-system
@@ -394,7 +406,7 @@ metadata:
     component: "server"
     app: prometheus
     release: prometheus
-    chart: prometheus-14.6.1
+    chart: prometheus-15.0.1
     heritage: Helm
   name: prometheus
   namespace: istio-system
@@ -411,7 +423,7 @@ spec:
         component: "server"
         app: prometheus
         release: prometheus
-        chart: prometheus-14.6.1
+        chart: prometheus-15.0.1
         heritage: Helm
 
         sidecar.istio.io/inject: "false"
@@ -433,7 +445,7 @@ spec:
               readOnly: true
 
         - name: prometheus-server
-          image: "prom/prometheus:v2.26.0"
+          image: "prom/prometheus:v2.31.1"
           imagePullPolicy: "IfNotPresent"
           args:
             - --storage.tsdb.retention.time=15d
@@ -448,6 +460,7 @@ spec:
             httpGet:
               path: /-/ready
               port: 9090
+              scheme: HTTP
             initialDelaySeconds: 0
             periodSeconds: 5
             timeoutSeconds: 4
@@ -457,6 +470,7 @@ spec:
             httpGet:
               path: /-/healthy
               port: 9090
+              scheme: HTTP
             initialDelaySeconds: 30
             periodSeconds: 15
             timeoutSeconds: 10