remove unneeded objects

gardener · Nov 19, 2024 · 4602368 · 4602368
1 parent 0cb7e16
commit 4602368
Show file tree

Hide file tree

Showing 12 changed files with 2 additions and 277 deletions.
diff --git a/hack/api-reference/api.md b/hack/api-reference/api.md
@@ -16,8 +16,6 @@ Resource Types:
 </li><li>
 <a href="#azure.provider.extensions.gardener.cloud/v1alpha1.ControlPlaneConfig">ControlPlaneConfig</a>
 </li><li>
-<a href="#azure.provider.extensions.gardener.cloud/v1alpha1.DNSRecordConfig">DNSRecordConfig</a>
-</li><li>
 <a href="#azure.provider.extensions.gardener.cloud/v1alpha1.InfrastructureConfig">InfrastructureConfig</a>
 </li><li>
 <a href="#azure.provider.extensions.gardener.cloud/v1alpha1.WorkerConfig">WorkerConfig</a>
@@ -230,52 +228,6 @@ Storage
 </tr>
 </tbody>
 </table>
-<h3 id="azure.provider.extensions.gardener.cloud/v1alpha1.DNSRecordConfig">DNSRecordConfig
-</h3>
-<p>
-<p>DNSRecordConfig is the provider-specific configuration for DNSRecords.</p>
-</p>
-<table>
-<thead>
-<tr>
-<th>Field</th>
-<th>Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>
-<code>apiVersion</code></br>
-string</td>
-<td>
-<code>
-azure.provider.extensions.gardener.cloud/v1alpha1
-</code>
-</td>
-</tr>
-<tr>
-<td>
-<code>kind</code></br>
-string
-</td>
-<td><code>DNSRecordConfig</code></td>
-</tr>
-<tr>
-<td>
-<code>cloudConfiguration</code></br>
-<em>
-<a href="#azure.provider.extensions.gardener.cloud/v1alpha1.CloudConfiguration">
-CloudConfiguration
-</a>
-</em>
-</td>
-<td>
-<em>(Optional)</em>
-<p>CloudConfiguration contains config that controls which cloud to connect to.</p>
-</td>
-</tr>
-</tbody>
-</table>
 <h3 id="azure.provider.extensions.gardener.cloud/v1alpha1.InfrastructureConfig">InfrastructureConfig
 </h3>
 <p>
@@ -621,8 +573,7 @@ string
 <p>
 (<em>Appears on:</em>
 <a href="#azure.provider.extensions.gardener.cloud/v1alpha1.BackupBucketConfig">BackupBucketConfig</a>, 
-<a href="#azure.provider.extensions.gardener.cloud/v1alpha1.CloudProfileConfig">CloudProfileConfig</a>, 
-<a href="#azure.provider.extensions.gardener.cloud/v1alpha1.DNSRecordConfig">DNSRecordConfig</a>)
+<a href="#azure.provider.extensions.gardener.cloud/v1alpha1.CloudProfileConfig">CloudProfileConfig</a>)
 </p>
 <p>
 <p>CloudConfiguration contains detailed config for the cloud to connect to. Currently we only support selection of well-

diff --git a/pkg/apis/azure/helper/scheme.go b/pkg/apis/azure/helper/scheme.go
@@ -102,22 +102,6 @@ func BackupConfigFromBackupBucket(backupBucket *extensionsv1alpha1.BackupBucket)
 	return backupConfig, nil
 }
 
-// DNSRecordConfigFromDNSRecord decodes the provider specific config from a given DNSRecord object.
-func DNSRecordConfigFromDNSRecord(dnsRecord *extensionsv1alpha1.DNSRecord) (api.DNSRecordConfig, error) {
-	dnsRecordConfig := api.DNSRecordConfig{}
-	if dnsRecord != nil && dnsRecord.Spec.ProviderConfig != nil {
-		dnsJson, err := dnsRecord.Spec.ProviderConfig.MarshalJSON()
-		if err != nil {
-			return dnsRecordConfig, err
-		}
-
-		if _, _, err := decoder.Decode(dnsJson, nil, &dnsRecordConfig); err != nil {
-			return dnsRecordConfig, err
-		}
-	}
-	return dnsRecordConfig, nil
-}
-
 // InfrastructureStateFromRaw extracts the state from the Infrastructure. If no state was available, it returns a "zero" value InfrastructureState object.
 func InfrastructureStateFromRaw(raw *runtime.RawExtension) (*api.InfrastructureState, error) {
 	state := &api.InfrastructureState{}

diff --git a/pkg/apis/azure/register.go b/pkg/apis/azure/register.go
@@ -34,16 +34,6 @@ var (
 
 // Adds the list of known types to api.Scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
-	scheme.AddKnownTypes(SchemeGroupVersion,
-		&CloudProfileConfig{},
-		&InfrastructureConfig{},
-		&InfrastructureStatus{},
-		&InfrastructureState{},
-		&ControlPlaneConfig{},
-		&WorkerStatus{},
-		&WorkerConfig{},
-		&BackupBucketConfig{},
-		&DNSRecordConfig{},
-	)
+	scheme.AddKnownTypes(SchemeGroupVersion, &CloudProfileConfig{}, &InfrastructureConfig{}, &InfrastructureStatus{}, &InfrastructureState{}, &ControlPlaneConfig{}, &WorkerStatus{}, &WorkerConfig{}, &BackupBucketConfig{})
 	return nil
 }
diff --git a/pkg/apis/azure/types_dnsrecord.go b/pkg/apis/azure/types_dnsrecord.go
diff --git a/pkg/apis/azure/v1alpha1/register.go b/pkg/apis/azure/v1alpha1/register.go
@@ -37,7 +37,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&WorkerConfig{},
 		&WorkerStatus{},
 		&BackupBucketConfig{},
-		&DNSRecordConfig{},
 	)
 	return nil
 }
diff --git a/pkg/apis/azure/v1alpha1/types_dnsrecord.go b/pkg/apis/azure/v1alpha1/types_dnsrecord.go
diff --git a/pkg/apis/azure/v1alpha1/zz_generated.conversion.go b/pkg/apis/azure/v1alpha1/zz_generated.conversion.go
diff --git a/pkg/apis/azure/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/azure/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/apis/azure/zz_generated.deepcopy.go b/pkg/apis/azure/zz_generated.deepcopy.go
diff --git a/pkg/azure/client/factory.go b/pkg/azure/client/factory.go
@@ -6,7 +6,6 @@ package client
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore"
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/arm/policy"
@@ -75,8 +74,6 @@ func NewAzureClientFactory(authCredentials *internal.ClientAuth, options ...Azur
 		option(factory)
 	}
 
-	fmt.Printf("AAAAAAAAAa %v", factory.clientOpts.Cloud)
-
 	return *factory, nil
 }
 

diff --git a/pkg/controller/dnsrecord/actuator.go b/pkg/controller/dnsrecord/actuator.go
@@ -9,7 +9,6 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/sdk/azcore/cloud"
 	extensionscontroller "github.com/gardener/gardener/extensions/pkg/controller"
 	"github.com/gardener/gardener/extensions/pkg/controller/dnsrecord"
 	"github.com/gardener/gardener/extensions/pkg/util"
@@ -90,29 +89,11 @@ func (a *actuator) Reconcile(ctx context.Context, log logr.Logger, dns *extensio
 
 // Delete deletes the DNSRecord.
 func (a *actuator) Delete(ctx context.Context, log logr.Logger, dns *extensionsv1alpha1.DNSRecord, _ *extensionscontroller.Cluster) error {
-	dnsRecordConfig, err := helper.DNSRecordConfigFromDNSRecord(dns)
-	if err != nil {
-		return err
-	}
-
-	var azCloudConfiguration cloud.Configuration
-	// Unlike for the other actuators, both of the values used to determine the cloud instance might be nil - usually the region would not be.
-	// Default to the public cloud in this case.
-	if dnsRecordConfig.CloudConfiguration != nil || dns.Spec.Region != nil {
-		azCloudConfiguration, err = azureclient.AzureCloudConfiguration(dnsRecordConfig.CloudConfiguration, dns.Spec.Region)
-		if err != nil {
-			return err
-		}
-	} else {
-		azCloudConfiguration = cloud.AzurePublic
-	}
-
 	clientFactory, err := DefaultAzureClientFactoryFunc(
 		ctx,
 		a.client,
 		dns.Spec.SecretRef,
 		true,
-		azureclient.WithCloudConfiguration(azCloudConfiguration),
 	)
 	if err != nil {
 		return err