From fd2a075536c9b374b82567e7e47eefb35e653b0b Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Larsen Date: Tue, 21 Mar 2023 10:13:53 +0100 Subject: [PATCH 1/5] Remove cronjob-monitor Signed-off-by: Mikkel Oscar Lyderik Larsen --- .../manifests/cronjob-monitor/deployment.yaml | 37 ------------------- cluster/manifests/cronjob-monitor/rbac.yaml | 30 --------------- cluster/manifests/cronjob-monitor/vpa.yaml | 20 ---------- cluster/manifests/deletions.yaml | 13 +++++++ 4 files changed, 13 insertions(+), 87 deletions(-) delete mode 100644 cluster/manifests/cronjob-monitor/deployment.yaml delete mode 100644 cluster/manifests/cronjob-monitor/rbac.yaml delete mode 100644 cluster/manifests/cronjob-monitor/vpa.yaml diff --git a/cluster/manifests/cronjob-monitor/deployment.yaml b/cluster/manifests/cronjob-monitor/deployment.yaml deleted file mode 100644 index 062896de7b..0000000000 --- a/cluster/manifests/cronjob-monitor/deployment.yaml +++ /dev/null @@ -1,37 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: cronjob-monitor - namespace: kube-system - labels: - application: kubernetes - component: cronjob-monitor -spec: - replicas: 1 - selector: - matchLabels: - deployment: cronjob-monitor - template: - metadata: - labels: - deployment: cronjob-monitor - application: kubernetes - component: cronjob-monitor - annotations: - logging/destination: "{{.Cluster.ConfigItems.log_destination_infra}}" - spec: - dnsConfig: - options: - - name: ndots - value: "1" - serviceAccountName: cronjob-monitor - containers: - - name: cronjob-monitor - image: "container-registry.zalando.net/teapot/cronjob-monitor:master-8" - resources: - limits: - cpu: 5m - memory: 4Gi - requests: - cpu: 5m - memory: 4Gi diff --git a/cluster/manifests/cronjob-monitor/rbac.yaml b/cluster/manifests/cronjob-monitor/rbac.yaml deleted file mode 100644 index 6b1153e398..0000000000 --- a/cluster/manifests/cronjob-monitor/rbac.yaml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - name: cronjob-monitor - namespace: kube-system ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: cronjob-monitor -rules: -- apiGroups: ["batch"] - resources: ["cronjobs"] - verbs: ["get", "list", "watch", "patch", "update"] -- apiGroups: ["batch"] - resources: ["jobs"] - verbs: ["get", "list", "watch"] ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: cronjob-monitor -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: cronjob-monitor -subjects: -- kind: ServiceAccount - name: cronjob-monitor - namespace: kube-system diff --git a/cluster/manifests/cronjob-monitor/vpa.yaml b/cluster/manifests/cronjob-monitor/vpa.yaml deleted file mode 100644 index a6d896712a..0000000000 --- a/cluster/manifests/cronjob-monitor/vpa.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: autoscaling.k8s.io/v1beta2 -kind: VerticalPodAutoscaler -metadata: - name: cronjob-monitor - namespace: kube-system - labels: - application: kubernetes - component: cronjob-monitor -spec: - targetRef: - apiVersion: apps/v1 - kind: Deployment - name: cronjob-monitor - updatePolicy: - updateMode: Auto - resourcePolicy: - containerPolicies: - - containerName: cronjob-monitor - maxAllowed: - memory: 4Gi diff --git a/cluster/manifests/deletions.yaml b/cluster/manifests/deletions.yaml index 87a5c8a111..9c2b3e340a 100644 --- 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: VerticalPodAutoscaler +- name: cronjob-monitor + namespace: kube-system + kind: Deployment # everything defined under here will be deleted after applying the manifests post_apply: +- 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 From 7c0a1c0f27a0769fcc9eef827ef795a577c8ad80 Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Larsen Date: Wed, 22 Mar 2023 14:37:45 +0100 Subject: [PATCH 2/5] Run cronjob-monitor cleanup in post-apply Signed-off-by: Mikkel Oscar Lyderik Larsen --- cluster/manifests/deletions.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cluster/manifests/deletions.yaml b/cluster/manifests/deletions.yaml index 9c2b3e340a..31f973e709 100644 --- a/cluster/manifests/deletions.yaml +++ b/cluster/manifests/deletions.yaml @@ -4,15 +4,15 @@ pre_apply: - name: "routegroup-admitter.teapot.zalan.do" kind: ValidatingWebhookConfiguration {{ end }} -- name: cronjob-monitor - namespace: kube-system - kind: VerticalPodAutoscaler - 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 From 21a66f58480315f7081a7d3f750a176bef6a1c33 Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Larsen Date: Wed, 22 Mar 2023 11:33:20 +0100 Subject: [PATCH 3/5] Update to metrics-server v0.6.3 https://github.com/kubernetes-sigs/metrics-server/releases/tag/v0.6.3 Signed-off-by: Mikkel Oscar Lyderik Larsen --- cluster/manifests/metrics-server/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/manifests/metrics-server/deployment.yaml b/cluster/manifests/metrics-server/deployment.yaml index 360bd04232..234be9325e 100644 --- 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 From 28d3ac4cb60db0309ae9485fce3323a130ed8b50 Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Larsen Date: Wed, 22 Mar 2023 11:29:24 +0100 Subject: [PATCH 4/5] Update to Prometheus v2.43.0 https://github.com/prometheus/prometheus/releases/tag/v2.42.0 https://github.com/prometheus/prometheus/releases/tag/v2.43.0 Signed-off-by: Mikkel Oscar Lyderik Larsen --- cluster/manifests/prometheus/statefulset.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cluster/manifests/prometheus/statefulset.yaml b/cluster/manifests/prometheus/statefulset.yaml index f149ddc06d..fd7b7c3e64 100644 --- 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/" From 4abab545791719ec85e9944d4f29123934ed3796 Mon Sep 17 00:00:00 2001 From: Martin Linkhorst Date: Wed, 22 Mar 2023 15:18:45 +0100 Subject: [PATCH 5/5] update deployment-service to not fail on special characters in source information --- .../manifests/deployment-service/controller-statefulset.yaml | 2 +- .../manifests/deployment-service/status-service-deployment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/manifests/deployment-service/controller-statefulset.yaml b/cluster/manifests/deployment-service/controller-statefulset.yaml index a7f102e3d0..429468ecb0 100644 --- 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 index 8b3765c9d2..7fd39c6a63 100644 --- 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