Merge pull request #7047 from zalando-incubator/dev-to-kube-1.26

dev to kube-1.26

Author: mikkeloscar

cluster/manifests/prometheus/configmap.yaml

@@ -14,6 +14,11 @@ data:
       - record: job:skipper_code_by_host:sum
         expr: sum(rate(skipper_serve_host_count{application="skipper-ingress"}[1m])) by (code)
 
+    - name: skipper max custom gauge lifo/fifo by version
+      rules:
+      - record: job:skipper_fifo_by_key:max
+        expr: max by (version) (skipper_custom_gauges{key =~ "^[fl]ifo[.].+[.]active$"} > 0)
+
     - name: skipper sum custom gauge by key
       rules:
       - record: job:skipper_custom_gauge_by_key:sum

cluster/node-pools/master-default/userdata.yaml

@@ -202,7 +202,7 @@ write_files:
             limits:
               memory: {{ .Values.InstanceInfo.MemoryFraction (parseInt64 .Cluster.ConfigItems.apiserver_memory_limit_percent)}}
 {{- end }}
-        - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller:master-195
+        - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller:master-196
           name: admission-controller
           lifecycle:
             preStop: