Skip to content

Commit 6f665fd

Browse files
committed
check invalid TG ARN when deleting TGB
1 parent e211bfc commit 6f665fd

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

apis/elbv2/v1alpha1/zz_generated.deepcopy.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/elbv2/v1beta1/zz_generated.deepcopy.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/targetgroupbinding/resource_manager.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,12 +214,16 @@ func (m *defaultResourceManager) cleanupTargets(ctx context.Context, tgb *elbv2a
214214
if err != nil {
215215
if isELBV2TargetGroupNotFoundError(err) {
216216
return nil
217+
} else if isELBV2TargetGroupARNInvalidError(err) {
218+
return nil
217219
}
218220
return err
219221
}
220222
if err := m.deregisterTargets(ctx, tgb.Spec.TargetGroupARN, targets); err != nil {
221223
if isELBV2TargetGroupNotFoundError(err) {
222224
return nil
225+
} else if isELBV2TargetGroupARNInvalidError(err) {
226+
return nil
223227
}
224228
return err
225229
}
@@ -506,3 +510,11 @@ func isELBV2TargetGroupNotFoundError(err error) bool {
506510
}
507511
return false
508512
}
513+
514+
func isELBV2TargetGroupARNInvalidError(err error) bool {
515+
var awsErr awserr.Error
516+
if errors.As(err, &awsErr) {
517+
return awsErr.Code() == "ValidationError"
518+
}
519+
return false
520+
}

0 commit comments

Comments
 (0)