Merge pull request #7516 from zalando-incubator/dev-to-stable

dev to stable
zalando-incubator · May 15, 2024 · 44b81ef · 44b81ef
2 parents d227aa0 + ed68f45
commit 44b81ef
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 32 deletions.
diff --git a/cluster/manifests/02-kube-aws-iam-controller/deployment.yaml b/cluster/manifests/02-kube-aws-iam-controller/deployment.yaml
@@ -27,7 +27,7 @@ spec:
       hostNetwork: true
       containers:
       - name: kube-aws-iam-controller
-        image: container-registry.zalando.net/teapot/kube-aws-iam-controller:v0.3.0-2-g5f9bcc0
+        image: container-registry.zalando.net/teapot/kube-aws-iam-controller:v0.3.0-4-g21debb6
         args:
         - --debug
         - "--assume-role={{.Cluster.LocalID}}-worker"

diff --git a/cluster/manifests/deletions.yaml b/cluster/manifests/deletions.yaml
@@ -287,3 +287,7 @@ post_apply:
 - name: skipper-ingress
   kind: ClusterRoleBinding
   namespace: kube-system
+
+- name: prometheus
+  kind: Ingress
+  namespace: kube-system
diff --git a/cluster/manifests/deployment-service/status-service-ingress.yaml b/cluster/manifests/deployment-service/status-service-ingress.yaml
@@ -17,3 +17,12 @@ spec:
                 port:
                   name: http
             pathType: ImplementationSpecific
+    - host: "deployment-status-service-{{.Cluster.Alias}}.{{.Values.hosted_zone}}"
+      http:
+        paths:
+          - backend:
+              service:
+                name: "deployment-service-status-service"
+                port:
+                  name: http
+            pathType: ImplementationSpecific
diff --git a/cluster/manifests/event-logger/statefulset.yaml b/cluster/manifests/event-logger/statefulset.yaml
@@ -30,7 +30,7 @@ spec:
       serviceAccountName: kubernetes-event-logger
       containers:
       - name: logger
-        image: container-registry.zalando.net/teapot/event-logger:master-12
+        image: container-registry.zalando.net/teapot/event-logger:master-13
         args:
             - --snapshot-namespace=kube-system
             - --snapshot-name=kubernetes-event-logger

diff --git a/cluster/manifests/kube-metrics-adapter/deployment.yaml b/cluster/manifests/kube-metrics-adapter/deployment.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: custom-metrics-apiserver
       containers:
       - name: kube-metrics-adapter
-        image: container-registry.zalando.net/teapot/kube-metrics-adapter:v0.2.2-35-gdcedc0c
+        image: container-registry.zalando.net/teapot/kube-metrics-adapter:v0.2.2-46-gf55afc0
         env:
         - name: AWS_REGION
           value: {{ .Cluster.Region }}

diff --git a/cluster/manifests/kube-node-ready-controller/daemonset.yaml b/cluster/manifests/kube-node-ready-controller/daemonset.yaml
@@ -36,7 +36,7 @@ spec:
         effect: NoSchedule
       containers:
       - name: controller
-        image: container-registry.zalando.net/teapot/kube-node-ready-controller:master-24
+        image: container-registry.zalando.net/teapot/kube-node-ready-controller:master-25
         resources:
           requests:
             cpu: {{.Cluster.ConfigItems.kube_node_ready_controller_cpu}}

diff --git a/cluster/manifests/kubernetes-lifecycle-metrics/deployment.yaml b/cluster/manifests/kubernetes-lifecycle-metrics/deployment.yaml
@@ -31,7 +31,7 @@ spec:
       serviceAccountName: kubernetes-lifecycle-metrics
       containers:
         - name: kubernetes-lifecycle-metrics
-          image: "container-registry.zalando.net/teapot/kubernetes-lifecycle-metrics:master-17"
+          image: "container-registry.zalando.net/teapot/kubernetes-lifecycle-metrics:master-18"
           ports:
             - containerPort: 9090
               protocol: TCP

diff --git a/cluster/manifests/prometheus/ingress.yaml b/cluster/manifests/prometheus/ingress.yaml
@@ -1,27 +1,3 @@
-# TODO: Remove
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: prometheus
-  namespace: kube-system
-  annotations:
-    zalando.org/skipper-filter: |
-      oauthTokeninfoAnyKV("realm", "/employees", "realm", "/services")
-  labels:
-    application: kubernetes
-    component: prometheus
-spec:
-  rules:
-    - host: system-prometheus.{{ .Values.hosted_zone }}
-      http:
-        paths:
-          - backend:
-              service:
-                name: prometheus
-                port:
-                  number: 80
-            pathType: ImplementationSpecific
----
 apiVersion: zalando.org/v1
 kind: RouteGroup
 metadata:
@@ -43,7 +19,7 @@ spec:
   routes:
     - pathSubtree: /
       predicates:
-        - HeaderRegexp("Authorization", "Bearer .+")
+        - HeaderRegexp("Authorization", "^Bearer .+")
       filters:
         - oauthTokeninfoAnyKV("realm", "/employees", "realm", "/services")
 

diff --git a/cluster/manifests/skipper/deployment.yaml b/cluster/manifests/skipper/deployment.yaml
@@ -1,5 +1,5 @@
 {{ $internal_version := "v0.21.86-915" }}
-{{ $canary_internal_version := "v0.21.86-915" }}
+{{ $canary_internal_version := "v0.21.91-921" }}
 
 {{/* Optional canary arguments separated by "[cf724afc]" to allow whitespaces, e.g. "-foo=has a whitespace[cf724afc]-baz=qux" */}}
 {{ $canary_args := "" }}

diff --git a/cluster/node-pools/master-default/userdata.yaml b/cluster/node-pools/master-default/userdata.yaml
@@ -271,7 +271,7 @@ write_files:
             - mountPath: /etc/kubernetes/ssl
               name: ssl-certs-kubernetes
               readOnly: true
-        - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/k8s-authnz-webhook:master-132
+        - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/k8s-authnz-webhook:master-133
           name: webhook
           ports:
           - containerPort: 8081