replace kutil.Key with client.ObjectKey

gardener · Jun 3, 2024 · 923a3b1 · 923a3b1
1 parent 255ea48
commit 923a3b1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/pkg/controller/lifecycle/actuator.go b/pkg/controller/lifecycle/actuator.go
@@ -424,7 +424,7 @@ func (a *actuator) addCleanupOfOldAdditionalProviders(dnsProviders map[string]co
 		provider := &dnsv1alpha1.DNSProvider{}
 		if err := a.Client().Get(
 			ctx,
-			kutil.Key(namespace, ExternalDNSProviderName),
+			client.ObjectKey{Namespace: namespace, Name: ExternalDNSProviderName},
 			provider,
 		); err == nil {
 			dnsProviders[provider.Name] = component.OpDestroyAndWait(NewProviderDeployWaiter(
@@ -485,7 +485,7 @@ func (a *actuator) addAdditionalDNSProviders(providers map[string]*dnsv1alpha1.D
 		secret := &corev1.Secret{}
 		if err := a.Client().Get(
 			ctx,
-			kutil.Key(namespace, mappedSecretName),
+			client.ObjectKey{Namespace: namespace, Name: mappedSecretName},
 			secret,
 		); err != nil {
 			result = multierror.Append(result, fmt.Errorf("could not get dns provider[%d] secret %q -> %q: %w", i, *p.SecretName, mappedSecretName, err))

diff --git a/pkg/controller/lifecycle/dnsrecord.go b/pkg/controller/lifecycle/dnsrecord.go
@@ -8,7 +8,6 @@ import (
 	"context"
 
 	extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
-	kutil "github.com/gardener/gardener/pkg/utils/kubernetes"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -18,7 +17,7 @@ import (
 // If the DNSRecord resource is not found, it returns nil.
 func GetSecretRefFromDNSRecordExternal(ctx context.Context, c client.Client, namespace, shootName string) (*corev1.SecretReference, string, *string, error) {
 	dns := &extensionsv1alpha1.DNSRecord{}
-	if err := c.Get(ctx, kutil.Key(namespace, shootName+"-external"), dns); client.IgnoreNotFound(err) != nil && !meta.IsNoMatchError(err) {
+	if err := c.Get(ctx, client.ObjectKey{Namespace: namespace, Name: shootName + "-external"}, dns); client.IgnoreNotFound(err) != nil && !meta.IsNoMatchError(err) {
 		return nil, "", nil, err
 	}