Merge pull request #114 from e0ne/cleanup

Cleanup pkg/utils/utils.go

Author: moshe010

pkg/state/state_nv_peer.go

@@ -1,6 +1,8 @@
 package state
 
 import (
+	"os"
+
 	"github.com/pkg/errors"
 	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -141,9 +143,9 @@ func (s *stateNVPeer) getManifestObjects(
 			CPUArch:     attrs[0].Attributes[nodeinfo.AttrTypeCPUArch],
 			OSName:      attrs[0].Attributes[nodeinfo.AttrTypeOSName],
 			OSVer:       attrs[0].Attributes[nodeinfo.AttrTypeOSVer],
-			HTTPProxy:   utils.GetEnv(consts.HTTPProxy),
-			HTTPSProxy:  utils.GetEnv(consts.HTTPSProxy),
-			NoProxy:     utils.GetEnv(consts.NoProxy),
+			HTTPProxy:   os.Getenv(consts.HTTPProxy),
+			HTTPSProxy:  os.Getenv(consts.HTTPSProxy),
+			NoProxy:     os.Getenv(consts.NoProxy),
 		},
 	}
 	// render objects

pkg/state/state_ofed.go

@@ -17,6 +17,8 @@ limitations under the License.
 package state
 
 import (
+	"os"
+
 	"github.com/pkg/errors"
 	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -154,9 +156,9 @@ func (s *stateOFED) getManifestObjects(
 			CPUArch:     attrs[0].Attributes[nodeinfo.AttrTypeCPUArch],
 			OSName:      attrs[0].Attributes[nodeinfo.AttrTypeOSName],
 			OSVer:       attrs[0].Attributes[nodeinfo.AttrTypeOSVer],
-			HTTPProxy:   utils.GetEnv(consts.HTTPProxy),
-			HTTPSProxy:  utils.GetEnv(consts.HTTPSProxy),
-			NoProxy:     utils.GetEnv(consts.NoProxy),
+			HTTPProxy:   os.Getenv(consts.HTTPProxy),
+			HTTPSProxy:  os.Getenv(consts.HTTPSProxy),
+			NoProxy:     os.Getenv(consts.NoProxy),
 		},
 	}
 	// render objects

pkg/utils/utils.go

@@ -22,7 +22,6 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
 
 // GetFilesWithSuffix returns all files under a given base directory that have a specific suffix
@@ -54,12 +53,3 @@ func GetFilesWithSuffix(baseDir string, suffixes ...string) ([]string, error) {
 	}
 	return files, nil
 }
-
-func IsCRD(obj *unstructured.Unstructured) bool {
-	return obj.GetKind() == "CustomResourceDefinition"
-}
-
-// Getenv retrieves the value of the environment variable
-func GetEnv(name string) string {
-	return os.Getenv(name)
-}