Merge beta to beta-to-stable

zalando-incubator · Mar 23, 2023 · 6d11a5b · 6d11a5b
2 parents 45c43a8 + c8f840c
commit 6d11a5b
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 94 deletions.
diff --git a/cluster/manifests/cronjob-monitor/deployment.yaml b/cluster/manifests/cronjob-monitor/deployment.yaml
diff --git a/cluster/manifests/cronjob-monitor/rbac.yaml b/cluster/manifests/cronjob-monitor/rbac.yaml
diff --git a/cluster/manifests/cronjob-monitor/vpa.yaml b/cluster/manifests/cronjob-monitor/vpa.yaml
diff --git a/cluster/manifests/deletions.yaml b/cluster/manifests/deletions.yaml
@@ -4,9 +4,22 @@ pre_apply:
 - name: "routegroup-admitter.teapot.zalan.do"
   kind: ValidatingWebhookConfiguration
 {{ end }}
+- name: cronjob-monitor
+  namespace: kube-system
+  kind: Deployment
 
 # everything defined under here will be deleted after applying the manifests
 post_apply:
+- name: cronjob-monitor
+  namespace: kube-system
+  kind: VerticalPodAutoscaler
+- name: cronjob-monitor
+  kind: ClusterRole
+- name: cronjob-monitor
+  kind: ClusterRoleBinding
+- name: cronjob-monitor
+  namespace: kube-system
+  kind: ServiceAccount
 {{ if eq .ConfigItems.teapot_admission_controller_process_resources "true" }}
 - name: limits
   namespace: default

diff --git a/cluster/manifests/deployment-service/controller-statefulset.yaml b/cluster/manifests/deployment-service/controller-statefulset.yaml
@@ -29,7 +29,7 @@ spec:
       terminationGracePeriodSeconds: 300
       containers:
         - name: "deployment-service-controller"
-          image: "container-registry.zalando.net/teapot/deployment-controller:master-118"
+          image: "container-registry.zalando.net/teapot/deployment-controller:master-123"
           args:
             - "--config-namespace=kube-system"
           env:

diff --git a/cluster/manifests/deployment-service/status-service-deployment.yaml b/cluster/manifests/deployment-service/status-service-deployment.yaml
@@ -1,5 +1,5 @@
 {{ $image   := "container-registry.zalando.net/teapot/deployment-status-service" }}
-{{ $version := "master-118" }}
+{{ $version := "master-123" }}
 
 apiVersion: apps/v1
 kind: Deployment

diff --git a/cluster/manifests/metrics-server/deployment.yaml b/cluster/manifests/metrics-server/deployment.yaml
@@ -28,7 +28,7 @@ spec:
       serviceAccountName: metrics-server
       containers:
       - name: metrics-server
-        image: container-registry.zalando.net/teapot/metrics-server:v0.6.2-master-13
+        image: container-registry.zalando.net/teapot/metrics-server:v0.6.3-master-14
         args:
         - --cert-dir=/tmp
         - --secure-port=4443

diff --git a/cluster/manifests/prometheus/statefulset.yaml b/cluster/manifests/prometheus/statefulset.yaml
@@ -6,7 +6,6 @@ metadata:
   labels:
     application: kubernetes
     component: prometheus
-    version: v2.41.0
 {{- if ne .ConfigItems.prometheus_csi_ebs "true" }}
   name: prometheus
 {{- else }}
@@ -26,7 +25,6 @@ spec:
         statefulset: prometheus
         application: kubernetes
         component: prometheus
-        version: v2.41.0
       annotations:
         config/hash: {{"configmap.yaml" | manifestHash}}
         logging/destination: "{{.Cluster.ConfigItems.log_destination_infra}}"
@@ -41,7 +39,7 @@ spec:
           value: "1"
       initContainers:
       - name: generate-config
-        image: container-registry.zalando.net/library/alpine-3:3-20230102
+        image: container-registry.zalando.net/library/alpine-3:3-20230320
         command:
         - /bin/sh
         args:
@@ -63,7 +61,7 @@ spec:
           mountPath: /prometheus
       containers:
       - name: prometheus
-        image: container-registry.zalando.net/teapot/prometheus:v2.41.0-master-43
+        image: container-registry.zalando.net/teapot/prometheus:v2.43.0-master-45
         args:
         - "--config.file=/prometheus/prometheus.yaml"
         - "--storage.tsdb.path=/prometheus/"