cleanup (#800)

* Remove unused function * Fix comments * Removed redundant import * Remove unused * Remove redundant paranthese * run make tidy * Revert remove of unused --------- Co-authored-by: AndreasBurger <[email protected]>
gardener · Jul 4, 2024 · d4711b6 · d4711b6
1 parent a80568a
commit d4711b6
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 43 deletions.
diff --git a/pkg/controller/bastion/bastion_suite_test.go b/pkg/controller/bastion/bastion_suite_test.go
@@ -226,7 +226,7 @@ func createOpenstackTestCluster() *extensions.Cluster {
 		CloudProfile: &gardencorev1beta1.CloudProfile{
 			Spec: gardencorev1beta1.CloudProfileSpec{
 				Regions: []gardencorev1beta1.Region{
-					{Name: ("eu-nl-1")},
+					{Name: "eu-nl-1"},
 				},
 			},
 		},

diff --git a/pkg/controller/dnsrecord/actuator.go b/pkg/controller/dnsrecord/actuator.go
@@ -117,7 +117,7 @@ func (a *actuator) Delete(ctx context.Context, log logr.Logger, dns *extensionsv
 	return nil
 }
 
-// Delete forcefully deletes the DNSRecord.
+// ForceDelete forcefully deletes the DNSRecord.
 func (a *actuator) ForceDelete(ctx context.Context, log logr.Logger, dns *extensionsv1alpha1.DNSRecord, cluster *extensionscontroller.Cluster) error {
 	return a.Delete(ctx, log, dns, cluster)
 }

diff --git a/pkg/controller/infrastructure/actuator.go b/pkg/controller/infrastructure/actuator.go
@@ -6,19 +6,12 @@ package infrastructure
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/gardener/gardener/extensions/pkg/controller/infrastructure"
 	"github.com/gardener/gardener/extensions/pkg/terraformer"
-	extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
-	"github.com/go-logr/logr"
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
-
-	"github.com/gardener/gardener-extension-provider-openstack/pkg/internal"
-	infrainternal "github.com/gardener/gardener-extension-provider-openstack/pkg/internal/infrastructure"
-	"github.com/gardener/gardener-extension-provider-openstack/pkg/openstack"
 )
 
 type actuator struct {
@@ -36,22 +29,6 @@ func NewActuator(mgr manager.Manager, disableProjectedTokenMount bool) infrastru
 	}
 }
 
-// Helper functions
-
-func (a *actuator) cleanupTerraformerResources(ctx context.Context, log logr.Logger, infra *extensionsv1alpha1.Infrastructure) error {
-	credentials, err := openstack.GetCredentials(ctx, a.client, infra.Spec.SecretRef, false)
-	if err != nil {
-		return err
-	}
-
-	tf, err := internal.NewTerraformerWithAuth(log, a.restConfig, infrainternal.TerraformerPurpose, infra, credentials, a.disableProjectedTokenMount)
-	if err != nil {
-		return fmt.Errorf("could not create terraformer object: %w", err)
-	}
-
-	return CleanupTerraformerResources(ctx, tf)
-}
-
 // CleanupTerraformerResources deletes terraformer artifacts (config, state, secrets).
 func CleanupTerraformerResources(ctx context.Context, tf terraformer.Terraformer) error {
 	if err := tf.EnsureCleanedUp(ctx); err != nil {

diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
@@ -18,14 +18,6 @@ func IsStringPtrValueEqual(a *string, b string) bool {
 	return a != nil && *a == b
 }
 
-// StringValue returns an empty string (value/ptr)
-func StringValue(s *string) string {
-	if s == nil {
-		return ""
-	}
-	return *s
-}
-
 // StringEqual compares to strings
 func StringEqual(a, b *string) bool {
 	return a == b || (a != nil && b != nil && *a == *b)

diff --git a/test/integration/infrastructure/infrastructure_test.go b/test/integration/infrastructure/infrastructure_test.go
@@ -47,8 +47,6 @@ import (
 	openstackclient "github.com/gardener/gardener-extension-provider-openstack/pkg/openstack/client"
 )
 
-type flowUsage int
-
 const (
 	reconcilerUseTF        string = "tf"
 	reconcilerMigrateTF    string = "migrate"
@@ -513,13 +511,6 @@ func runTest(
 	return nil
 }
 
-func checkOperationAnnotationRemoved(obj client.Object) error {
-	if annots := obj.GetAnnotations(); annots["gardener.cloud/operation"] == "" {
-		return nil
-	}
-	return fmt.Errorf("reconciliation not started yet")
-}
-
 // newProviderConfig creates a providerConfig with the network and router details.
 // If routerID is set to "", it requests a new router creation.
 // Else it reuses the supplied routerID.

diff --git a/test/tm/generator.go b/test/tm/generator.go
@@ -14,7 +14,7 @@ import (
 	"github.com/gardener/gardener/test/testmachinery/extensions/generator"
 	"github.com/go-logr/logr"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	log "sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
 	"github.com/gardener/gardener-extension-provider-openstack/pkg/apis/openstack/v1alpha1"