Merge pull request #260 from yevgeny-shnaidman/yevgeny/master-worker-envs-impl

MasterENVs and WorkerENVs implementations

Author: k8s-ci-robot

internal/daemonset/daemonset.go

@@ -122,7 +122,12 @@ func getArgs(nfdInstance *nfdv1.NodeFeatureDiscovery) []string {
 	}
 }
 
-func getWorkerEnvs() []corev1.EnvVar {
+func getWorkerEnvs(nfdInstance *nfdv1.NodeFeatureDiscovery) []corev1.EnvVar {
+	basicEnvVars := getBasicEnvs()
+	return append(basicEnvVars, nfdInstance.Spec.Operand.WorkerEnvs...)
+}
+
+func getBasicEnvs() []corev1.EnvVar {
 	return []corev1.EnvVar{
 		{
 			Name: "NODE_NAME",
@@ -149,6 +154,7 @@ func getWorkerEnvs() []corev1.EnvVar {
 			},
 		},
 	}
+
 }
 
 func getTopologyEnvs() []corev1.EnvVar {
@@ -160,7 +166,7 @@ func getTopologyEnvs() []corev1.EnvVar {
 			},
 		},
 	}
-	return append(getWorkerEnvs(), nodeAddressEnv)
+	return append(getBasicEnvs(), nodeAddressEnv)
 }
 
 func getSecurityContext() *corev1.SecurityContext {
@@ -246,7 +252,7 @@ func (d *daemonset) SetWorkerDaemonsetAsDesired(ctx context.Context, nfdInstance
 				DNSPolicy:          corev1.DNSClusterFirstWithHostNet,
 				Containers: []corev1.Container{
 					{
-						Env:             getWorkerEnvs(),
+						Env:             getWorkerEnvs(nfdInstance),
 						Image:           nfdInstance.Spec.Operand.ImagePath(),
 						Name:            "nfd-worker",
 						Command:         []string{"nfd-worker"},

internal/daemonset/daemonset_test.go

@@ -25,6 +25,7 @@ import (
 	. "github.com/onsi/gomega"
 	"go.uber.org/mock/gomock"
 	appsv1 "k8s.io/api/apps/v1"
+	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"
@@ -207,3 +208,55 @@ var _ = Describe("GetDaemonSet", func() {
 		Expect(err).To(HaveOccurred())
 	})
 })
+
+var _ = Describe("getWorkerEnvs", func() {
+
+	It("worker envs not defined (nil)", func() {
+		nfdCR := nfdv1.NodeFeatureDiscovery{
+			Spec: nfdv1.NodeFeatureDiscoverySpec{
+				Operand: nfdv1.OperandSpec{
+					WorkerEnvs: nil,
+				},
+			},
+		}
+
+		res := getWorkerEnvs(&nfdCR)
+		Expect(res).To(Equal(getBasicEnvs()))
+	})
+
+	It("worker envs is an empty slice", func() {
+		nfdCR := nfdv1.NodeFeatureDiscovery{
+			Spec: nfdv1.NodeFeatureDiscoverySpec{
+				Operand: nfdv1.OperandSpec{
+					WorkerEnvs: []corev1.EnvVar{},
+				},
+			},
+		}
+
+		res := getWorkerEnvs(&nfdCR)
+		Expect(res).To(Equal(getBasicEnvs()))
+	})
+
+	It("worker envs contains value", func() {
+		nfdCR := nfdv1.NodeFeatureDiscovery{
+			Spec: nfdv1.NodeFeatureDiscoverySpec{
+				Operand: nfdv1.OperandSpec{
+					WorkerEnvs: []corev1.EnvVar{
+						{
+							Name:  "name1",
+							Value: "value1",
+						},
+						{
+							Name:  "name2",
+							Value: "value2",
+						},
+					},
+				},
+			},
+		}
+		expectedRes := append(getBasicEnvs(), nfdCR.Spec.Operand.WorkerEnvs[0], nfdCR.Spec.Operand.WorkerEnvs[1])
+
+		res := getWorkerEnvs(&nfdCR)
+		Expect(res).To(Equal(expectedRes))
+	})
+})

internal/deployment/deployment.go

@@ -85,7 +85,7 @@ func (d *deployment) SetMasterDeploymentAsDesired(nfdInstance *nfdv1.NodeFeature
 							"nfd-master",
 						},
 						Args:            getArgs(nfdInstance),
-						Env:             getEnvs(),
+						Env:             getMasterEnvs(nfdInstance),
 						SecurityContext: getMasterSecurityContext(),
 						LivenessProbe:   getLivenessProbe(),
 						ReadinessProbe:  getReadinessProbe(),
@@ -246,6 +246,10 @@ func getEnvs() []corev1.EnvVar {
 	}
 }
 
+func getMasterEnvs(nfdInstance *nfdv1.NodeFeatureDiscovery) []corev1.EnvVar {
+	return append(getEnvs(), nfdInstance.Spec.Operand.MasterEnvs...)
+}
+
 func getMasterSecurityContext() *corev1.SecurityContext {
 	return &corev1.SecurityContext{
 		RunAsNonRoot: ptr.To(true),

internal/deployment/deployment_test.go

@@ -277,3 +277,54 @@ var _ = Describe("getPodsTolerations", func() {
 		Expect(res).To(Equal(expectedTolerations))
 	})
 })
+
+var _ = Describe("getMasterEnvs", func() {
+	It("master envs not defined (nil)", func() {
+		nfdCR := nfdv1.NodeFeatureDiscovery{
+			Spec: nfdv1.NodeFeatureDiscoverySpec{
+				Operand: nfdv1.OperandSpec{
+					MasterEnvs: nil,
+				},
+			},
+		}
+
+		res := getMasterEnvs(&nfdCR)
+		Expect(res).To(Equal(getEnvs()))
+	})
+
+	It("master envs is an empty slice", func() {
+		nfdCR := nfdv1.NodeFeatureDiscovery{
+			Spec: nfdv1.NodeFeatureDiscoverySpec{
+				Operand: nfdv1.OperandSpec{
+					MasterEnvs: []corev1.EnvVar{},
+				},
+			},
+		}
+
+		res := getMasterEnvs(&nfdCR)
+		Expect(res).To(Equal(getEnvs()))
+	})
+
+	It("master envs contains value", func() {
+		nfdCR := nfdv1.NodeFeatureDiscovery{
+			Spec: nfdv1.NodeFeatureDiscoverySpec{
+				Operand: nfdv1.OperandSpec{
+					MasterEnvs: []corev1.EnvVar{
+						{
+							Name:  "name1",
+							Value: "value1",
+						},
+						{
+							Name:  "name2",
+							Value: "value2",
+						},
+					},
+				},
+			},
+		}
+		expectedRes := append(getEnvs(), nfdCR.Spec.Operand.MasterEnvs[0], nfdCR.Spec.Operand.MasterEnvs[1])
+
+		res := getMasterEnvs(&nfdCR)
+		Expect(res).To(Equal(expectedRes))
+	})
+})