Skip to content

Commit

Permalink
chore: Cleanup deprecated label approach
Browse files Browse the repository at this point in the history
  • Loading branch information
marc1404 committed Feb 5, 2025
1 parent cc87b60 commit 58a8c45
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 7 deletions.
5 changes: 0 additions & 5 deletions pkg/webhook/controlplane/ensurer.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
v1beta1constants "github.com/gardener/gardener/pkg/apis/core/v1beta1/constants"
extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
"github.com/gardener/gardener/pkg/component/nodemanagement/machinecontrollermanager"
gutil "github.com/gardener/gardener/pkg/utils/gardener"
imagevectorutils "github.com/gardener/gardener/pkg/utils/imagevector"
versionutils "github.com/gardener/gardener/pkg/utils/version"
"github.com/go-logr/logr"
Expand Down Expand Up @@ -94,10 +93,6 @@ func (e *ensurer) EnsureKubeAPIServerDeployment(ctx context.Context, gctx gconte
template := &newObj.Spec.Template
ps := &template.Spec

// TODO: This label approach is deprecated and no longer needed in the future. Remove it as soon as gardener/gardener@v1.75 has been released.
metav1.SetMetaDataLabel(&newObj.Spec.Template.ObjectMeta, gutil.NetworkPolicyLabel(aws.CSISnapshotValidationName, 443), v1beta1constants.LabelNetworkPolicyAllowed)
metav1.SetMetaDataLabel(&newObj.Spec.Template.ObjectMeta, gutil.NetworkPolicyLabel(aws.AWSLoadBalancerControllerName+"-webhook-service", 9443), v1beta1constants.LabelNetworkPolicyAllowed)

cluster, err := gctx.GetCluster(ctx)
if err != nil {
return err
Expand Down
2 changes: 0 additions & 2 deletions pkg/webhook/controlplane/ensurer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -839,8 +839,6 @@ func checkKubeAPIServerDeployment(dep *appsv1.Deployment, k8sVersion string) {
Expect(c.Env).NotTo(ContainElement(accessKeyIDEnvVar))
Expect(c.Env).NotTo(ContainElement(secretAccessKeyEnvVar))
Expect(dep.Spec.Template.Annotations).To(BeNil())
Expect(dep.Spec.Template.Labels).To(HaveKeyWithValue("networking.resources.gardener.cloud/to-csi-snapshot-validation-tcp-443", "allowed"))
Expect(dep.Spec.Template.Labels).To(HaveKeyWithValue("networking.resources.gardener.cloud/to-aws-load-balancer-controller-webhook-service-tcp-9443", "allowed"))
}

func checkKubeControllerManagerDeployment(dep *appsv1.Deployment, k8sVersion string) {
Expand Down

0 comments on commit 58a8c45

Please sign in to comment.