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.

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.28 to alpha #7228

Merged
merged 27 commits into from
Apr 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
b37df52
Update to Kubernetes v1.28
mikkeloscar Feb 19, 2024
efc5674
Merge dev to dev-to-kube-1.28
zalando-teapot-robot Mar 25, 2024
d4397af
Merge dev to dev-to-kube-1.28
zalando-teapot-robot Mar 25, 2024
653d89c
Merge dev to dev-to-kube-1.28
zalando-teapot-robot Mar 25, 2024
8815dd7
Merge pull request #7205 from zalando-incubator/dev-to-kube-1.28
szuecs Mar 26, 2024
627e923
Merge dev to dev-to-kube-1.28
zalando-teapot-robot Mar 26, 2024
a0d9930
Update skipper version, step 2/2
Mar 26, 2024
6481c43
Merge pull request #7209 from zalando-incubator/dev-to-kube-1.28
gargravarr Mar 26, 2024
e8f2e4e
Merge dev to dev-to-kube-1.28
zalando-teapot-robot Mar 26, 2024
e7acbad
Merge dev to dev-to-kube-1.28
zalando-teapot-robot Mar 26, 2024
51a4c04
Merge pull request #7215 from zalando-incubator/dev-to-kube-1.28
mikkeloscar Mar 26, 2024
e677513
Merge dev to dev-to-kube-1.28
zalando-teapot-robot Mar 26, 2024
4eeef08
Merge dev to dev-to-kube-1.28
zalando-teapot-robot Mar 27, 2024
6a5d14d
Merge dev to dev-to-kube-1.28
zalando-teapot-robot Mar 27, 2024
a171473
Merge pull request #7217 from zalando-incubator/dev-to-kube-1.28
gargravarr Mar 27, 2024
356891e
Merge dev to dev-to-kube-1.28
zalando-teapot-robot Mar 27, 2024
3f9b70d
Merge dev to dev-to-kube-1.28
zalando-teapot-robot Mar 27, 2024
e40726d
Merge dev to dev-to-kube-1.28
zalando-teapot-robot Mar 27, 2024
12fc26a
Merge pull request #7223 from zalando-incubator/dev-to-kube-1.28
szuecs Mar 28, 2024
402def1
Merge kube-1.28 to kube-1.28-to-alpha
zalando-teapot-robot Mar 28, 2024
fa5ad8f
Update VPA CRD
mikkeloscar Apr 1, 2024
b7903f4
Merge pull request #7230 from zalando-incubator/update-vpa-crd
katyanna Apr 2, 2024
76c20fb
Merge dev to dev-to-kube-1.28
zalando-teapot-robot Apr 2, 2024
cc090cc
Merge pull request #7213 from zalando-incubator/skipper/update-main-f…
katyanna Apr 2, 2024
c1fc45e
Merge dev to dev-to-kube-1.28
zalando-teapot-robot Apr 2, 2024
b66099b
Merge pull request #7231 from zalando-incubator/dev-to-kube-1.28
katyanna Apr 2, 2024
b9d67ec
Merge kube-1.28 to kube-1.28-to-alpha
zalando-teapot-robot Apr 2, 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
8 changes: 4 additions & 4 deletions cluster/config-defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -681,14 +681,14 @@ tracing_coredns_local_zone_traces_endpoint: ""
# AMI id given the image name and the Image AWS account owner.
#
# [0]: https://github.com/zalando-incubator/cluster-lifecycle-manager/blob/8a9bd1cb2d094038a9e23e646421f8146b48886a/provisioner/template.go#L116
kuberuntu_image_v1_26_focal_amd64: {{ amiID "zalando-ubuntu-focal-20.04-kubernetes-production-v1.26.14-amd64-master-317" "861068367966" }}
kuberuntu_image_v1_26_focal_arm64: {{ amiID "zalando-ubuntu-focal-20.04-kubernetes-production-v1.26.14-arm64-master-317" "861068367966" }}
kuberuntu_image_v1_26_jammy_amd64: {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-production-v1.26.14-amd64-master-317" "861068367966" }}
kuberuntu_image_v1_26_jammy_arm64: {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-production-v1.26.14-arm64-master-317" "861068367966" }}
kuberuntu_image_v1_27_focal_amd64: {{ amiID "zalando-ubuntu-focal-20.04-kubernetes-production-v1.27.12-amd64-master-321" "861068367966" }}
kuberuntu_image_v1_27_focal_arm64: {{ amiID "zalando-ubuntu-focal-20.04-kubernetes-production-v1.27.12-arm64-master-321" "861068367966" }}
kuberuntu_image_v1_27_jammy_amd64: {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-production-v1.27.12-amd64-master-321" "861068367966" }}
kuberuntu_image_v1_27_jammy_arm64: {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-production-v1.27.12-arm64-master-321" "861068367966" }}
kuberuntu_image_v1_28_focal_amd64: {{ amiID "zalando-ubuntu-focal-20.04-kubernetes-production-v1.28.8-amd64-master-321" "861068367966" }}
kuberuntu_image_v1_28_focal_arm64: {{ amiID "zalando-ubuntu-focal-20.04-kubernetes-production-v1.28.8-arm64-master-321" "861068367966" }}
kuberuntu_image_v1_28_jammy_amd64: {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-production-v1.28.8-amd64-master-321" "861068367966" }}
kuberuntu_image_v1_28_jammy_arm64: {{ amiID "zalando-ubuntu-jammy-22.04-kubernetes-production-v1.28.8-arm64-master-321" "861068367966" }}

# Which distro from the previous config items should be used. Valid options are `focal` and `jammy`. Can be set for each node pool.
{{if eq .Cluster.Environment "test"}}
Expand Down
73 changes: 51 additions & 22 deletions cluster/manifests/01-vertical-pod-autoscaler/01-crd.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
api-approved.kubernetes.io: https://github.com/kubernetes/kubernetes/pull/63797
controller-gen.kubebuilder.io/version: v0.4.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: verticalpodautoscalercheckpoints.autoscaling.k8s.io
spec:
Expand Down Expand Up @@ -36,7 +37,7 @@ spec:
metadata:
type: object
spec:
description: 'Specification of the checkpoint. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status.'
description: 'Specification of the checkpoint. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status.'
properties:
containerName:
description: Name of the checkpointed container.
Expand Down Expand Up @@ -129,7 +130,7 @@ spec:
metadata:
type: object
spec:
description: 'Specification of the checkpoint. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status.'
description: 'Specification of the checkpoint. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status.'
properties:
containerName:
description: Name of the checkpointed container.
Expand Down Expand Up @@ -203,19 +204,13 @@ spec:
type: object
served: true
storage: false
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
api-approved.kubernetes.io: https://github.com/kubernetes/kubernetes/pull/63797
controller-gen.kubebuilder.io/version: v0.4.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: verticalpodautoscalers.autoscaling.k8s.io
spec:
Expand Down Expand Up @@ -266,7 +261,7 @@ spec:
type: object
spec:
description: 'Specification of the behavior of the autoscaler. More info:
https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status.'
https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status.'
properties:
recommenders:
description: Recommender responsible for generating recommendation
Expand Down Expand Up @@ -369,7 +364,7 @@ spec:
description: API version of the referent
type: string
kind:
description: 'Kind of the referent; More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"'
description: 'Kind of the referent; More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
name:
description: 'Name of the referent; More info: http://kubernetes.io/docs/user-guide/identifiers#names'
Expand All @@ -378,11 +373,45 @@ spec:
- kind
- name
type: object
x-kubernetes-map-type: atomic
updatePolicy:
description: Describes the rules on how changes are applied to the
pods. If not specified, all fields in the `PodUpdatePolicy` are
set to their default values.
properties:
evictionRequirements:
description: EvictionRequirements is a list of EvictionRequirements
that need to evaluate to true in order for a Pod to be evicted.
If more than one EvictionRequirement is specified, all of them
need to be fulfilled to allow eviction.
items:
description: EvictionRequirement defines a single condition
which needs to be true in order to evict a Pod
properties:
changeRequirement:
description: EvictionChangeRequirement refers to the relationship
between the new target recommendation for a Pod and its
current requests, what kind of change is necessary for
the Pod to be evicted
enum:
- TargetHigherThanRequests
- TargetLowerThanRequests
type: string
resource:
description: Resources is a list of one or more resources
that the condition applies to. If more than one resource
is given, the EvictionRequirement is fulfilled if at least
one resource meets `changeRequirement`.
items:
description: ResourceName is the name identifying various
resources in a ResourceList.
type: string
type: array
required:
- changeRequirement
- resource
type: object
type: array
minReplicas:
description: Minimal number of replicas which need to be alive
for Updater to attempt pod eviction (pending other checks like
Expand Down Expand Up @@ -517,8 +546,11 @@ spec:
type: object
served: true
storage: true
subresources: {}
- name: v1beta2
subresources:
status: {}
- deprecated: true
deprecationWarning: autoscaling.k8s.io/v1beta2 API is deprecated
name: v1beta2
schema:
openAPIV3Schema:
description: VerticalPodAutoscaler is the configuration for a vertical pod
Expand All @@ -539,7 +571,7 @@ spec:
type: object
spec:
description: 'Specification of the behavior of the autoscaler. More info:
https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status.'
https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status.'
properties:
resourcePolicy:
description: Controls how the autoscaler computes recommended resources.
Expand Down Expand Up @@ -608,7 +640,7 @@ spec:
description: API version of the referent
type: string
kind:
description: 'Kind of the referent; More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds"'
description: 'Kind of the referent; More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
name:
description: 'Name of the referent; More info: http://kubernetes.io/docs/user-guide/identifiers#names'
Expand All @@ -617,6 +649,7 @@ spec:
- kind
- name
type: object
x-kubernetes-map-type: atomic
updatePolicy:
description: Describes the rules on how changes are applied to the
pods. If not specified, all fields in the `PodUpdatePolicy` are
Expand Down Expand Up @@ -749,9 +782,5 @@ spec:
type: object
served: true
storage: false
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
subresources:
status: {}
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
- --cloud-provider=aws
- --use-service-account-credentials=true
- --configure-cloud-routes=false
image: container-registry.zalando.net/teapot/aws-cloud-controller-manager-internal:v1.27.2-master-108
image: container-registry.zalando.net/teapot/aws-cloud-controller-manager-internal:v1.28.1-master-111
name: aws-cloud-controller-manager
resources:
requests:
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/skipper/deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{ $internal_version := "v0.21.25-853" }}
{{ $internal_version := "v0.21.36-864" }}
{{ $canary_internal_version := "v0.21.36-864" }}

{{/* 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/node-pools/master-default/stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Mappings:
Images:
eu-central-1:
# Use the node pool's architecture to construct the config item name that we're using to get the AMI name.
MachineImage: '{{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_27_" .NodePool.ConfigItems.kuberuntu_distro_master "_" .Values.InstanceInfo.Architecture) }}'
MachineImage: '{{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_28_" .NodePool.ConfigItems.kuberuntu_distro_master "_" .Values.InstanceInfo.Architecture) }}'

Resources:
AutoScalingGroup:
Expand Down
2 changes: 1 addition & 1 deletion cluster/node-pools/worker-combined/stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Mappings:
Images:
eu-central-1:
# Use the node pool's architecture to construct the config item name that we're using to get the AMI name.
MachineImage: '{{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_27_" .NodePool.ConfigItems.kuberuntu_distro_worker "_" .Values.InstanceInfo.Architecture) }}'
MachineImage: '{{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_28_" .NodePool.ConfigItems.kuberuntu_distro_worker "_" .Values.InstanceInfo.Architecture) }}'

Resources:
AutoScalingGroup:
Expand Down
4 changes: 2 additions & 2 deletions cluster/node-pools/worker-karpenter/provisioners.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ spec:
amiFamily: Custom
amiSelectorTerms:
# Select on any AMI that has any of the following IDs
- id: {{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_27_" .NodePool.ConfigItems.kuberuntu_distro_worker "_amd64") }}
- id: {{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_27_" .NodePool.ConfigItems.kuberuntu_distro_worker "_arm64") }}
- id: {{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_28_" .NodePool.ConfigItems.kuberuntu_distro_worker "_amd64") }}
- id: {{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_28_" .NodePool.ConfigItems.kuberuntu_distro_worker "_arm64") }}
metadataOptions:
httpEndpoint: enabled
httpProtocolIPv6: disabled
Expand Down
2 changes: 1 addition & 1 deletion cluster/node-pools/worker-splitaz/stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Mappings:
Images:
eu-central-1:
# Use the node pool's architecture to construct the config item name that we're using to get the AMI name.
MachineImage: '{{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_27_" .NodePool.ConfigItems.kuberuntu_distro_worker "_" .Values.InstanceInfo.Architecture) }}'
MachineImage: '{{ index .NodePool.ConfigItems (print "kuberuntu_image_v1_28_" .NodePool.ConfigItems.kuberuntu_distro_worker "_" .Values.InstanceInfo.Architecture) }}'

Resources:
{{ with $data := . }}
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

BINARY ?= kubernetes-on-aws-e2e
VERSION ?= $(shell git describe --tags --always --dirty)
KUBE_VERSION ?= v1.27.11
KUBE_VERSION ?= v1.28.8
IMAGE ?= pierone.stups.zalan.do/teapot/$(BINARY)
TAG ?= $(VERSION)
DOCKERFILE ?= Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/apiserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ var _ = describe("Image Policy Tests (StatefulSet)", func() {

_, err = e2epod.WaitForPodsWithLabelRunningReady(context.TODO(), cs, namespace, appLabelSelector(appLabel), 1, 1*time.Minute)
Expect(err).To(HaveOccurred())
Expect(err.Error()).To(MatchRegexp(`expected at least 1 pods, only got 0`))
Expect(err.Error()).To(MatchRegexp(`Timed out after 60`))
})
})

Expand Down
Loading