Skip to content

Commit 3deafb8

Browse files
aniruddha2000aniruddha2000
committed
minimize the setup
1 parent 749384b commit 3deafb8

4 files changed

Lines changed: 14 additions & 25 deletions

File tree

‎pkg/controller/infrastructure/openstack/actuator_delete.go‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ import (
1010

1111
extensionscontroller "github.com/gardener/gardener/extensions/pkg/controller"
1212
"github.com/gardener/gardener/extensions/pkg/util"
13-
gardencorev1beta1 "github.com/gardener/gardener/pkg/apis/core/v1beta1"
14-
gardenerapihelper "github.com/gardener/gardener/pkg/apis/core/v1beta1/helper"
1513
extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
1614
"github.com/go-logr/logr"
1715

@@ -25,13 +23,8 @@ import (
2523

2624
// Delete the Infrastructure config.
2725
func (a *actuator) Delete(ctx context.Context, log logr.Logger, infra *extensionsv1alpha1.Infrastructure, cluster *extensionscontroller.Cluster) error {
28-
err := a.delete(ctx, log, infra, cluster)
29-
if stackitclient.IsConflict(err) {
30-
return gardenerapihelper.NewErrorWithCodes(err, gardencorev1beta1.ErrorInfraDependencies)
31-
}
32-
3326
return util.DetermineError(
34-
err,
27+
a.delete(ctx, log, infra, cluster),
3528
helper.KnownCodes,
3629
)
3730
}

‎pkg/controller/infrastructure/openstack/infraflow/delete.go‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ import (
88
"context"
99
"fmt"
1010

11+
"github.com/gardener/gardener/extensions/pkg/util"
1112
"github.com/gardener/gardener/pkg/utils/flow"
12-
13+
"github.com/stackitcloud/gardener-extension-provider-stackit/v2/pkg/apis/stackit/helper"
1314
"github.com/stackitcloud/gardener-extension-provider-stackit/v2/pkg/controller/controlplane"
1415
"github.com/stackitcloud/gardener-extension-provider-stackit/v2/pkg/controller/infrastructure/openstack/infraflow/shared"
1516
"github.com/stackitcloud/gardener-extension-provider-stackit/v2/pkg/feature"
@@ -118,7 +119,7 @@ func (fctx *FlowContext) deleteRouter(ctx context.Context) error {
118119

119120
shared.LogFromContext(ctx).Info("deleting...", "router", *routerID)
120121
if err := fctx.networking.DeleteRouter(ctx, *routerID); client.IgnoreNotFoundError(err) != nil {
121-
return fmt.Errorf("failed to delete router: %w", err)
122+
return util.DetermineError(fmt.Errorf("failed to delete router: %w", err), helper.KnownCodes)
122123
}
123124

124125
fctx.state.Set(IdentifierRouter, "")
@@ -133,7 +134,7 @@ func (fctx *FlowContext) deleteNetwork(ctx context.Context) error {
133134

134135
shared.LogFromContext(ctx).Info("deleting...", "network", *networkID)
135136
if err := fctx.networking.DeleteNetwork(ctx, *networkID); client.IgnoreNotFoundError(err) != nil {
136-
return fmt.Errorf("failed to delete network: %w", err)
137+
return util.DetermineError(fmt.Errorf("failed to delete network: %w", err), helper.KnownCodes)
137138
}
138139

139140
fctx.state.Set(NameNetwork, "")
@@ -149,7 +150,7 @@ func (fctx *FlowContext) deleteSubnet(ctx context.Context) error {
149150

150151
shared.LogFromContext(ctx).Info("deleting...", "subnet", *subnetID)
151152
if err := fctx.networking.DeleteSubnet(ctx, *subnetID); client.IgnoreNotFoundError(err) != nil {
152-
return fmt.Errorf("failed to delete subnet: %w", err)
153+
return util.DetermineError(fmt.Errorf("failed to delete subnet: %w", err), helper.KnownCodes)
153154
}
154155
fctx.state.Set(IdentifierSubnet, "")
155156
return nil
@@ -230,7 +231,7 @@ func (fctx *FlowContext) deleteSecGroup(ctx context.Context) error {
230231
if current != nil {
231232
log.Info("deleting...", "securityGroup", current.ID)
232233
if err := fctx.networking.DeleteSecurityGroup(ctx, current.ID); client.IgnoreNotFoundError(err) != nil {
233-
return fmt.Errorf("failed to delete security groups: %w", err)
234+
return util.DetermineError(fmt.Errorf("failed to delete security groups: %w", err), helper.KnownCodes)
234235
}
235236
}
236237
fctx.state.Set(NameSecGroup, "")
@@ -267,7 +268,7 @@ func (fctx *FlowContext) deleteSSHKeyPair(ctx context.Context) error {
267268
if current != nil {
268269
log.Info("deleting ssh keypair...")
269270
if err := fctx.compute.DeleteKeyPair(ctx, current.Name); client.IgnoreNotFoundError(err) != nil {
270-
return fmt.Errorf("failed to delete SSH key pair: %w", err)
271+
return util.DetermineError(fmt.Errorf("failed to delete SSH key pair: %w", err), helper.KnownCodes)
271272
}
272273
}
273274
return nil
@@ -282,7 +283,7 @@ func (fctx *FlowContext) deleteStackitSSHKeyPair(ctx context.Context) error {
282283
if current != nil {
283284
log.Info("deleting stackit ssh keypair...")
284285
if err := fctx.iaasClient.DeleteKeypair(ctx, *current.Name); client.IgnoreNotFoundError(err) != nil {
285-
return fmt.Errorf("failed to delete STACKIT SSH key pair: %w", err)
286+
return util.DetermineError(fmt.Errorf("failed to delete STACKIT SSH key pair: %w", err), helper.KnownCodes)
286287
}
287288
}
288289
return nil

‎pkg/controller/infrastructure/stackit/actuator_delete.go‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ import (
1010

1111
extensionscontroller "github.com/gardener/gardener/extensions/pkg/controller"
1212
"github.com/gardener/gardener/extensions/pkg/util"
13-
gardencorev1beta1 "github.com/gardener/gardener/pkg/apis/core/v1beta1"
14-
gardenerapihelper "github.com/gardener/gardener/pkg/apis/core/v1beta1/helper"
1513
extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
1614
"github.com/go-logr/logr"
1715

@@ -25,13 +23,8 @@ import (
2523

2624
// Delete the Infrastructure config.
2725
func (a *actuator) Delete(ctx context.Context, log logr.Logger, infra *extensionsv1alpha1.Infrastructure, cluster *extensionscontroller.Cluster) error {
28-
err := a.delete(ctx, log, infra, cluster)
29-
if stackitclient.IsConflict(err) {
30-
return gardenerapihelper.NewErrorWithCodes(err, gardencorev1beta1.ErrorInfraDependencies)
31-
}
32-
3326
return util.DetermineError(
34-
err,
27+
a.delete(ctx, log, infra, cluster),
3528
helper.KnownCodes,
3629
)
3730
}

‎pkg/controller/infrastructure/stackit/infraflow/delete.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ import (
44
"context"
55
"fmt"
66

7+
"github.com/gardener/gardener/extensions/pkg/util"
78
"github.com/gardener/gardener/pkg/utils/flow"
9+
"github.com/stackitcloud/gardener-extension-provider-stackit/v2/pkg/apis/stackit/helper"
810

911
"github.com/stackitcloud/gardener-extension-provider-stackit/v2/pkg/controller/controlplane"
1012
"github.com/stackitcloud/gardener-extension-provider-stackit/v2/pkg/controller/infrastructure/openstack/infraflow/shared"
@@ -110,7 +112,7 @@ func (fctx *FlowContext) deleteIsolatedNetwork(ctx context.Context) error {
110112
}
111113

112114
if err := fctx.iaasClient.DeleteNetwork(ctx, *networkID); stackitclient.IgnoreNotFoundError(err) != nil {
113-
return fmt.Errorf("failed to delete network: %w", err)
115+
return util.DetermineError(fmt.Errorf("failed to delete network: %w", err), helper.KnownCodes)
114116
}
115117
fctx.state.Set(NameNetwork, "")
116118
fctx.state.Set(IdentifierNetwork, "")
@@ -126,7 +128,7 @@ func (fctx *FlowContext) deleteSecGroup(ctx context.Context) error {
126128
if current != nil {
127129
log.Info("deleting...", "securityGroup", current.GetId())
128130
if err := fctx.iaasClient.DeleteSecurityGroup(ctx, current.GetId()); stackitclient.IgnoreNotFoundError(err) != nil {
129-
return fmt.Errorf("failed to delete security group: %w", err)
131+
return util.DetermineError(fmt.Errorf("failed to delete security group: %w", err), helper.KnownCodes)
130132
}
131133
}
132134
fctx.state.Set(NameSecGroup, "")

0 commit comments

Comments
 (0)