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

Update VPA to v1.0.0 #7211

Merged
merged 2 commits into from
Mar 27, 2024
Merged

Update VPA to v1.0.0 #7211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a86efa6
Update VPA to v1.0.0
mikkeloscar Mar 26, 2024
00fdf4d
Align rbac with upstream
mikkeloscar Mar 26, 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
4 changes: 2 additions & 2 deletions cluster/config-defaults.yaml
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions cluster/manifests/01-vertical-pod-autoscaler/admission-controller-deployment.yaml
View file
Open in desktop
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
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions cluster/manifests/01-vertical-pod-autoscaler/recommender-deployment.yaml
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions cluster/manifests/01-vertical-pod-autoscaler/updater-deployment.yaml
View file
Open in desktop
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