From d018b82597723f80bdeb6921cf30247b2ef120b6 Mon Sep 17 00:00:00 2001 From: Gerrit Date: Mon, 4 Apr 2022 13:35:30 +0200 Subject: [PATCH] Remove `succeeded` field from firewall status. The field is not set by metal-api anyway (see https://github.com/metal-stack/metal-api/issues/209) and introduces a regression for migrated shoots. --- example/controller-registration.yaml | 4 +- go.mod | 2 +- pkg/apis/metal/types_infrastructure.go | 1 - .../metal/v1alpha1/types_infrastructure.go | 1 - .../metal/v1alpha1/zz_generated.conversion.go | 2 - pkg/controller/infrastructure/actuator.go | 1 - .../infrastructure/actuator_reconcile.go | 60 +++---------------- 7 files changed, 10 insertions(+), 61 deletions(-) diff --git a/example/controller-registration.yaml b/example/controller-registration.yaml index aa73cfed2..b77b802c0 100644 --- a/example/controller-registration.yaml +++ b/example/controller-registration.yaml @@ -5,10 +5,10 @@ metadata: name: provider-metal type: helm providerConfig: - chart: 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 + chart: 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 values: image: - tag: v0.18.7 + tag: v0.18.9 --- apiVersion: core.gardener.cloud/v1beta1 kind: ControllerRegistration diff --git a/go.mod b/go.mod index 99134bf78..4683b8013 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,6 @@ require ( k8s.io/code-generator v0.22.2 k8s.io/component-base v0.23.0 k8s.io/kubelet v0.21.10 - k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 sigs.k8s.io/controller-runtime v0.11.0 ) @@ -158,6 +157,7 @@ require ( k8s.io/klog/v2 v2.30.0 // indirect k8s.io/kube-aggregator v0.21.2 // indirect k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect + k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20210609022947-fbf50b04fe17 // indirect sigs.k8s.io/controller-tools v0.7.0 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect diff --git a/pkg/apis/metal/types_infrastructure.go b/pkg/apis/metal/types_infrastructure.go index 61390812c..b0f326a97 100644 --- a/pkg/apis/metal/types_infrastructure.go +++ b/pkg/apis/metal/types_infrastructure.go @@ -42,6 +42,5 @@ type InfrastructureStatus struct { } type FirewallStatus struct { - Succeeded bool MachineID string } diff --git a/pkg/apis/metal/v1alpha1/types_infrastructure.go b/pkg/apis/metal/v1alpha1/types_infrastructure.go index d4ae30a8f..499291580 100644 --- a/pkg/apis/metal/v1alpha1/types_infrastructure.go +++ b/pkg/apis/metal/v1alpha1/types_infrastructure.go @@ -42,6 +42,5 @@ type InfrastructureStatus struct { } type FirewallStatus struct { - Succeeded bool `json:"succeeded"` MachineID string `json:"machineID"` } diff --git a/pkg/apis/metal/v1alpha1/zz_generated.conversion.go b/pkg/apis/metal/v1alpha1/zz_generated.conversion.go index af6071540..3db5423ce 100644 --- a/pkg/apis/metal/v1alpha1/zz_generated.conversion.go +++ b/pkg/apis/metal/v1alpha1/zz_generated.conversion.go @@ -481,7 +481,6 @@ func Convert_metal_FirewallControllerVersion_To_v1alpha1_FirewallControllerVersi } func autoConvert_v1alpha1_FirewallStatus_To_metal_FirewallStatus(in *FirewallStatus, out *metal.FirewallStatus, s conversion.Scope) error { - out.Succeeded = in.Succeeded out.MachineID = in.MachineID return nil } @@ -492,7 +491,6 @@ func Convert_v1alpha1_FirewallStatus_To_metal_FirewallStatus(in *FirewallStatus, } func autoConvert_metal_FirewallStatus_To_v1alpha1_FirewallStatus(in *metal.FirewallStatus, out *FirewallStatus, s conversion.Scope) error { - out.Succeeded = in.Succeeded out.MachineID = in.MachineID return nil } diff --git a/pkg/controller/infrastructure/actuator.go b/pkg/controller/infrastructure/actuator.go index 2c59b6f3f..351156f17 100644 --- a/pkg/controller/infrastructure/actuator.go +++ b/pkg/controller/infrastructure/actuator.go @@ -96,7 +96,6 @@ func updateProviderStatus(ctx context.Context, c client.Client, infrastructure * Kind: "InfrastructureStatus", }, Firewall: metalv1alpha1.FirewallStatus{ - Succeeded: providerStatus.Firewall.Succeeded, MachineID: providerStatus.Firewall.MachineID, }, }} diff --git a/pkg/controller/infrastructure/actuator_reconcile.go b/pkg/controller/infrastructure/actuator_reconcile.go index 57f8f8e5b..7466d95b8 100644 --- a/pkg/controller/infrastructure/actuator_reconcile.go +++ b/pkg/controller/infrastructure/actuator_reconcile.go @@ -19,7 +19,6 @@ import ( metalapi "github.com/metal-stack/gardener-extension-provider-metal/pkg/apis/metal" "github.com/metal-stack/gardener-extension-provider-metal/pkg/apis/metal/helper" metalgo "github.com/metal-stack/metal-go" - metalfirewall "github.com/metal-stack/metal-go/api/client/firewall" mn "github.com/metal-stack/metal-lib/pkg/net" extensionscontroller "github.com/gardener/gardener/extensions/pkg/controller" @@ -73,8 +72,6 @@ var ( firewallActionDeleteAndRecreate firewallReconcileAction = "delete" // firewallActionDoNothing nothing needs to be done for this firewall firewallActionDoNothing firewallReconcileAction = "nothing" - // firewallActionUpdateCreationProgress firewall creation has not yet succeeded - firewallActionUpdateCreationProgress firewallReconcileAction = "update-creation-progress" // firewallActionCreate create a new firewall and write infrastructure status firewallActionCreate firewallReconcileAction = "create" // firewallActionStatusUpdateOnMigrate infrastructure status is not present, but a metal firewall machine is present. @@ -154,7 +151,7 @@ func (a *actuator) Reconcile(ctx context.Context, infrastructure *extensionsv1al // TODO migrate to a state-machine or to a dedicated controller func reconcileFirewall(ctx context.Context, r *firewallReconciler) error { // detect which next action is required - action, status, err := firewallNextAction(ctx, r) + action, status, err := firewallNextAction(r) if err != nil { return err } @@ -171,18 +168,7 @@ func reconcileFirewall(ctx context.Context, r *firewallReconciler) error { r.logger.Info("firewall created", "cluster-id", r.clusterID, "cluster", r.cluster.Shoot.Name, "machine-id", r.providerStatus.Firewall.MachineID) r.providerStatus.Firewall.MachineID = machineID - // TODO this is a BUG, see https://github.com/metal-stack/metal-api/issues/209 - r.providerStatus.Firewall.Succeeded = true return updateProviderStatus(ctx, r.c, r.infrastructure, r.providerStatus, &nodeCIDR) - case firewallActionUpdateCreationProgress: - succeeded, err := hasFirewallSucceeded(r.machineIDInStatus, r.mclient) - if err != nil { - return err - } - - r.logger.Info("firewall creation in progress", "cluster-id", r.clusterID, "cluster", r.cluster.Shoot.Name, "succeeded", succeeded) - r.providerStatus.Firewall.Succeeded = succeeded - return updateProviderStatus(ctx, r.c, r.infrastructure, r.providerStatus, r.infrastructure.Status.NodesCIDR) case firewallActionRecreate: err := deleteFirewallFromStatus(ctx, r) if err != nil { @@ -196,8 +182,7 @@ func reconcileFirewall(ctx context.Context, r *firewallReconciler) error { r.logger.Info("firewall created", "cluster-id", r.clusterID, "cluster", r.cluster.Shoot.Name, "machine-id", r.providerStatus.Firewall.MachineID) r.providerStatus.Firewall.MachineID = machineID - // TODO this is a BUG, see https://github.com/metal-stack/metal-api/issues/209 - r.providerStatus.Firewall.Succeeded = true + return updateProviderStatus(ctx, r.c, r.infrastructure, r.providerStatus, &nodeCIDR) case firewallActionDeleteAndRecreate: err := deleteFirewall(r.logger, r.machineIDInStatus, r.infrastructureConfig.ProjectID, r.clusterTag, r.mclient) @@ -216,8 +201,6 @@ func reconcileFirewall(ctx context.Context, r *firewallReconciler) error { } r.logger.Info("firewall created", "cluster-id", r.clusterID, "cluster", r.cluster.Shoot.Name, "machine-id", r.providerStatus.Firewall.MachineID) r.providerStatus.Firewall.MachineID = machineID - // TODO this is a BUG, see https://github.com/metal-stack/metal-api/issues/209 - r.providerStatus.Firewall.Succeeded = true return updateProviderStatus(ctx, r.c, r.infrastructure, r.providerStatus, &nodeCIDR) case firewallActionStatusUpdateOnMigrate: r.providerStatus.Firewall = *status @@ -227,14 +210,10 @@ func reconcileFirewall(ctx context.Context, r *firewallReconciler) error { } } -func firewallNextAction(ctx context.Context, r *firewallReconciler) (firewallReconcileAction, *metalapi.FirewallStatus, error) { - if !r.providerStatus.Firewall.Succeeded && r.machineIDInStatus != "" { - return firewallActionUpdateCreationProgress, nil, nil - } - +func firewallNextAction(r *firewallReconciler) (firewallReconcileAction, *metalapi.FirewallStatus, error) { firewalls, err := metalclient.FindClusterFirewalls(r.mclient, r.clusterTag, r.infrastructureConfig.ProjectID) if err != nil { - r.logger.Error(err, "firewalls not found", "clustertag", r.clusterTag, "projectid", r.infrastructureConfig.ProjectID) + r.logger.Error(err, "unable to fetch cluster firewalls", "clustertag", r.clusterTag, "projectid", r.infrastructureConfig.ProjectID) return firewallActionDoNothing, nil, &controllererrors.RequeueAfterError{ Cause: err, RequeueAfter: 30 * time.Second, @@ -256,13 +235,12 @@ func firewallNextAction(ctx context.Context, r *firewallReconciler) (firewallRec r.logger.Info("firewall exists but status is empty, assuming migration", "clusterid", r.clusterID, "machineid", r.machineIDInStatus) return firewallActionStatusUpdateOnMigrate, &metalapi.FirewallStatus{ MachineID: encodeMachineID(*fw.Partition.ID, *fw.ID), - Succeeded: *fw.Allocation.Succeeded, }, nil } if *fw.ID != r.machineIDInStatus { r.logger.Error( - fmt.Errorf("machine id of this cluster's firewall differs from infrastructure status"), + fmt.Errorf("machine id of this cluster's firewall differs from infrastructure status, not reconciling firewall anymore"), "leaving as it is, but something unexpected must have happened in the past. if you want to get to a clean state, remove the firewall by hand (causes downtime!) and reconcile infrastructure again", "clusterID", r.clusterID, "expectedMachineID", r.machineIDInStatus, @@ -324,31 +302,8 @@ func firewallNextAction(ctx context.Context, r *firewallReconciler) (firewallRec } } -func hasFirewallSucceeded(machineID string, mclient *metalgo.Driver) (bool, error) { - resp, err := mclient.FirewallGet(machineID) - if err != nil { - switch e := err.(type) { - case *metalfirewall.FindFirewallDefault: - if e.Code() >= 500 { - return false, &controllererrors.RequeueAfterError{ - Cause: e, - RequeueAfter: 5 * time.Second, - } - } - default: - return false, e - } - } - - if resp.Firewall == nil || resp.Firewall.Allocation == nil || resp.Firewall.Allocation.Succeeded == nil { - return false, fmt.Errorf("firewall %q was created but has no allocation", machineID) - } - - return *resp.Firewall.Allocation.Succeeded, nil -} - func createFirewall(ctx context.Context, r *firewallReconciler) (machineID string, nodeCIDR string, err error) { - nodeCIDR, err = ensureNodeNetwork(ctx, r) + nodeCIDR, err = ensureNodeNetwork(r) if err != nil { r.logger.Error(err, "firewalls node network", "nodecidr", nodeCIDR) return "", "", &controllererrors.RequeueAfterError{ @@ -550,7 +505,7 @@ func clearIPTags(mclient *metalgo.Driver, ip string) error { return err } -func ensureNodeNetwork(ctx context.Context, r *firewallReconciler) (string, error) { +func ensureNodeNetwork(r *firewallReconciler) (string, error) { if r.cluster.Shoot.Spec.Networking.Nodes != nil { return *r.cluster.Shoot.Spec.Networking.Nodes, nil } @@ -684,7 +639,6 @@ func renderFirewallUserData(kubeconfig string) (string, error) { func deleteFirewallFromStatus(ctx context.Context, r *firewallReconciler) error { r.providerStatus.Firewall.MachineID = "" - r.providerStatus.Firewall.Succeeded = false err := updateProviderStatus(ctx, r.c, r.infrastructure, r.providerStatus, r.infrastructure.Status.NodesCIDR) if err != nil { return err