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

kube-1.26 to alpha #7059

Merged
merged 13 commits into from
Feb 23, 2024
Merged

kube-1.26 to alpha #7059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0b3cc7b
Update to Karpenter v0.34.1
mikkeloscar Feb 21, 2024
a1735bd
stackset: Fix HPA e2e test for all Kubernetes versions
mikkeloscar Feb 23, 2024
909751f
Update skipper main fleet version
Feb 23, 2024
9da5202
Merge pull request #7034 from zalando-incubator/karpenter-v0.34.1
demonCoder95 Feb 23, 2024
0e9a1c4
Merge dev to dev-to-kube-1.26
zalando-teapot-robot Feb 23, 2024
3a5dac8
Merge pull request #7053 from zalando-incubator/stackset-fix-hpa-test
szuecs Feb 23, 2024
fee3fab
Merge dev to dev-to-kube-1.26
zalando-teapot-robot Feb 23, 2024
70575eb
Merge pull request #7052 from zalando-incubator/skipper/update-main-f…
RomanZavodskikh Feb 23, 2024
0654c7f
Merge pull request #7058 from zalando-incubator/dev-to-kube-1.26
mikkeloscar Feb 23, 2024
0997a3d
Merge kube-1.26 to kube-1.26-to-alpha
zalando-teapot-robot Feb 23, 2024
59fcec3
Merge dev to dev-to-kube-1.26
zalando-teapot-robot Feb 23, 2024
448df81
Merge pull request #7060 from zalando-incubator/dev-to-kube-1.26
mikkeloscar Feb 23, 2024
9cec91b
Merge kube-1.26 to kube-1.26-to-alpha
zalando-teapot-robot Feb 23, 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/skipper/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{ $internal_version := "v0.20.5-813" }}
{{ $internal_version := "v0.20.15-824" }}
{{ $canary_internal_version := "v0.20.15-824" }}

{{/* Optional canary arguments separated by "[cf724afc]" to allow whitespaces, e.g. "-foo=has a whitespace[cf724afc]-baz=qux" */}}
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/stackset-controller/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{ $version := "v1.4.40" }}
{{ $version := "v1.4.41" }}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/z-karpenter/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ spec:
drop:
- ALL
readOnlyRootFilesystem: true
image: "container-registry.zalando.net/teapot/karpenter:v0.33.1-main-17.custom"
image: "container-registry.zalando.net/teapot/karpenter:v0.34.1-main-18.custom"
imagePullPolicy: IfNotPresent
env:
- name: ASSUME_ROLE_DURATION
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/stackset/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.22

toolchain go1.22.0

require github.com/zalando-incubator/stackset-controller v1.4.40
require github.com/zalando-incubator/stackset-controller v1.4.41

require (
github.com/beorn7/perks v1.0.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/stackset/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,8 +506,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
github.com/zalando-incubator/stackset-controller v1.4.40 h1:NprdPk+hX3fPk6T/FHlvdZKoykObzwjYwgFThj9FG34=
github.com/zalando-incubator/stackset-controller v1.4.40/go.mod h1:cs6DeHcxl4xAAXl5pK1oAoxjKbmp10PBLKqYqw21VxI=
github.com/zalando-incubator/stackset-controller v1.4.41 h1:SqXCehy3gTc0RXvEwWwuufwR1Wh9jKz+lS6IwRxHpyY=
github.com/zalando-incubator/stackset-controller v1.4.41/go.mod h1:cs6DeHcxl4xAAXl5pK1oAoxjKbmp10PBLKqYqw21VxI=
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A=
Expand Down