Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

alpha to beta #5861

Merged
merged 16 commits into from
Mar 23, 2023
Merged

alpha to beta #5861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
fd2a075
Remove cronjob-monitor
mikkeloscar Mar 21, 2023
ef16c6c
Merge pull request #5851 from zalando-incubator/drop-cronjob-monitor
mikkeloscar Mar 21, 2023
249647e
Merge dev to dev-to-alpha
zalando-teapot-robot Mar 21, 2023
7c0a1c0
Run cronjob-monitor cleanup in post-apply
mikkeloscar Mar 22, 2023
b8d3ec3
Merge pull request #5857 from zalando-incubator/cronjob-monitor-clean…
mikkeloscar Mar 22, 2023
21a66f5
Update to metrics-server v0.6.3
mikkeloscar Mar 22, 2023
28d3ac4
Update to Prometheus v2.43.0
mikkeloscar Mar 22, 2023
6997083
Merge dev to dev-to-alpha
zalando-teapot-robot Mar 22, 2023
4abab54
update deployment-service to not fail on special characters in source…
linki Mar 22, 2023
a36aff4
Merge pull request #5859 from zalando-incubator/deployment-service-up…
mikkeloscar Mar 22, 2023
b144319
Merge dev to dev-to-alpha
zalando-teapot-robot Mar 22, 2023
13828aa
Merge pull request #5856 from zalando-incubator/metrics-server-v0.6.3
mikkeloscar Mar 22, 2023
842da65
Merge pull request #5855 from zalando-incubator/prometheus-v2.43.0
mikkeloscar Mar 22, 2023
e1396d5
Merge dev to dev-to-alpha
zalando-teapot-robot Mar 22, 2023
4eea892
Merge pull request #5852 from zalando-incubator/dev-to-alpha
mikkeloscar Mar 23, 2023
17eb683
Merge alpha to alpha-to-beta
zalando-teapot-robot Mar 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 0 additions & 37 deletions cluster/manifests/cronjob-monitor/deployment.yaml
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions cluster/manifests/cronjob-monitor/rbac.yaml
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions cluster/manifests/cronjob-monitor/vpa.yaml
View file
Open in desktop

This file was deleted.

13 changes: 13 additions & 0 deletions cluster/manifests/deletions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/deployment-service/controller-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/deployment-service/status-service-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{ $image := "container-registry.zalando.net/teapot/deployment-status-service" }}
{{ $version := "master-118" }}
{{ $version := "master-123" }}

apiVersion: apps/v1
kind: Deployment
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/metrics-server/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions cluster/manifests/prometheus/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ metadata:
labels:
application: kubernetes
component: prometheus
version: v2.41.0
{{- if ne .ConfigItems.prometheus_csi_ebs "true" }}
name: prometheus
{{- else }}
Expand All @@ -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}}"
Expand All @@ -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:
Expand All @@ -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/"
Expand Down