@@ -387,11 +387,6 @@ func (vp *valuesProvider) GetControlPlaneChartValues(
387387 return nil , err
388388 }
389389
390- // TODO(AndreasBurger): rm in future release.
391- if err := cleanupSeedLegacyCSISnapshotValidation (ctx , vp .client , cp .Namespace ); err != nil {
392- return nil , err
393- }
394-
395390 useWorkloadIdentity , err := shouldUseWorkloadIdentity (ctx , vp .client , cp .Spec .SecretRef .Name , cp .Spec .SecretRef .Namespace )
396391 if err != nil {
397392 return nil , err
@@ -896,23 +891,6 @@ func getControlPlaneShootChartValues(
896891 }, nil
897892}
898893
899- func cleanupSeedLegacyCSISnapshotValidation (
900- ctx context.Context ,
901- client k8sclient.Client ,
902- namespace string ,
903- ) error {
904- if err := kutil .DeleteObjects (ctx , client ,
905- & appsv1.Deployment {ObjectMeta : metav1.ObjectMeta {Name : aws .CSISnapshotValidationName , Namespace : namespace }},
906- & corev1.Service {ObjectMeta : metav1.ObjectMeta {Name : aws .CSISnapshotValidationName , Namespace : namespace }},
907- & vpaautoscalingv1.VerticalPodAutoscaler {ObjectMeta : metav1.ObjectMeta {Name : "csi-snapshot-webhook-vpa" , Namespace : namespace }},
908- & policyv1.PodDisruptionBudget {ObjectMeta : metav1.ObjectMeta {Name : aws .CSISnapshotValidationName , Namespace : namespace }},
909- ); err != nil {
910- return fmt .Errorf ("failed to delete legacy csi-snapshot-validation resources: %w" , err )
911- }
912-
913- return nil
914- }
915-
916894func shouldUseWorkloadIdentity (ctx context.Context , c k8sclient.Client , secretName , secretNamespace string ) (bool , error ) {
917895 secret := & corev1.Secret {ObjectMeta : metav1.ObjectMeta {Name : secretName , Namespace : secretNamespace }}
918896 if err := c .Get (ctx , k8sclient .ObjectKeyFromObject (secret ), secret ); err != nil {
0 commit comments