-
Notifications
You must be signed in to change notification settings - Fork 288
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.
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
use client factory to create namespace #7589
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| package workflows | ||
|
|
||
| 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" | ||
| ) | ||
|
|
||
| // CreateNamespaceIfNotPresent creates the namespace on the cluster if it does not already exist. | ||
| func CreateNamespaceIfNotPresent(ctx context.Context, namespace, kubeconfig string, clientFactory interfaces.ClientFactory) error { | ||
| client, err := clientFactory.BuildClientFromKubeconfig(kubeconfig) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if err := client.Get(ctx, namespace, "", &corev1.Namespace{}); err != nil && !errors.IsNotFound(err) { | ||
| return err | ||
| } else if err == nil { | ||
| return nil | ||
| } | ||
|
|
||
| ns := &corev1.Namespace{ | ||
| TypeMeta: metav1.TypeMeta{ | ||
| APIVersion: "v1", | ||
| Kind: "Namespace", | ||
| }, | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: namespace, | ||
| }, | ||
| } | ||
|
|
||
| if err = client.Create(ctx, ns); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| package workflows_test | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "testing" | ||
|
|
||
| "github.com/golang/mock/gomock" | ||
| corev1 "k8s.io/api/core/v1" | ||
| apierrors "k8s.io/apimachinery/pkg/api/errors" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/runtime/schema" | ||
|
|
||
| clientmocks "github.com/aws/eks-anywhere/pkg/clients/kubernetes/mocks" | ||
| "github.com/aws/eks-anywhere/pkg/workflows" | ||
| "github.com/aws/eks-anywhere/pkg/workflows/interfaces/mocks" | ||
| ) | ||
|
|
||
| type createPrepTestSetup struct { | ||
| t *testing.T | ||
| ctx context.Context | ||
| client *clientmocks.MockClient | ||
| clientFactory *mocks.MockClientFactory | ||
| } | ||
|
|
||
| func newCreatePrepTest(t *testing.T) *createPrepTestSetup { | ||
| mockCtrl := gomock.NewController(t) | ||
| client := clientmocks.NewMockClient(mockCtrl) | ||
| clientFactory := mocks.NewMockClientFactory(mockCtrl) | ||
|
|
||
| return &createPrepTestSetup{ | ||
| t: t, | ||
| ctx: context.Background(), | ||
| client: client, | ||
| clientFactory: clientFactory, | ||
| } | ||
| } | ||
|
|
||
| func newNamespace(name string) *corev1.Namespace { | ||
| return &corev1.Namespace{ | ||
| TypeMeta: metav1.TypeMeta{ | ||
| APIVersion: "v1", | ||
| Kind: "Namespace", | ||
| }, | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: name, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| func TestCreateNamespaceNotExistsSuccess(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(apierrors.NewNotFound(schema.GroupResource{Group: "", Resource: ""}, "")) | ||
| test.client.EXPECT().Create(test.ctx, newNamespace(namespace)).Return(nil) | ||
|
|
||
| err := workflows.CreateNamespaceIfNotPresent(test.ctx, namespace, kubeconfig, test.clientFactory) | ||
| if err != nil { | ||
| t.Fatalf("Expected nil, but got %v", err) | ||
| } | ||
| } | ||
|
|
||
| func TestCreateNamespaceAlreadyExistsSuccess(t *testing.T) { | ||
| test := newCreatePrepTest(t) | ||
| kubeconfig := "testpath" | ||
| namespace := "default" | ||
|
|
||
| test.clientFactory.EXPECT().BuildClientFromKubeconfig(kubeconfig).Return(test.client, nil) | ||
| test.client.EXPECT().Get(test.ctx, namespace, "", &corev1.Namespace{}).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" | ||
| namespace := "test-ns" | ||
|
|
||
| test.clientFactory.EXPECT().BuildClientFromKubeconfig(kubeconfig).Return(test.client, fmt.Errorf("")) | ||
|
|
||
| err := workflows.CreateNamespaceIfNotPresent(test.ctx, namespace, kubeconfig, test.clientFactory) | ||
|
|
||
| if err == nil { | ||
| t.Fatalf("Expected error, but got nil") | ||
| } | ||
| } | ||
|
|
||
| func TestCreateNamespaceGetNamespaceFail(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(fmt.Errorf("")) | ||
|
|
||
| err := workflows.CreateNamespaceIfNotPresent(test.ctx, namespace, kubeconfig, test.clientFactory) | ||
|
|
||
| if err == nil { | ||
| t.Fatalf("Expected error, but got nil") | ||
| } | ||
| } | ||
|
|
||
| func TestCreateNamespaceFail(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(apierrors.NewNotFound(schema.GroupResource{Group: "", Resource: ""}, "")) | ||
| test.client.EXPECT().Create(test.ctx, newNamespace(namespace)).Return(fmt.Errorf("")) | ||
|
|
||
| err := workflows.CreateNamespaceIfNotPresent(test.ctx, namespace, kubeconfig, test.clientFactory) | ||
|
|
||
| if err == nil { | ||
| t.Fatalf("Expected error, but got nil") | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: can we find a different place for this?
Im ok if you move it in a separate pr
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i'll do it in another pr