fix: import terminating ns

mhrabovcin · Jun 1, 2023 · b30a0a2 · b30a0a2
1 parent 76c5aca
commit b30a0a2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/pkg/rewriter/namespace.go b/pkg/rewriter/namespace.go
@@ -5,6 +5,7 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 var _ ResourceRewriter = (*deletedNamespace)(nil)
@@ -21,12 +22,8 @@ type deletedNamespace struct{}
 
 func (deletedNamespace) BeforeImport(u *unstructured.Unstructured) error {
 	// Only process Namespace kinds
-	if u.GetKind() != "Namespace" && u.GetAPIVersion() != "" {
-		return nil
-	}
-
-	// Only deleted namespaces could be in Terminating phase
-	if u.GetDeletionTimestamp() == nil {
+	isNamespaceKind := MatchGVK(schema.FromAPIVersionAndKind("v1", "Namespace"))
+	if !isNamespaceKind(u) {
 		return nil
 	}
 

diff --git a/pkg/rewriter/namespace_test.go b/pkg/rewriter/namespace_test.go
@@ -11,6 +11,10 @@ import (
 
 func TestDeletedNamespace_ReplaceStatus(t *testing.T) {
 	ns := &corev1.Namespace{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "Namespace",
+			APIVersion: "v1",
+		},
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "test",
 			DeletionTimestamp: &metav1.Time{
@@ -36,6 +40,10 @@ func TestDeletedNamespace_ReplaceStatus(t *testing.T) {
 
 func TestDeletedNamespace_Active(t *testing.T) {
 	ns := &corev1.Namespace{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "Namespace",
+			APIVersion: "v1",
+		},
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "test",
 		},