add openshift namespace to the controller-runtime cache

Signed-off-by: Tariq Ibrahim <[email protected]>
NVIDIA · Aug 2, 2024 · 8f285ab · 8f285ab
1 parent f3b69bf
commit 8f285ab
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/cmd/gpu-operator/main.go b/cmd/gpu-operator/main.go
@@ -50,6 +50,7 @@ import (
 	nvidiav1alpha1 "github.com/NVIDIA/gpu-operator/api/nvidia/v1alpha1"
 	"github.com/NVIDIA/gpu-operator/controllers"
 	"github.com/NVIDIA/gpu-operator/controllers/clusterinfo"
+	"github.com/NVIDIA/gpu-operator/internal/consts"
 	"github.com/NVIDIA/gpu-operator/internal/info"
 	// +kubebuilder:scaffold:imports
 )
@@ -106,9 +107,12 @@ func main() {
 	})
 
 	operatorNamespace := os.Getenv("OPERATOR_NAMESPACE")
+	openshiftNamespace := consts.OpenshiftNamespace
 	cacheOptions := cache.Options{
 		DefaultNamespaces: map[string]cache.Config{
 			operatorNamespace: {},
+			// Also cache resources in the openshift namespace to retrieve ImageStreams when on an openshift  cluster
+			openshiftNamespace: {},
 		},
 	}
 

diff --git a/controllers/clusterinfo/clusterinfo.go b/controllers/clusterinfo/clusterinfo.go
@@ -341,7 +341,7 @@ func getOpenshiftDTKImages(ctx context.Context, c *rest.Config) map[string]strin
 	logger := log.FromContext(ctx)
 
 	name := "driver-toolkit"
-	namespace := "openshift"
+	namespace := consts.OpenshiftNamespace
 
 	ocpImageClient, err := imagesv1.NewForConfig(c)
 	if err != nil {

diff --git a/controllers/object_controls.go b/controllers/object_controls.go
@@ -52,6 +52,7 @@ import (
 	"sigs.k8s.io/yaml"
 
 	gpuv1 "github.com/NVIDIA/gpu-operator/api/nvidia/v1"
+	"github.com/NVIDIA/gpu-operator/internal/consts"
 	"github.com/NVIDIA/gpu-operator/internal/utils"
 )
 
@@ -3705,7 +3706,7 @@ func ocpHasDriverToolkitImageStream(n *ClusterPolicyController) (bool, error) {
 	ctx := n.ctx
 	found := &apiimagev1.ImageStream{}
 	name := "driver-toolkit"
-	namespace := "openshift"
+	namespace := consts.OpenshiftNamespace
 	err := n.client.Get(ctx, types.NamespacedName{Namespace: namespace, Name: name}, found)
 	if err != nil {
 		if apierrors.IsNotFound(err) {

diff --git a/internal/consts/consts.go b/internal/consts/consts.go
@@ -39,6 +39,9 @@ const (
 	// Containerd runtime
 	Containerd = "containerd"
 
+	// OpenshiftNamespace indicates the main namespace of an  Openshift cluster
+	OpenshiftNamespace = "openshift"
+
 	OcpDriverToolkitVersionLabel        = "openshift.driver-toolkit.rhcos"
 	OcpDriverToolkitIdentificationLabel = "openshift.driver-toolkit"
 	NfdOSTreeVersionLabelKey            = "feature.node.kubernetes.io/system-os_release.OSTREE_VERSION"