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

dev to kube-1.28 #7217

Merged
merged 10 commits into from
Mar 27, 2024
4 changes: 2 additions & 2 deletions cluster/config-defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -475,8 +475,8 @@ horizontal_pod_autoscaler_tolerance: "0.1"
horizontal_pod_downscale_stabilization: "5m0s"

# Vertical pod autoscaler version for controlling roll-out, can be "current" or "legacy"
# current => v0.11.0-internal.17
# legacy => v0.6.1-internal.16
# current => v1.0.0-internal.20
# legacy => v0.12.0-internal.19
vertical_pod_autoscaler_version: "current"

# Cluster update settings
Expand Down
7 changes: 4 additions & 3 deletions cluster/manifests/01-routegroup/routegroup-crd.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# This is an adjusted copy of https://github.com/szuecs/routegroup-client/blob/master/zalando.org_routegroups.yaml
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand Down Expand Up @@ -133,7 +132,8 @@ spec:
hosts:
description: List of hostnames for the RouteGroup
items:
pattern: "^[a-z0-9]([-a-z0-9]*[a-z0-9])?([.][a-z0-9]([-a-z0-9]*[a-z0-9])?)*$"
maxLength: 255
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?([.][a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
type: string
minItems: 1
type: array
Expand Down Expand Up @@ -217,7 +217,8 @@ spec:
The values in this list must match the host name(s) used for
the RouteGroup in order to terminate TLS for the host(s).
items:
pattern: "^[a-z0-9]([-a-z0-9]*[a-z0-9])?([.][a-z0-9]([-a-z0-9]*[a-z0-9])?)*$"
maxLength: 255
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?([.][a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
type: string
minItems: 1
type: array
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ spec:
containers:
- name: admission-controller
{{if eq .Cluster.ConfigItems.vertical_pod_autoscaler_version "current"}}
image: container-registry.zalando.net/teapot/vpa-admission-controller:v0.12.0-internal.19
image: container-registry.zalando.net/teapot/vpa-admission-controller:v1.0.0-internal.20
{{else if eq .Cluster.ConfigItems.vertical_pod_autoscaler_version "legacy"}}
image: container-registry.zalando.net/teapot/vpa-admission-controller:v0.11.0-internal.17
image: container-registry.zalando.net/teapot/vpa-admission-controller:v0.12.0-internal.19
{{end}}
command:
- /admission-controller
Expand Down
62 changes: 43 additions & 19 deletions cluster/manifests/01-vertical-pod-autoscaler/rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ rules:
- list
- watch
- create
- update
- patch
- apiGroups:
- "poc.autoscaling.k8s.io"
resources:
Expand All @@ -52,7 +50,6 @@ rules:
- get
- list
- watch
- patch
- apiGroups:
- "autoscaling.k8s.io"
resources:
Expand All @@ -61,6 +58,18 @@ rules:
- get
- list
- watch
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: system:vpa-status-actor
rules:
- apiGroups:
- "autoscaling.k8s.io"
resources:
- verticalpodautoscalers/status
verbs:
- get
- patch
---
apiVersion: rbac.authorization.k8s.io/v1
Expand Down Expand Up @@ -110,17 +119,12 @@ metadata:
component: vpa
rules:
- apiGroups:
- "apps"
- "extensions"
resources:
- replicasets
verbs:
- get
- apiGroups:
- ""
resources:
- pods
verbs:
- delete
- apiGroups:
- ""
resources:
Expand Down Expand Up @@ -165,6 +169,19 @@ subjects:
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: system:vpa-status-actor
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: system:vpa-status-actor
subjects:
- kind: ServiceAccount
name: vpa-recommender
namespace: kube-system
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: system:vpa-checkpoint-actor
labels:
Expand All @@ -187,6 +204,13 @@ metadata:
application: kubernetes
component: vpa
rules:
- apiGroups:
- '*'
resources:
- '*/scale'
verbs:
- get
- watch
- apiGroups:
- ""
resources:
Expand Down Expand Up @@ -241,7 +265,7 @@ subjects:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: system:vpa-evictionter-binding
name: system:vpa-evictioner-binding
labels:
application: kubernetes
component: vpa
Expand All @@ -257,29 +281,29 @@ subjects:
apiVersion: v1
kind: ServiceAccount
metadata:
name: vpa-recommender
name: vpa-admission-controller
namespace: kube-system
labels:
application: kubernetes
component: vpa-recommender
component: vpa-admission-controller
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: vpa-updater
name: vpa-recommender
namespace: kube-system
labels:
application: kubernetes
component: vpa-updater
component: vpa-recommender
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: vpa-admission-controller
name: vpa-updater
namespace: kube-system
labels:
application: kubernetes
component: vpa-admission-controller
component: vpa-updater
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
Expand Down Expand Up @@ -375,6 +399,6 @@ roleRef:
kind: ClusterRole
name: system:vpa-status-reader
subjects:
- kind: ServiceAccount
name: vpa-updater
namespace: kube-system
- kind: ServiceAccount
name: vpa-updater
namespace: kube-system
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ spec:
containers:
- name: recommender
{{if eq .Cluster.ConfigItems.vertical_pod_autoscaler_version "current"}}
image: container-registry.zalando.net/teapot/vpa-recommender:v0.12.0-internal.19
image: container-registry.zalando.net/teapot/vpa-recommender:v1.0.0-internal.20
{{else if eq .Cluster.ConfigItems.vertical_pod_autoscaler_version "legacy"}}
image: container-registry.zalando.net/teapot/vpa-recommender:v0.11.0-internal.17
image: container-registry.zalando.net/teapot/vpa-recommender:v0.12.0-internal.19
{{end}}
args:
- --logtostderr
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ spec:
containers:
- name: updater
{{if eq .Cluster.ConfigItems.vertical_pod_autoscaler_version "current"}}
image: container-registry.zalando.net/teapot/vpa-updater:v0.12.0-internal.19
image: container-registry.zalando.net/teapot/vpa-updater:v1.0.0-internal.20
{{else if eq .Cluster.ConfigItems.vertical_pod_autoscaler_version "legacy"}}
image: container-registry.zalando.net/teapot/vpa-updater:v0.11.0-internal.17
image: container-registry.zalando.net/teapot/vpa-updater:v0.12.0-internal.19
{{end}}
command:
- ./updater
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
operator: Exists
containers:
- name: cluster-lifecycle-controller
image: container-registry.zalando.net/teapot/cluster-lifecycle-controller:master-36
image: container-registry.zalando.net/teapot/cluster-lifecycle-controller:master-37
args:
- --drain-grace-period={{.Cluster.ConfigItems.drain_grace_period}}
- --drain-min-pod-lifetime={{.Cluster.ConfigItems.drain_min_pod_lifetime}}
Expand Down
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-172"
image: "container-registry.zalando.net/teapot/deployment-controller:master-181"
args:
- "--config-namespace=kube-system"
- "--decrypt-kms-alias-arn=arn:aws:kms:{{ .Cluster.Region }}:{{ .Cluster.InfrastructureAccount | getAWSAccountID }}:alias/deployment-secret"
Expand Down
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-172" }}
{{ $version := "master-181" }}

apiVersion: apps/v1
kind: Deployment
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/ingress-controller/deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# {{ $version := "v0.15.5" }}
# {{ $version := "v0.15.10" }}

apiVersion: apps/v1
kind: Deployment
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
effect: NoSchedule
containers:
- name: controller
image: container-registry.zalando.net/teapot/kube-node-ready-controller:master-22
image: container-registry.zalando.net/teapot/kube-node-ready-controller:master-23
resources:
requests:
cpu: {{.Cluster.ConfigItems.kube_node_ready_controller_cpu}}
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/stackset-controller/deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{ $version := "v1.4.52" }}
{{ $version := "v1.4.56" }}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down
2 changes: 1 addition & 1 deletion cluster/node-pools/master-default/userdata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ write_files:
limits:
memory: {{ .Values.InstanceInfo.MemoryFraction (parseInt64 .Cluster.ConfigItems.apiserver_memory_limit_percent)}}
{{- end }}
- image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller:master-197
- image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller:master-198
name: admission-controller
lifecycle:
preStop:
Expand Down
46 changes: 24 additions & 22 deletions test/e2e/stackset/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,26 @@ go 1.22

toolchain go1.22.0

require github.com/zalando-incubator/stackset-controller v1.4.52
require github.com/zalando-incubator/stackset-controller v1.4.56

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-openapi/jsonpointer v0.20.2 // indirect
github.com/go-openapi/jsonreference v0.20.4 // indirect
github.com/go-openapi/swag v0.22.9 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/gnostic v0.7.0 // indirect
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/heptiolabs/healthcheck v0.0.0-20211123025425-613501dd5deb // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/josharian/intern v1.0.0 // indirect
Expand All @@ -33,31 +35,31 @@ require (
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.19.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.48.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/prometheus/client_model v0.6.0 // indirect
github.com/prometheus/common v0.51.1 // indirect
github.com/prometheus/procfs v0.13.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/testify v1.8.4 // indirect
github.com/szuecs/routegroup-client v0.25.0 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/oauth2 v0.17.0 // indirect
github.com/stretchr/testify v1.9.0 // indirect
github.com/szuecs/routegroup-client v0.25.2 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/oauth2 v0.18.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/sys v0.17.0 // indirect
golang.org/x/term v0.17.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.5.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/protobuf v1.32.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.25.16 // indirect
k8s.io/apimachinery v0.25.16 // indirect
k8s.io/client-go v0.25.16 // indirect
k8s.io/api v0.27.12 // indirect
k8s.io/apimachinery v0.27.12 // indirect
k8s.io/client-go v0.27.12 // indirect
k8s.io/klog/v2 v2.120.1 // indirect
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect
k8s.io/utils v0.0.0-20240310230437-4693a0247e57 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
Expand Down
Loading