Merge pull request #344 from karelyatin/downward_api

Reuse env.DownwardAPI from lib-common
openstack-k8s-operators · Aug 21, 2024 · 6a2f34f · 6a2f34f
2 parents 9459682 + de0fc05
commit 6a2f34f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 18 deletions.
diff --git a/pkg/ovncontroller/configjob.go b/pkg/ovncontroller/configjob.go
@@ -63,7 +63,7 @@ func ConfigJob(
 	envVars["OVNAvailabilityZones"] = env.SetValue(strings.Join(instance.Spec.ExternalIDS.OvnAvailabilityZones, ":"))
 	envVars["EnableChassisAsGateway"] = env.SetValue(fmt.Sprintf("%t", *instance.Spec.ExternalIDS.EnableChassisAsGateway))
 	envVars["PhysicalNetworks"] = env.SetValue(getPhysicalNetworks(instance))
-	envVars["OVNHostName"] = EnvDownwardAPI("spec.nodeName")
+	envVars["OVNHostName"] = env.DownwardAPI("spec.nodeName")
 
 	for _, ovnPod := range ovnPods.Items {
 		jobs = append(

diff --git a/pkg/ovncontroller/utils.go b/pkg/ovncontroller/utils.go
@@ -18,7 +18,6 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/openstack-k8s-operators/lib-common/modules/common/env"
 	ovnv1 "github.com/openstack-k8s-operators/ovn-operator/api/v1beta1"
 	"golang.org/x/exp/maps"
 	corev1 "k8s.io/api/core/v1"
@@ -59,19 +58,3 @@ func getOVNControllerPods(
 
 	return podList, nil
 }
-
-// EnvDownwardAPI - set env from FieldRef->FieldPath, e.g. status.podIP
-func EnvDownwardAPI(field string) env.Setter {
-	return func(env *corev1.EnvVar) {
-		if env.ValueFrom == nil {
-			env.ValueFrom = &corev1.EnvVarSource{}
-		}
-		env.Value = ""
-
-		if env.ValueFrom.FieldRef == nil {
-			env.ValueFrom.FieldRef = &corev1.ObjectFieldSelector{}
-		}
-
-		env.ValueFrom.FieldRef.FieldPath = field
-	}
-}