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

dev to kube-1.28 #7205

Merged
merged 9 commits into from
Mar 26, 2024
Merged

dev to kube-1.28 #7205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1b1f5a0
Update to flannel v0.24.4
mikkeloscar Mar 25, 2024
afd8e4c
Update to Prometheus v2.51.0
mikkeloscar Mar 25, 2024
aafd663
Update kube-metrics-adapter to Kubernetes v1.27
mikkeloscar Mar 25, 2024
72d8204
Merge pull request #7201 from zalando-incubator/prometheus-v2.51.0
mikkeloscar Mar 25, 2024
efc5674
Merge dev to dev-to-kube-1.28
zalando-teapot-robot Mar 25, 2024
34770d8
Merge pull request #7202 from zalando-incubator/kube-metrics-adapter-…
szuecs Mar 25, 2024
d4397af
Merge dev to dev-to-kube-1.28
zalando-teapot-robot Mar 25, 2024
54e3c46
Merge pull request #7200 from zalando-incubator/flannel-v0.24.4
szuecs Mar 25, 2024
653d89c
Merge dev to dev-to-kube-1.28
zalando-teapot-robot Mar 25, 2024
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
2 changes: 1 addition & 1 deletion cluster/manifests/flannel/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ spec:
failureThreshold: 30
periodSeconds: 10
- name: kube-flannel
image: container-registry.zalando.net/teapot/flannel:v0.24.3-master-21
image: container-registry.zalando.net/teapot/flannel:v0.24.4-master-22
command:
- /opt/bin/flanneld
args:
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/kube-metrics-adapter/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-11-g91acacb
image: container-registry.zalando.net/teapot/kube-metrics-adapter:v0.2.2-17-gc973a9e
env:
- name: AWS_REGION
value: {{ .Cluster.Region }}
Expand Down
4 changes: 2 additions & 2 deletions cluster/manifests/prometheus/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
value: "1"
initContainers:
- name: generate-config
image: container-registry.zalando.net/library/alpine-3:3-20240226
image: container-registry.zalando.net/library/alpine-3:3-20240325
command:
- /bin/sh
args:
Expand All @@ -57,7 +57,7 @@ spec:
mountPath: /prometheus
containers:
- name: prometheus
image: container-registry.zalando.net/teapot/prometheus:v2.50.1-master-53
image: container-registry.zalando.net/teapot/prometheus:v2.51.0-master-54
args:
- "--config.file=/prometheus/prometheus.yaml"
- "--storage.tsdb.path=/prometheus/"
Expand Down