Merge pull request #61 from srl-labs/tests/topology-tests

Tests/topology tests

.golangci.yaml

@@ -145,6 +145,10 @@ issues:
         - funlen
         - gochecknoglobals
 
+    - path: logging/fake.go
+      linters:
+        - revive
+
     # ignore globals for standard k8s things
     - linters:
         - gochecknoglobals

clabverter/files.go

@@ -6,6 +6,8 @@ import (
 	"strings"
 	"text/template"
 
+	clabernetesutilkubernetes "github.com/srl-labs/clabernetes/util/kubernetes"
+
 	clabernetesutil "github.com/srl-labs/clabernetes/util"
 	clabernetesutilcontainerlab "github.com/srl-labs/clabernetes/util/containerlab"
 )
@@ -262,7 +264,7 @@ func (c *Clabverter) handleExtraFiles() error {
 		c.extraFilesConfigMaps[nodeName] = make([]topologyConfigMapTemplateVars, 0)
 
 		for extraFilePath, extraFileContent := range nodeExtraFiles {
-			safeFileName := clabernetesutil.SafeConcatNameKubernetes(
+			safeFileName := clabernetesutilkubernetes.SafeConcatNameKubernetes(
 				strings.Split(extraFilePath, "/")...)
 
 			safeFileName = strings.TrimPrefix(safeFileName, "-")

clicker/clabernetes.go

@@ -9,6 +9,8 @@ import (
 	"sync"
 	"time"
 
+	clabernetesutilkubernetes "github.com/srl-labs/clabernetes/util/kubernetes"
+
 	"gopkg.in/yaml.v3"
 
 	claberneteserrors "github.com/srl-labs/clabernetes/errors"
@@ -203,7 +205,7 @@ func (c *clabernetes) run() error {
 func (c *clabernetes) setup() error {
 	var err error
 
-	c.namespace, err = clabernetesutil.CurrentNamespace()
+	c.namespace, err = clabernetesutilkubernetes.CurrentNamespace()
 	if err != nil {
 		c.logger.Criticalf("failed getting current namespace, err: %s", err)
 
@@ -318,7 +320,7 @@ func envToResources() (k8scorev1.ResourceRequirements, error) {
 		return out, nil
 	}
 
-	parsedOut, err := clabernetesutil.YAMLToK8sResourceRequirements(asStr)
+	parsedOut, err := clabernetesutilkubernetes.YAMLToK8sResourceRequirements(asStr)
 	if err != nil {
 		return out, err
 	}

config/manager.go

@@ -25,6 +25,9 @@ var (
 	managerInstanceOnce sync.Once //nolint:gochecknoglobals
 )
 
+// ManagerGetterFunc returns an instance of the config manager.
+type ManagerGetterFunc func() Manager
+
 // InitManager initializes the config manager -- it does this once only, its a no-op if the manager
 // is already initialized.
 func InitManager(ctx context.Context, appName, namespace string, client *kubernetes.Clientset) {

constants/kubernetes.go

@@ -0,0 +1,18 @@
+package constants
+
+const (
+	// KubernetesConfigMap is a const to use for "configmap".
+	KubernetesConfigMap = "configmap"
+
+	// KubernetesService is a const to use for "service".
+	KubernetesService = "service"
+
+	// KubernetesDeployment is a const to use for "deployment".
+	KubernetesDeployment = "deployment"
+
+	// KubernetesServiceClusterIPType is a const to use for "ClusterIP".
+	KubernetesServiceClusterIPType = "ClusterIP"
+
+	// KubernetesServiceLoadBalancerType is a const to use for "LoadBalancer".
+	KubernetesServiceLoadBalancerType = "LoadBalancer"
+)

controllers/base.go

@@ -4,6 +4,8 @@ import (
 	"context"
 	"fmt"
 
+	clabernetesutilkubernetes "github.com/srl-labs/clabernetes/util/kubernetes"
+
 	ctrlruntimeevent "sigs.k8s.io/controller-runtime/pkg/event"
 	ctrlruntimepredicate "sigs.k8s.io/controller-runtime/pkg/predicate"
 
@@ -58,7 +60,7 @@ func NewBaseController(
 	return &BaseController{
 		Ctx:                 ctx,
 		AppName:             appName,
-		ControllerNamespace: clabernetesutil.MustCurrentNamespace(),
+		ControllerNamespace: clabernetesutilkubernetes.MustCurrentNamespace(),
 		Log:                 logger,
 		Config:              config,
 		Client:              client,
@@ -127,3 +129,12 @@ func (c *BaseController) LogReconcileCompleteObjectNotExist(_ ctrlruntime.Reques
 func (c *BaseController) LogReconcileFailedGettingObject(req ctrlruntime.Request, err error) {
 	c.Log.Criticalf("failed fetching '%s/%s', error: %s", req.Namespace, req.Name, err)
 }
+
+// GetServiceDNSSuffix returns the default "svc.cluster.local" dns suffix, or the user's provided
+// override value.
+func (c *BaseController) GetServiceDNSSuffix() string {
+	return clabernetesutil.GetEnvStrOrDefault(
+		clabernetesconstants.InClusterDNSSuffixEnv,
+		clabernetesconstants.DefaultInClusterDNSSuffix,
+	)
+}