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

Remove VPA for the csi-disk-plugin-alicloud DaemonSet #750

Merged
merged 2 commits into from
Jan 20, 2025
Merged

Remove VPA for the csi-disk-plugin-alicloud DaemonSet #750

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
4be6642
Remove VPA for the csi-disk-plugin-alicloud DaemonSet
ialidzhikov Dec 18, 2024
1b9b762
Remove resource limits for the csi-disk-plugin-alicloud DaemonSet
ialidzhikov Dec 18, 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
3 changes: 0 additions & 3 deletions charts/internal/shoot-system-components/charts/csi-alicloud/templates/csi-diskplugin-ds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@ spec:
requests:
cpu: 100m
memory: 128Mi
limits:
cpu: 500m
memory: 1024Mi
containers:
- name: driver-registrar
image: {{ index .Values.images "csi-node-driver-registrar" }}
Expand Down
37 changes: 0 additions & 37 deletions charts/internal/shoot-system-components/charts/csi-alicloud/templates/vpa.yaml
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions charts/internal/shoot-system-components/charts/csi-alicloud/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ images:
credential:
accessKeyID: keyID
accessKeySecret: secret
vpaEnabled: false

enableADController: true

Expand All @@ -23,32 +22,11 @@ resources:
requests:
cpu: 12m
memory: 40Mi
limits:
memory: 256Mi
nodeDriverRegistrar:
requests:
cpu: 11m
memory: 32Mi
limits:
memory: 1Gi
livenessProbe:
requests:
cpu: 11m
memory: 32Mi
limits:
memory: 300Mi

vpa:
resourcePolicy:
driver:
maxAllowed:
cpu: 2
memory: 4G
nodeDriverRegistrar:
maxAllowed:
cpu: 1
memory: 3G
livenessProbe:
maxAllowed:
cpu: 1
memory: 3G
7 changes: 2 additions & 5 deletions pkg/controller/controlplane/valuesprovider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ var controlPlaneShootChart = &chart.Chart{
{Type: &appsv1.DaemonSet{}, Name: "csi-disk-plugin-alicloud"},
{Type: &corev1.Secret{}, Name: "csi-diskplugin-alicloud"},
{Type: &corev1.ServiceAccount{}, Name: "csi-disk-plugin-alicloud"},
{Type: extensionscontroller.GetVerticalPodAutoscalerObject(), Name: "csi-diskplugin-alicloud"},
// csi-controller-ali-plugin
{Type: &corev1.ServiceAccount{}, Name: "csi-controller-ali-plugin"},
{Type: &rbacv1.ClusterRole{}, Name: extensionsv1alpha1.SchemeGroupVersion.Group + ":kube-system:csi-controller-ali-plugin"},
Expand Down Expand Up @@ -287,7 +286,7 @@ func (vp *valuesProvider) GetControlPlaneChartValues(
func (vp *valuesProvider) GetControlPlaneShootChartValues(
ctx context.Context,
cp *extensionsv1alpha1.ControlPlane,
cluster *extensionscontroller.Cluster,
_ *extensionscontroller.Cluster,
secretsReader secretsmanager.Reader,
_ map[string]string,
) (map[string]interface{}, error) {
Expand All @@ -303,7 +302,7 @@ func (vp *valuesProvider) GetControlPlaneShootChartValues(
}

// Get control plane shoot chart values
return vp.getControlPlaneShootChartValues(cpConfig, cluster, cp, credentials, secretsReader)
return vp.getControlPlaneShootChartValues(cpConfig, cp, credentials, secretsReader)
}

// cloudConfig wraps the settings for the Alicloud provider.
Expand Down Expand Up @@ -457,7 +456,6 @@ func (vp *valuesProvider) enableCSIADController(cpConfig *apisalicloud.ControlPl
// getControlPlaneShootChartValues collects and returns the control plane shoot chart values.
func (vp *valuesProvider) getControlPlaneShootChartValues(
cpConfig *apisalicloud.ControlPlaneConfig,
cluster *extensionscontroller.Cluster,
cp *extensionsv1alpha1.ControlPlane,
credentials *alicloud.Credentials,
secretsReader secretsmanager.Reader,
Expand All @@ -476,7 +474,6 @@ func (vp *valuesProvider) getControlPlaneShootChartValues(
"accessKeySecret": base64.StdEncoding.EncodeToString([]byte(credentials.AccessKeySecret)),
},
"enableADController": vp.enableCSIADController(cpConfig),
"vpaEnabled": gardencorev1beta1helper.ShootWantsVerticalPodAutoscaler(cluster.Shoot),
"webhookConfig": map[string]interface{}{
"url": "https://" + alicloud.CSISnapshotValidationName + "." + cp.Namespace + "/volumesnapshot",
"caBundle": string(caSecret.Data[secretutils.DataKeyCertificateBundle]),
Expand Down
4 changes: 0 additions & 4 deletions pkg/controller/controlplane/valuesprovider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ var _ = Describe("ValuesProvider", func() {
"accessKeySecret": "YmFy",
},
"enableADController": true,
"vpaEnabled": true,
"webhookConfig": map[string]interface{}{
"url": "https://" + alicloud.CSISnapshotValidationName + "." + cp.Namespace + "/volumesnapshot",
"caBundle": "",
Expand Down Expand Up @@ -205,9 +204,6 @@ var _ = Describe("ValuesProvider", func() {
},
Kubernetes: gardencorev1beta1.Kubernetes{
Version: "1.28.0",
VerticalPodAutoscaler: &gardencorev1beta1.VerticalPodAutoscaler{
Enabled: true,
},
},
},
},
Expand Down
Loading