Merge pull request #233 from yevgeny-shnaidman/yevgeny/adding-getters

Adding Getters to the Deployment and Daemonset interfaces

Author: k8s-ci-robot

internal/daemonset/daemonset.go

@@ -37,6 +37,7 @@ type DaemonsetAPI interface {
 	SetTopologyDaemonsetAsDesired(ctx context.Context, nfdInstance *nfdv1.NodeFeatureDiscovery, topologyDS *appsv1.DaemonSet) error
 	SetWorkerDaemonsetAsDesired(ctx context.Context, nfdInstance *nfdv1.NodeFeatureDiscovery, workerDS *appsv1.DaemonSet) error
 	DeleteDaemonSet(ctx context.Context, namespace, name string) error
+	GetDaemonSet(ctx context.Context, namespace, name string) (*appsv1.DaemonSet, error)
 }
 
 type daemonset struct {
@@ -101,6 +102,12 @@ func (d *daemonset) DeleteDaemonSet(ctx context.Context, namespace, name string)
 	return nil
 }
 
+func (d *daemonset) GetDaemonSet(ctx context.Context, namespace, name string) (*appsv1.DaemonSet, error) {
+	ds := &appsv1.DaemonSet{}
+	err := d.client.Get(ctx, client.ObjectKey{Namespace: namespace, Name: name}, ds)
+	return ds, err
+}
+
 func getImagePullPolicy(nfdInstance *nfdv1.NodeFeatureDiscovery) corev1.PullPolicy {
 	if nfdInstance.Spec.Operand.ImagePullPolicy != "" {
 		return corev1.PullPolicy(nfdInstance.Spec.Operand.ImagePullPolicy)

internal/daemonset/daemonset_test.go

@@ -28,6 +28,7 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
 	nfdv1 "sigs.k8s.io/node-feature-discovery-operator/api/v1"
 	"sigs.k8s.io/node-feature-discovery-operator/internal/client"
 	"sigs.k8s.io/yaml"
@@ -166,3 +167,43 @@ var _ = Describe("DeleteDaemonSet", func() {
 		Expect(err).To(BeNil())
 	})
 })
+
+var _ = Describe("GetDaemonSet", func() {
+	var (
+		ctrl         *gomock.Controller
+		clnt         *client.MockClient
+		daemonsetAPI DaemonsetAPI
+	)
+
+	BeforeEach(func() {
+		ctrl = gomock.NewController(GinkgoT())
+		clnt = client.NewMockClient(ctrl)
+		daemonsetAPI = NewDaemonsetAPI(clnt, scheme)
+	})
+
+	ctx := context.Background()
+	testName := "test-name"
+	testNamespace := "test-namespace"
+
+	It("good flow", func() {
+		expectedDS := &appsv1.DaemonSet{
+			ObjectMeta: metav1.ObjectMeta{Namespace: testNamespace, Name: testName},
+		}
+		clnt.EXPECT().Get(ctx, ctrlclient.ObjectKey{Namespace: testNamespace, Name: testName}, gomock.Any()).DoAndReturn(
+			func(_ interface{}, _ interface{}, ds *appsv1.DaemonSet, _ ...ctrlclient.GetOption) error {
+				ds.SetName(testName)
+				ds.SetNamespace(testNamespace)
+				return nil
+			},
+		)
+		res, err := daemonsetAPI.GetDaemonSet(ctx, testNamespace, testName)
+		Expect(err).To(BeNil())
+		Expect(res).To(Equal(expectedDS))
+	})
+
+	It("error flow", func() {
+		clnt.EXPECT().Get(ctx, ctrlclient.ObjectKey{Namespace: testNamespace, Name: testName}, gomock.Any()).Return(fmt.Errorf("some error"))
+		_, err := daemonsetAPI.GetDaemonSet(ctx, testNamespace, testName)
+		Expect(err).To(HaveOccurred())
+	})
+})

internal/daemonset/mock_daemonset.go

@@ -42,6 +42,7 @@ type DeploymentAPI interface {
 	SetMasterDeploymentAsDesired(nfdInstance *nfdv1.NodeFeatureDiscovery, masterDep *v1.Deployment) error
 	SetGCDeploymentAsDesired(nfdInstance *nfdv1.NodeFeatureDiscovery, gcDep *v1.Deployment) error
 	DeleteDeployment(ctx context.Context, namespace, name string) error
+	GetDeployment(ctx context.Context, namespace, name string) (*v1.Deployment, error)
 }
 
 type deployment struct {
@@ -144,6 +145,12 @@ func (d *deployment) DeleteDeployment(ctx context.Context, namespace, name strin
 	return nil
 }
 
+func (d *deployment) GetDeployment(ctx context.Context, namespace, name string) (*v1.Deployment, error) {
+	dep := &v1.Deployment{}
+	err := d.client.Get(ctx, client.ObjectKey{Namespace: namespace, Name: name}, dep)
+	return dep, err
+}
+
 func getPodsTolerations() []corev1.Toleration {
 	return []corev1.Toleration{
 		{

internal/deployment/deployment.go

@@ -28,6 +28,7 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
 	nfdv1 "sigs.k8s.io/node-feature-discovery-operator/api/v1"
 	"sigs.k8s.io/node-feature-discovery-operator/internal/client"
 	"sigs.k8s.io/yaml"
@@ -161,3 +162,43 @@ var _ = Describe("DeleteDeployment", func() {
 		Expect(err).To(BeNil())
 	})
 })
+
+var _ = Describe("GetDeployment", func() {
+	var (
+		ctrl          *gomock.Controller
+		clnt          *client.MockClient
+		deploymentAPI DeploymentAPI
+	)
+
+	BeforeEach(func() {
+		ctrl = gomock.NewController(GinkgoT())
+		clnt = client.NewMockClient(ctrl)
+		deploymentAPI = NewDeploymentAPI(clnt, scheme)
+	})
+
+	ctx := context.Background()
+	testName := "test-name"
+	testNamespace := "test-namespace"
+
+	It("good flow", func() {
+		expectedDep := &appsv1.Deployment{
+			ObjectMeta: metav1.ObjectMeta{Namespace: testNamespace, Name: testName},
+		}
+		clnt.EXPECT().Get(ctx, ctrlclient.ObjectKey{Namespace: testNamespace, Name: testName}, gomock.Any()).DoAndReturn(
+			func(_ interface{}, _ interface{}, dep *appsv1.Deployment, _ ...ctrlclient.GetOption) error {
+				dep.SetName(testName)
+				dep.SetNamespace(testNamespace)
+				return nil
+			},
+		)
+		res, err := deploymentAPI.GetDeployment(ctx, testNamespace, testName)
+		Expect(err).To(BeNil())
+		Expect(res).To(Equal(expectedDep))
+	})
+
+	It("error flow", func() {
+		clnt.EXPECT().Get(ctx, ctrlclient.ObjectKey{Namespace: testNamespace, Name: testName}, gomock.Any()).Return(fmt.Errorf("some error"))
+		_, err := deploymentAPI.GetDeployment(ctx, testNamespace, testName)
+		Expect(err).To(HaveOccurred())
+	})
+})