Nfd refractoring

pkg/nfd/consts.go

@@ -0,0 +1,22 @@
+package nfd
+
+const (
+	NfdCustomNFDCatalogSourcePublisherName = "Red Hat"
+	NfdCustomCatalogSourceDisplayName      = "Redhat Operators Custom"
+	NfdRhcosLabel                          = "feature.node.kubernetes.io/system-os_release.ID"
+	NfdRhcosLabelValue                     = "rhcos"
+	NfdOperatorNamespace                   = "openshift-nfd"
+	NfdCatalogSourceDefault                = "redhat-operators"
+	NfdCatalogSourceNamespace              = "openshift-marketplace"
+	NfdOperatorDeploymentName              = "nfd-controller-manager"
+	NfdPackage                             = "nfd"
+	NfdCRName                              = "nfd-instance"
+
+	resourceCRD = "NodeFeatureDiscovery"
+	LogLevel    = 100
+
+	//not related to NFD but common consts between gpu and nno
+	UndefinedValue       = "undefined"
+	OperatorVersionFile  = "operator.version"
+	OpenShiftVersionFile = "ocp.version"
+)

pkg/nfd/nodefeaturediscovery.go

@@ -30,12 +30,12 @@ type Builder struct {
 
 // NewBuilderFromObjectString creates a Builder object from CSV alm-examples.
 func NewBuilderFromObjectString(apiClient *clients.Settings, almExample string) *Builder {
-	glog.V(100).Infof(
+	glog.V(LogLevel).Infof(
 		"Initializing new Builder structure from almExample string")
 
 	nodeFeatureDiscovery, err := getNodeFeatureDiscoveryFromAlmExample(almExample)
 
-	glog.V(100).Infof(
+	glog.V(LogLevel).Infof(
 		"Initializing Builder definition to NodeFeatureDiscovery object")
 
 	builder := Builder{
@@ -44,15 +44,15 @@ func NewBuilderFromObjectString(apiClient *clients.Settings, almExample string)
 	}
 
 	if err != nil {
-		glog.V(100).Infof(
+		glog.V(LogLevel).Infof(
 			"Error initializing NodeFeatureDiscovery from alm-examples: %s", err.Error())
 
 		builder.errorMsg = fmt.Sprintf("Error initializing NodeFeatureDiscovery from alm-examples: %s",
 			err.Error())
 	}
 
 	if builder.Definition == nil {
-		glog.V(100).Infof("The NodeFeatureDiscovery object definition is nil")
+		glog.V(LogLevel).Infof("The NodeFeatureDiscovery object definition is nil")
 
 		builder.errorMsg = "NodeFeatureDiscovery definition is nil"
 	}
@@ -66,7 +66,7 @@ func (builder *Builder) Get() (*nfdv1.NodeFeatureDiscovery, error) {
 		return nil, err
 	}
 
-	glog.V(100).Infof("Collecting NodeFeatureDiscovery object %s in namespace %s",
+	glog.V(LogLevel).Infof("Collecting NodeFeatureDiscovery object %s in namespace %s",
 		builder.Definition.Name, builder.Definition.Namespace)
 
 	nodeFeatureDiscovery := &nfdv1.NodeFeatureDiscovery{}
@@ -76,7 +76,7 @@ func (builder *Builder) Get() (*nfdv1.NodeFeatureDiscovery, error) {
 	}, nodeFeatureDiscovery)
 
 	if err != nil {
-		glog.V(100).Infof("NodeFeatureDiscovery object %s doesn't exist in namespace %s",
+		glog.V(LogLevel).Infof("NodeFeatureDiscovery object %s doesn't exist in namespace %s",
 			builder.Definition.Name, builder.Definition.Namespace)
 
 		return nil, err
@@ -87,7 +87,7 @@ func (builder *Builder) Get() (*nfdv1.NodeFeatureDiscovery, error) {
 
 // Pull loads an existing NodeFeatureDiscovery into Builder struct.
 func Pull(apiClient *clients.Settings, name, namespace string) (*Builder, error) {
-	glog.V(100).Infof("Pulling existing nodeFeatureDiscovery name: %s in namespace: %s", name, namespace)
+	glog.V(LogLevel).Infof("Pulling existing nodeFeatureDiscovery name: %s in namespace: %s", name, namespace)
 
 	builder := Builder{
 		apiClient: apiClient,
@@ -100,13 +100,13 @@ func Pull(apiClient *clients.Settings, name, namespace string) (*Builder, error)
 	}
 
 	if name == "" {
-		glog.V(100).Infof("NodeFeatureDiscovery name is empty")
+		glog.V(LogLevel).Infof("NodeFeatureDiscovery name is empty")
 
 		builder.errorMsg = "NodeFeatureDiscovery 'name' cannot be empty"
 	}
 
 	if namespace == "" {
-		glog.V(100).Infof("NodeFeatureDiscovery namespace is empty")
+		glog.V(LogLevel).Infof("NodeFeatureDiscovery namespace is empty")
 
 		builder.errorMsg = "NodeFeatureDiscovery 'namespace' cannot be empty"
 	}
@@ -126,15 +126,15 @@ func (builder *Builder) Exists() bool {
 		return false
 	}
 
-	glog.V(100).Infof(
+	glog.V(LogLevel).Infof(
 		"Checking if NodeFeatureDiscovery %s exists in namespace %s", builder.Definition.Name,
 		builder.Definition.Namespace)
 
 	var err error
 	builder.Object, err = builder.Get()
 
 	if err != nil {
-		glog.V(100).Infof("Failed to collect NodeFeatureDiscovery object due to %s", err.Error())
+		glog.V(LogLevel).Infof("Failed to collect NodeFeatureDiscovery object due to %s", err.Error())
 	}
 
 	return err == nil || !k8serrors.IsNotFound(err)
@@ -146,7 +146,7 @@ func (builder *Builder) Delete() (*Builder, error) {
 		return builder, err
 	}
 
-	glog.V(100).Infof("Deleting NodeFeatureDiscovery %s in namespace %s", builder.Definition.Name,
+	glog.V(LogLevel).Infof("Deleting NodeFeatureDiscovery %s in namespace %s", builder.Definition.Name,
 		builder.Definition.Namespace)
 
 	if !builder.Exists() {
@@ -170,7 +170,7 @@ func (builder *Builder) Create() (*Builder, error) {
 		return builder, err
 	}
 
-	glog.V(100).Infof("Creating the NodeFeatureDiscovery %s in namespace %s", builder.Definition.Name,
+	glog.V(LogLevel).Infof("Creating the NodeFeatureDiscovery %s in namespace %s", builder.Definition.Name,
 		builder.Definition.Namespace)
 
 	var err error
@@ -191,20 +191,20 @@ func (builder *Builder) Update(force bool) (*Builder, error) {
 		return builder, err
 	}
 
-	glog.V(100).Infof("Updating the NodeFeatureDiscovery object named: %s in namespace: %s",
+	glog.V(LogLevel).Infof("Updating the NodeFeatureDiscovery object named: %s in namespace: %s",
 		builder.Definition.Name, builder.Definition.Namespace)
 
 	err := builder.apiClient.Update(context.TODO(), builder.Definition)
 
 	if err != nil {
 		if force {
-			glog.V(100).Infof(
+			glog.V(LogLevel).Infof(
 				msg.FailToUpdateNotification("NodeFeatureDiscovery", builder.Definition.Name, builder.Definition.Namespace))
 
 			builder, err := builder.Delete()
 
 			if err != nil {
-				glog.V(100).Infof(
+				glog.V(LogLevel).Infof(
 					msg.FailToUpdateError("NodeFeatureDiscovery", builder.Definition.Name, builder.Definition.Namespace))
 
 				return nil, err
@@ -241,22 +241,21 @@ func getNodeFeatureDiscoveryFromAlmExample(almExample string) (*nfdv1.NodeFeatur
 // validate will check that the builder and builder definition are properly initialized before
 // accessing any member fields.
 func (builder *Builder) validate() (bool, error) {
-	resourceCRD := "NodeFeatureDiscovery"
 
 	if builder == nil {
-		glog.V(100).Infof("The %s builder is uninitialized", resourceCRD)
+		glog.V(LogLevel).Infof("The %s builder is uninitialized", resourceCRD)
 
 		return false, fmt.Errorf("error: received nil %s builder", resourceCRD)
 	}
 
 	if builder.Definition == nil {
-		glog.V(100).Infof("The %s is undefined", resourceCRD)
+		glog.V(LogLevel).Infof("The %s is undefined", resourceCRD)
 
 		return false, fmt.Errorf(msg.UndefinedCrdObjectErrString(resourceCRD))
 	}
 
 	if builder.apiClient == nil {
-		glog.V(100).Infof("The %s builder apiclient is nil", resourceCRD)
+		glog.V(LogLevel).Infof("The %s builder apiclient is nil", resourceCRD)
 
 		return false, fmt.Errorf("%s builder cannot have nil apiClient", resourceCRD)
 	}

pkg/nfd/vars.go

@@ -0,0 +1,9 @@
+package nfd
+
+var (
+	NfdCustomCatalogsourceIndexImage = UndefinedValue
+	CreateNFDCustomCatalogsource     = false
+	NfdCustomCatalogSource           = UndefinedValue
+	NfdCatalogSource                 = UndefinedValue
+	NfdCleanupAfterInstall           = false
+)

pkg/nvidiagpu/consts.go

@@ -0,0 +1,69 @@
+package nvidiagpu
+
+import "time"
+
+const (
+	NvidiaGPUNamespace = "nvidia-gpu-operator"
+
+	NvidiaGPULabel                   = "feature.node.kubernetes.io/pci-10de.present"
+	OperatorGroupName                = "gpu-og"
+	OperatorDeployment               = "gpu-operator"
+	SubscriptionName                 = "gpu-subscription"
+	SubscriptionNamespace            = "nvidia-gpu-operator"
+	CatalogSourceDefault             = "certified-operators"
+	CatalogSourceNamespace           = "openshift-marketplace"
+	Package                          = "gpu-operator-certified"
+	ClusterPolicyName                = "gpu-cluster-policy"
+	BurnNamespace                    = "test-gpu-burn"
+	BurnPodName                      = "gpu-burn-pod"
+	BurnPodLabel                     = "app=gpu-burn-app"
+	BurnConfigmapName                = "gpu-burn-entrypoint"
+	OperatorDefaultMasterBundleImage = "registry.gitlab.com/nvidia/kubernetes/gpu-operator/staging/gpu-operator-bundle:main-latest"
+
+	CustomCatalogSourcePublisherName = "Red Hat"
+
+	CustomCatalogSourceDisplayName = "Certified Operators Custom"
+
+	SleepDuration = 30 * time.Second
+
+	WaitDuration = 4 * time.Minute
+
+	DeletionPollInterval     = 30 * time.Second
+	DeletionTimeoutDuration  = 5 * time.Minute
+	MachineReadyWaitDuration = 15 * time.Minute
+
+	NodeLabelingDelay = 2 * time.Minute
+
+	CatalogSourceCreationDelay   = 30 * time.Second
+	CatalogSourceReadyTimeout    = 4 * time.Minute
+	PackageManifestCheckInterval = 30 * time.Second
+	PackageManifestTimeout       = 5 * time.Minute
+	GpuBundleDeploymentTimeout   = 5 * time.Minute
+
+	OperatorDeploymentCreationDelay = 2 * time.Minute
+	DeploymentCreationCheckInterval = 30 * time.Second
+	DeploymentCreationTimeout       = 4 * time.Minute
+
+	OperatorDeploymentReadyTimeout = 4 * time.Minute
+
+	CsvSucceededCheckInterval = 60 * time.Second
+	CsvSucceededTimeout       = 5 * time.Minute
+
+	ClusterPolicyReadyCheckInterval = 60 * time.Second
+	ClusterPolicyReadyTimeout       = 12 * time.Minute
+
+	BurnPodCreationTimeout = 5 * time.Minute
+
+	BurnPodRunningTimeout = 3 * time.Minute
+	BurnPodSuccessTimeout = 8 * time.Minute
+
+	BurnLogCollectionPeriod = 500 * time.Second
+
+	CsvDeploymentSleepInterval = 2 * time.Minute
+
+	BurnPodPostUpgradeCreationTimeout = 5 * time.Minute
+
+	RedeployedBurnPodRunningTimeout   = 3 * time.Minute
+	RedeployedBurnPodSuccessTimeout   = 8 * time.Minute
+	RedeployedBurnLogCollectionPeriod = 500 * time.Second
+)