Nfd refractoring #55
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| package global | ||
|
|
||
| const ( | ||
| //not related to NFD but common consts between gpu and nno | ||
| UndefinedValue = "undefined" | ||
| OperatorVersionFile = "operator.version" | ||
| OpenShiftVersionFile = "ocp.version" | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| package nfd | ||
|
|
||
| import ( | ||
| . "github.com/rh-ecosystem-edge/nvidia-ci/pkg/global" | ||
| "time" | ||
| ) | ||
|
|
||
| type CustomConfig struct { | ||
| CustomCatalogSourceIndexImage string | ||
| CreateCustomCatalogsource bool | ||
|
|
||
| CustomCatalogSource string | ||
| CatalogSource string | ||
| CleanupAfterInstall bool | ||
| } | ||
|
|
||
| // NewCustomConfig creates a new CustomConfig instance with default settings. | ||
| // All string fields are initialized to UndefinedValue and boolean fields to false. | ||
| func NewCustomConfig() *CustomConfig { | ||
| return &CustomConfig{ | ||
| CustomCatalogSourceIndexImage: UndefinedValue, | ||
| CreateCustomCatalogsource: false, | ||
|
|
||
| CustomCatalogSource: UndefinedValue, | ||
| CatalogSource: UndefinedValue, | ||
| CleanupAfterInstall: false, | ||
| } | ||
| } | ||
|
Comment on lines
+8
to
+28
There was a problem hiding this comment. It looks like this can be shared by all operators that might need a custom catalog source, not limited to NFD. |
||
|
|
||
| // NfdParams holds all the configuration details required to install or manage | ||
| // the Node Feature Discovery (NFD) operator on a cluster. | ||
| type NfdParams struct { | ||
|
There was a problem hiding this comment. AFAIK this has to be |
||
| // OLM package name (as seen in the package manifest) | ||
| Package string | ||
|
|
||
| // Where the NFD operator is typically found in the default OperatorHub | ||
| CatalogSourceDefault string | ||
| CatalogSourceNamespace string | ||
|
|
||
| // Whether to create a custom CatalogSource if the default one doesn't contain NFD | ||
| CreateCustomCatalogsource bool | ||
|
|
||
| // Custom CatalogSource details (used if CreateCustomCatalogsource is true) | ||
| CustomCatalogSource string | ||
| CustomCatalogSourceIndexImage string | ||
| CustomCatalogSourceDisplayName string | ||
|
|
||
| // Operator installation details | ||
| OperatorDeploymentName string | ||
| OperatorNamespace string | ||
|
|
||
| // Time intervals for checking operator readiness | ||
| OperatorCheckInterval time.Duration | ||
| OperatorTimeout time.Duration | ||
|
|
||
| // Flag indicating whether to remove/clean up NFD after the installation/test | ||
| CleanupAfterInstall bool | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| package nfd | ||
|
|
||
| import "time" | ||
|
|
||
| const ( | ||
| CustomNFDCatalogSourcePublisherName = "Red Hat" | ||
| CustomCatalogSourceDisplayName = "Redhat Operators Custom" | ||
| RhcosLabel = "feature.node.kubernetes.io/system-os_release.ID" | ||
| RhcosLabelValue = "rhcos" | ||
| OperatorNamespace = "openshift-nfd" | ||
| CatalogSourceDefault = "redhat-operators" | ||
| CatalogSourceNamespace = "openshift-marketplace" | ||
| OperatorDeploymentName = "nfd-controller-manager" | ||
| Package = "nfd" | ||
| CRName = "nfd-instance" | ||
|
|
||
| NFDOperatorCheckInterval = 30 * time.Second | ||
| NFDOperatorTimeout = 5 * time.Minute | ||
| resourceCRD = "NodeFeatureDiscovery" | ||
| LogLevel = 100 | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, it shouldn't. It belongs to the NFD package and shouldn't be specific to GPU, must cover any scenario that involves NFD without ambiguities - NFD + GPU, NFD + NNO, NFD + GPU + NNO. Which means we'll have a single
NFD_FALLBACK_CATALOGSOURCEC_INDEX_IMAGEinstead ofNVIDIAGPU_NFD_FALLBACK_CATALOGSOURCE_INDEX_IMAGEandNVIDIANETWORK_NFD_FALLBACK_CATALOGSOURCE_INDEX_IMAGE.For backward compatibility, we may have a translation
NVIDIAGPU_NFD_FALLBACK_CATALOGSOURCE_INDEX_IMAGE>NFD_FALLBACK_CATALOGSOURCEC_INDEX_IMAGE(and a similar one for NNO) until the CI jobs are fixed.