Cleanup natipmigration logic

hack/api-reference/api.md

@@ -659,19 +659,6 @@ bool
 <p>Zoned indicates whether the cluster uses zones</p>
 </td>
 </tr>
-<tr>
-<td>
-<code>natGatewayPublicIpMigrated</code></br>
-<em>
-bool
-</em>
-</td>
-<td>
-<em>(Optional)</em>
-<p>NatGatewayPublicIPMigrated is an indicator if the Gardener managed public ip address is already migrated.
-TODO(natipmigration) This can be removed in future versions when the ip migration has been completed.</p>
-</td>
-</tr>
 </tbody>
 </table>
 <h3 id="azure.provider.extensions.gardener.cloud/v1alpha1.MachineImage">MachineImage

pkg/apis/azure/types_infrastructure.go

@@ -92,9 +92,6 @@ type InfrastructureStatus struct {
 	Identity *IdentityStatus
 	// Zoned indicates whether the cluster uses zones
 	Zoned bool
-	// NatGatewayPublicIPMigrated is an indicator if the Gardener managed public ip address is already migrated.
-	// TODO(natipmigration) This can be removed in future versions when the ip migration has been completed.
-	NatGatewayPublicIPMigrated bool
 }
 
 // NetworkStatus is the current status of the infrastructure networks.

pkg/apis/azure/v1alpha1/types_infrastructure.go

@@ -103,10 +103,6 @@ type InfrastructureStatus struct {
 	// Zoned indicates whether the cluster uses zones
 	// +optional
 	Zoned bool `json:"zoned,omitempty"`
-	// NatGatewayPublicIPMigrated is an indicator if the Gardener managed public ip address is already migrated.
-	// TODO(natipmigration) This can be removed in future versions when the ip migration has been completed.
-	// +optional
-	NatGatewayPublicIPMigrated bool `json:"natGatewayPublicIpMigrated,omitempty"`
 }
 
 // NetworkStatus is the current status of the infrastructure networks.

pkg/internal/infrastructure/templates/main.tpl.tf

@@ -94,10 +94,6 @@ resource "azurerm_nat_gateway" "nat" {
   {{ if hasKey .natGateway "zone" -}}
   zones = [{{ .natGateway.zone | quote }}]
   {{- end }}
-  {{ if .natGateway.migrateNatGatewayToIPAssociation -}}
-  # TODO(natipmigration) This can be removed in future versions when the ip migration has been completed.
-  public_ip_address_ids   = []
-  {{- end }}
   {{- end }}
 }
 resource "azurerm_subnet_nat_gateway_association" "nat-worker-subnet-association" {

pkg/internal/infrastructure/terraform.go

@@ -169,14 +169,6 @@ func ComputeTerraformerTemplateValues(
 
 	natGatewayConfig, createNatGateway := generateNatGatewayValues(config)
 
-	// Checks if the Gardener managed NatGateway public ip needs to be migrated.
-	// TODO(natipmigration) This can be removed in future versions when the ip migration has been completed.
-	natGatewayIPMigrationRequired, err := isNatGatewayIPMigrationRequired(infra, config)
-	if err != nil {
-		return nil, err
-	}
-	natGatewayConfig["migrateNatGatewayToIPAssociation"] = natGatewayIPMigrationRequired
-
 	if config.Identity != nil && config.Identity.Name != "" && config.Identity.ResourceGroup != "" {
 		identityConfig = map[string]interface{}{
 			"name":          config.Identity.Name,
@@ -274,9 +266,6 @@ type TerraformState struct {
 	IdentityClientID string
 	// Zoned is an indicator if zones should be used.
 	Zoned bool
-	// NatGatewayIPMigrated is the indicator if the nat gateway ip is migrated.
-	// TODO(natipmigration) This can be removed in future versions when the ip migration has been completed.
-	NatGatewayIPMigrated string
 }
 
 // ExtractTerraformState extracts the TerraformState from the given Terraformer.
@@ -350,10 +339,6 @@ func ExtractTerraformState(ctx context.Context, tf terraformer.Terraformer, infr
 		tfState.IdentityClientID = vars[TerraformerOutputKeyIdentityClientID]
 	}
 
-	if config.Networks.NatGateway != nil && config.Networks.NatGateway.Enabled {
-		tfState.NatGatewayIPMigrated = "true"
-	}
-
 	return &tfState, nil
 }
 
@@ -412,11 +397,6 @@ func StatusFromTerraformState(tfState *TerraformState) *apiv1alpha1.Infrastructu
 		})
 	}
 
-	// TODO(natipmigration) This can be removed in future versions when the ip migration has been completed.
-	if tfState.NatGatewayIPMigrated == "true" {
-		infraState.NatGatewayPublicIPMigrated = true
-	}
-
 	return &infraState
 }
 
@@ -528,25 +508,3 @@ func isPrimaryAvailabilitySetRequired(infra *extensionsv1alpha1.Infrastructure,
 
 	return false, nil
 }
-
-// isNatGatewayIPMigrationRequired checks if the Gardener managed NatGateway public ip needs to be migrated.
-// TODO(natipmigration) This can be removed in future versions when the ip migration has been completed.
-func isNatGatewayIPMigrationRequired(infra *extensionsv1alpha1.Infrastructure, config *api.InfrastructureConfig) (bool, error) {
-	if config.Networks.NatGateway == nil || !config.Networks.NatGateway.Enabled {
-		return false, nil
-	}
-
-	if infra.Status.ProviderStatus == nil {
-		return false, nil
-	}
-
-	infrastructureStatus, err := helper.InfrastructureStatusFromInfrastructure(infra)
-	if err != nil {
-		return false, err
-	}
-
-	if infrastructureStatus.NatGatewayPublicIPMigrated {
-		return false, nil
-	}
-	return true, nil
-}

pkg/internal/infrastructure/terraform_test.go

@@ -169,9 +169,7 @@ var _ = Describe("Terraform", func() {
 				"securityGroupName": TerraformerOutputKeySecurityGroupName,
 			}
 
-			expectedNatGatewayValues = map[string]interface{}{
-				"migrateNatGatewayToIPAssociation": false,
-			}
+			expectedNatGatewayValues = map[string]interface{}{}
 
 			expectedValues = map[string]interface{}{
 				"azure":         expectedAzureValues,
@@ -437,50 +435,6 @@ var _ = Describe("Terraform", func() {
 				Expect(err).NotTo(HaveOccurred())
 				Expect(values).To(BeEquivalentTo(expectedValues))
 			})
-
-			// TODO(natipmigration) This can be removed in future versions when the ip migration has been completed.
-			Context("NatGateway Gardener managed IP migration", func() {
-				BeforeEach(func() {
-					config.Networks.NatGateway = &api.NatGatewayConfig{
-						Enabled: true,
-					}
-					expectedCreateValues["natGateway"] = true
-				})
-
-				It("should migrate the NatGateway IP as it is not yet migrated", func() {
-					infrastructureStatus := api.InfrastructureStatus{
-						NatGatewayPublicIPMigrated: false,
-					}
-					infrastructureStatusMarshalled, err := json.Marshal(infrastructureStatus)
-					Expect(err).NotTo(HaveOccurred())
-
-					infra.Status.ProviderStatus = &runtime.RawExtension{
-						Raw: infrastructureStatusMarshalled,
-					}
-
-					expectedNatGatewayValues["migrateNatGatewayToIPAssociation"] = true
-					values, err := ComputeTerraformerTemplateValues(infra, config, cluster)
-					Expect(err).To(Not(HaveOccurred()))
-					Expect(values).To(BeEquivalentTo(expectedValues))
-				})
-
-				It("should not migrate the NatGateway IP as it is already migrated", func() {
-					infrastructureStatus := api.InfrastructureStatus{
-						NatGatewayPublicIPMigrated: true,
-					}
-					infrastructureStatusMarshalled, err := json.Marshal(infrastructureStatus)
-					Expect(err).NotTo(HaveOccurred())
-
-					infra.Status.ProviderStatus = &runtime.RawExtension{
-						Raw: infrastructureStatusMarshalled,
-					}
-
-					expectedNatGatewayValues["migrateNatGatewayToIPAssociation"] = false
-					values, err := ComputeTerraformerTemplateValues(infra, config, cluster)
-					Expect(err).To(Not(HaveOccurred()))
-					Expect(values).To(BeEquivalentTo(expectedValues))
-				})
-			})
 		})
 	})