List namespaces instead of get due to scope

aws · Feb 15, 2024 · 5b16bc2 · 5b16bc2
1 parent 379dbca
commit 5b16bc2
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 11 deletions.
diff --git a/cmd/eksctl-anywhere/cmd/createcluster.go b/cmd/eksctl-anywhere/cmd/createcluster.go
@@ -270,7 +270,7 @@ func (cc *createClusterOptions) createCluster(cmd *cobra.Command, _ []string) er
 			deps.EksdInstaller,
 			deps.PackageInstaller,
 			deps.ClusterCreator,
-			deps.UnAuthKubeClient,
+			deps.UnAuthKubectlClient,
 		)
 		err = createWorkloadCluster.Run(ctx, clusterSpec, createValidations)
 

diff --git a/pkg/workflows/create_prep.go b/pkg/workflows/create_prep.go
@@ -4,7 +4,6 @@ import (
 	"context"
 
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/aws/eks-anywhere/pkg/workflows/interfaces"
@@ -17,11 +16,27 @@ func CreateNamespaceIfNotPresent(ctx context.Context, namespace, kubeconfig stri
 		return err
 	}
 
-	if err := client.Get(ctx, namespace, "", &corev1.Namespace{}); err != nil && !errors.IsNotFound(err) {
+	namespaces := &corev1.NamespaceList{Items: []corev1.Namespace{{ObjectMeta: metav1.ObjectMeta{Name: "default"}}}}
+	if err := client.List(ctx, namespaces); err != nil {
 		return err
 	}
 
+	var found bool = false
+	for _, ns := range namespaces.Items {
+		if ns.Name == namespace {
+			found = true
+		}
+	}
+
+	if found {
+		return nil
+	}
+
 	ns := &corev1.Namespace{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "v1",
+			Kind:       "Namespace",
+		},
 		ObjectMeta: metav1.ObjectMeta{
 			Name: namespace,
 		},

diff --git a/pkg/workflows/create_prep_test.go b/pkg/workflows/create_prep_test.go
@@ -7,9 +7,7 @@ import (
 
 	"github.com/golang/mock/gomock"
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/errors"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime/schema"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	clientmocks "github.com/aws/eks-anywhere/pkg/clients/kubernetes/mocks"
 	"github.com/aws/eks-anywhere/pkg/workflows"
@@ -38,19 +36,23 @@ func newCreatePrepTest(t *testing.T) *createPrepTestSetup {
 
 func newNamespace(name string) *corev1.Namespace {
 	return &corev1.Namespace{
-		ObjectMeta: v1.ObjectMeta{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "v1",
+			Kind:       "Namespace",
+		},
+		ObjectMeta: metav1.ObjectMeta{
 			Name: name,
 		},
 	}
 }
 
-func TestCreateNamespaceNotExists(t *testing.T) {
+func TestCreateNamespaceSuccess(t *testing.T) {
 	test := newCreatePrepTest(t)
 	kubeconfig := "testpath"
 	namespace := "test-ns"
 
 	test.clientFactory.EXPECT().BuildClientFromKubeconfig(kubeconfig).Return(test.client, nil)
-	test.client.EXPECT().Get(test.ctx, namespace, "", &corev1.Namespace{}).Return(errors.NewNotFound(schema.GroupResource{}, ""))
+	test.client.EXPECT().List(test.ctx, gomock.AssignableToTypeOf(&corev1.NamespaceList{})).Return(nil)
 	test.client.EXPECT().Create(test.ctx, newNamespace(namespace)).Return(nil)
 
 	err := workflows.CreateNamespaceIfNotPresent(test.ctx, namespace, kubeconfig, test.clientFactory)
@@ -59,6 +61,20 @@ func TestCreateNamespaceNotExists(t *testing.T) {
 	}
 }
 
+func TestCreateNamespaceAlreadyExists(t *testing.T) {
+	test := newCreatePrepTest(t)
+	kubeconfig := "testpath"
+	namespace := "default"
+
+	test.clientFactory.EXPECT().BuildClientFromKubeconfig(kubeconfig).Return(test.client, nil)
+	test.client.EXPECT().List(test.ctx, gomock.AssignableToTypeOf(&corev1.NamespaceList{})).Return(nil)
+
+	err := workflows.CreateNamespaceIfNotPresent(test.ctx, namespace, kubeconfig, test.clientFactory)
+	if err != nil {
+		t.Fatalf("Expected nil, but got %v", err)
+	}
+}
+
 func TestCreateNamespaceBuildClientFail(t *testing.T) {
 	test := newCreatePrepTest(t)
 	kubeconfig := "testpath"
@@ -79,7 +95,7 @@ func TestCreateNamespaceGetNamespaceFail(t *testing.T) {
 	namespace := "test-ns"
 
 	test.clientFactory.EXPECT().BuildClientFromKubeconfig(kubeconfig).Return(test.client, nil)
-	test.client.EXPECT().Get(test.ctx, namespace, "", &corev1.Namespace{}).Return(fmt.Errorf(""))
+	test.client.EXPECT().List(test.ctx, &corev1.NamespaceList{}).Return(fmt.Errorf(""))
 
 	err := workflows.CreateNamespaceIfNotPresent(test.ctx, namespace, kubeconfig, test.clientFactory)
 
@@ -94,7 +110,7 @@ func TestCreateNamespaceFail(t *testing.T) {
 	namespace := "test-ns"
 
 	test.clientFactory.EXPECT().BuildClientFromKubeconfig(kubeconfig).Return(test.client, nil)
-	test.client.EXPECT().Get(test.ctx, namespace, "", &corev1.Namespace{})
+	test.client.EXPECT().List(test.ctx, &corev1.NamespaceList{}).Return(nil)
 	test.client.EXPECT().Create(test.ctx, newNamespace(namespace)).Return(fmt.Errorf(""))
 
 	err := workflows.CreateNamespaceIfNotPresent(test.ctx, namespace, kubeconfig, test.clientFactory)