Skip to content

Return gardener user error for unmanaged resource on cluster delete #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aniruddha2000 wants to merge 10 commits into
base: main
Choose a base branch
from
+42 −2
Open

Return gardener user error for unmanaged resource on cluster delete #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4ea5da9
add graceful deletion in infraflow delete
aniruddha2000 Feb 25, 2026
d0ed8d7
add graceful deletion in infraflow delete
aniruddha2000 Feb 25, 2026
8fc3310
wip
aniruddha2000 Feb 25, 2026
a5b831a
wip
aniruddha2000 Feb 25, 2026
5609a3c
wip
aniruddha2000 Feb 25, 2026
15ec062
fix linting
aniruddha2000 Feb 26, 2026
749384b
minimize the setup
aniruddha2000 Feb 26, 2026
aa46c7d
minimize the setup
aniruddha2000 Feb 26, 2026
caf4903
minimize the setup
aniruddha2000 Feb 26, 2026
281fccb
minimize the setup
aniruddha2000 Feb 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion pkg/controller/infrastructure/openstack/actuator_delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import (

extensionscontroller "github.com/gardener/gardener/extensions/pkg/controller"
"github.com/gardener/gardener/extensions/pkg/util"
gardencorev1beta1 "github.com/gardener/gardener/pkg/apis/core/v1beta1"
gardenerapihelper "github.com/gardener/gardener/pkg/apis/core/v1beta1/helper"
extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
"github.com/go-logr/logr"

Expand All @@ -23,8 +25,13 @@ import (

// Delete the Infrastructure config.
func (a *actuator) Delete(ctx context.Context, log logr.Logger, infra *extensionsv1alpha1.Infrastructure, cluster *extensionscontroller.Cluster) error {
err := a.delete(ctx, log, infra, cluster)
if openstackclient.IsConflict(err) {
return gardenerapihelper.NewErrorWithCodes(err, gardencorev1beta1.ErrorInfraDependencies)
}

return util.DetermineError(
a.delete(ctx, log, infra, cluster),
err,
helper.KnownCodes,
)
}
Expand Down
9 changes: 8 additions & 1 deletion pkg/controller/infrastructure/stackit/actuator_delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import (

extensionscontroller "github.com/gardener/gardener/extensions/pkg/controller"
"github.com/gardener/gardener/extensions/pkg/util"
gardencorev1beta1 "github.com/gardener/gardener/pkg/apis/core/v1beta1"
gardenerapihelper "github.com/gardener/gardener/pkg/apis/core/v1beta1/helper"
extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
"github.com/go-logr/logr"

Expand All @@ -23,8 +25,13 @@ import (

// Delete the Infrastructure config.
func (a *actuator) Delete(ctx context.Context, log logr.Logger, infra *extensionsv1alpha1.Infrastructure, cluster *extensionscontroller.Cluster) error {
err := a.delete(ctx, log, infra, cluster)
if stackitclient.IsConflict(err) {
return gardenerapihelper.NewErrorWithCodes(err, gardencorev1beta1.ErrorInfraDependencies)
}

return util.DetermineError(
a.delete(ctx, log, infra, cluster),
err,
helper.KnownCodes,
)
}
Expand Down
24 changes: 24 additions & 0 deletions pkg/openstack/client/errors.go
View file
Open in desktop
Copy link

@nschad nschad Feb 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please do it like this

gardener-extension-provider-stackit/pkg/openstack/client/client.go

Lines 216 to 226 in 281fccb

func IsNotFoundError(err error) bool {
if err == nil {
return false
}
if gophercloud.ResponseCodeIs(err, http.StatusNotFound) {
return true
}
return false
}

Just add a util function within the same file.

Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package client

import (
"errors"
"net/http"
)

// StatusCodeError is a common interface implemented by Error and the SDK's GenericOpenAPIError.
type StatusCodeError interface {
error
GetStatusCode() int
}

// GetStatusCode returns the attached error code if the given error implements StatusCodeError or 0 otherwise.
func GetStatusCode(err error) int {
var statusCodeError StatusCodeError
if ok := errors.As(err, &statusCodeError); !ok {
return 0
}

return statusCodeError.GetStatusCode()
}

func IsConflict(err error) bool { return GetStatusCode(err) == http.StatusConflict }
2 changes: 2 additions & 0 deletions pkg/stackit/client/errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ func IsNotFound(err error) bool {
return GetStatusCode(err) == http.StatusNotFound
}

func IsConflict(err error) bool { return GetStatusCode(err) == http.StatusConflict }

// IgnoreNotFoundError ignore not found error
func IgnoreNotFoundError(err error) error {
if IsNotFound(err) {
Expand Down