Sync from odh to rhoai 2.11

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,32 @@
+<!--- Provide a general summary of your changes in the Title above -->
+
+Many thanks for submitting your Pull Request ❤️!
+
+Please make sure that your PR meets the following requirements:
+
+- [ ] You have read the [contributors guide](https://github.com/opendatahub-io/opendatahub-operator/blob/incubation/CONTRIBUTING.md)
+- [ ] Pull Request contains description of the issue
+- [ ] Pull Request contains link to the JIRA issue
+- [ ] Pull Request contains link to any dependent or related Pull Request
+
+## Description
+<!--- Describe your changes in detail -->
+
+## JIRA issue:
+<!--- Link your JIRA and related links here for reference. -->
+
+## How Has This Been Tested?
+<!--- Please describe in detail how you tested your changes. -->
+<!--- Include details of your testing environment, and the tests you ran to -->
+<!--- see how your change affects other areas of the code, etc. -->
+
+## Screenshot or short clip:
+<!--- Attach a screenshot or a short clip demonstrating the feature. -->
+
+## Merge criteria:
+<!--- This PR will be merged by any repository approver when it meets all the points in the checklist -->
+<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
+
+- [ ] Have a meaningful commit messages.
+- [ ] Testing instructions have been added in the PR body (for PRs involving changes that are not immediately obvious).
+- [ ] The developer has manually tested the changes and verified that the changes work

Dockerfiles/toolbox.Dockerfile

@@ -1,7 +1,7 @@
 FROM registry.fedoraproject.org/fedora-toolbox:38
 
 ARG GOLANG_VERSION=1.20
-ARG OPERATOR_SDK_VERSION=1.24.1
+ARG OPERATOR_SDK_VERSION=1.31.0
 
 ENV GOLANG_VERSION=$GOLANG_VERSION \
     OPERATOR_SDK_VERSION=$OPERATOR_SDK_VERSION

Makefile

@@ -341,14 +341,13 @@ catalog-push: ## Push a catalog image.
 	$(MAKE) image-push IMG=$(CATALOG_IMG)
 
 TOOLBOX_GOLANG_VERSION := 1.20
-TOOLBOX_OPERATOR_SDK_VERSION := 1.24.1
 
 # Generate a Toolbox container for locally testing changes easily
 .PHONY: toolbox
 toolbox: ## Create a toolbox instance with the proper Golang and Operator SDK versions
 	$(IMAGE_BUILDER) build \
 		--build-arg GOLANG_VERSION=$(TOOLBOX_GOLANG_VERSION) \
-		--build-arg OPERATOR_SDK_VERSION=$(TOOLBOX_OPERATOR_SDK_VERSION) \
+		--build-arg OPERATOR_SDK_VERSION=$(OPERATOR_SDK_VERSION) \
 		-f Dockerfiles/toolbox.Dockerfile -t opendatahub-toolbox .
 	$(IMAGE_BUILDER) stop opendatahub-toolbox ||:
 	toolbox rm opendatahub-toolbox ||:

OWNERS

@@ -2,13 +2,5 @@ approvers:
   - platform
 reviewers:
   - platform
-  - serving
-  - ide
-  - dashboard
-  - datasciencepipelines
-  - modelregistry
-  - servicemesh
-  - distributedworkloads
-  - aiexplainability
 
 

OWNERS_ALIASES

@@ -1,41 +1,19 @@
 aliases:
     platform:
+    - adelton
     - AjayJagan
     - ajaypratap003
     - asanzgom
+    - biswassri
+    - CFSNM
+    - devguyio
     - etirelli
+    - grdryn
+    - Jackdelahunt
     - LaVLaS
+    - MarianMacik
     - mattmahoneyrh
+    - Sara4994
     - VaishnaviHire
     - ykaliuta
-    - zdtsw
-    aiexplainability:
-    - RobGeada
-    - ruivieira
-    dashboard:
-    - andrewballantyne
-    - lucferbux
-    datasciencepipelines:
-    - gmfrasca
-    - HumairAK
-    distributedworkloads:
-    - astefanutti
-    - dimakis
-    ide:
-    - atheo89
-    - harshad16
-    modelregistry:
-    - dhirajsb
-    - rareddy
-    - tarilabs
-    servicemesh:
-    - aslakknutsen
-    - bartoszmajsak
-    - cam-garrison
-    serving:
-    - israel-hdez
-    - VedantMahabaleshwarkar
-
-
-
-
+    - zdtsw

bundle/manifests/datasciencecluster.opendatahub.io_datascienceclusters.yaml

@@ -53,7 +53,7 @@ spec:
                             items:
                               properties:
                                 contextDir:
-                                  default: ""
+                                  default: manifests
                                   description: contextDir is the relative path to
                                     the folder containing manifests in a repository
                                   type: string
@@ -96,7 +96,7 @@ spec:
                             items:
                               properties:
                                 contextDir:
-                                  default: ""
+                                  default: manifests
                                   description: contextDir is the relative path to
                                     the folder containing manifests in a repository
                                   type: string
@@ -140,7 +140,7 @@ spec:
                             items:
                               properties:
                                 contextDir:
-                                  default: ""
+                                  default: manifests
                                   description: contextDir is the relative path to
                                     the folder containing manifests in a repository
                                   type: string
@@ -198,7 +198,7 @@ spec:
                             items:
                               properties:
                                 contextDir:
-                                  default: ""
+                                  default: manifests
                                   description: contextDir is the relative path to
                                     the folder containing manifests in a repository
                                   type: string
@@ -301,7 +301,7 @@ spec:
                             items:
                               properties:
                                 contextDir:
-                                  default: ""
+                                  default: manifests
                                   description: contextDir is the relative path to
                                     the folder containing manifests in a repository
                                   type: string
@@ -345,7 +345,7 @@ spec:
                             items:
                               properties:
                                 contextDir:
-                                  default: ""
+                                  default: manifests
                                   description: contextDir is the relative path to
                                     the folder containing manifests in a repository
                                   type: string
@@ -388,7 +388,7 @@ spec:
                             items:
                               properties:
                                 contextDir:
-                                  default: ""
+                                  default: manifests
                                   description: contextDir is the relative path to
                                     the folder containing manifests in a repository
                                   type: string
@@ -431,7 +431,7 @@ spec:
                             items:
                               properties:
                                 contextDir:
-                                  default: ""
+                                  default: manifests
                                   description: contextDir is the relative path to
                                     the folder containing manifests in a repository
                                   type: string
@@ -474,7 +474,7 @@ spec:
                             items:
                               properties:
                                 contextDir:
-                                  default: ""
+                                  default: manifests
                                   description: contextDir is the relative path to
                                     the folder containing manifests in a repository
                                   type: string
@@ -517,7 +517,7 @@ spec:
                             items:
                               properties:
                                 contextDir:
-                                  default: ""
+                                  default: manifests
                                   description: contextDir is the relative path to
                                     the folder containing manifests in a repository
                                   type: string

bundle/tests/scorecard/config.yaml

@@ -8,7 +8,7 @@ stages:
   - entrypoint:
     - scorecard-test
     - basic-check-spec
-    image: quay.io/operator-framework/scorecard-test:v1.24.1
+    image: quay.io/operator-framework/scorecard-test:v1.31.0
     labels:
       suite: basic
       test: basic-check-spec-test

components/codeflare/codeflare.go

@@ -57,7 +57,13 @@ func (c *CodeFlare) GetComponentName() string {
 	return ComponentName
 }
 
-func (c *CodeFlare) ReconcileComponent(ctx context.Context, cli client.Client, logger logr.Logger, owner metav1.Object, dscispec *dsciv1.DSCInitializationSpec, _ bool) error {
+func (c *CodeFlare) ReconcileComponent(ctx context.Context,
+	cli client.Client,
+	logger logr.Logger,
+	owner metav1.Object,
+	dscispec *dsciv1.DSCInitializationSpec,
+	platform cluster.Platform,
+	_ bool) error {
 	l := c.ConfigComponentLogger(logger, ComponentName, dscispec)
 	var imageParamMap = map[string]string{
 		"codeflare-operator-controller-image": "RELATED_IMAGE_ODH_CODEFLARE_OPERATOR_IMAGE", // no need mcad, embedded in cfo
@@ -66,22 +72,19 @@ func (c *CodeFlare) ReconcileComponent(ctx context.Context, cli client.Client, l
 
 	enabled := c.GetManagementState() == operatorv1.Managed
 	monitoringEnabled := dscispec.Monitoring.ManagementState == operatorv1.Managed
-	platform, err := cluster.GetPlatform(cli)
-	if err != nil {
-		return err
-	}
+
 	if enabled {
 		if c.DevFlags != nil {
 			// Download manifests and update paths
-			if err = c.OverrideManifests(string(platform)); err != nil {
+			if err := c.OverrideManifests(string(platform)); err != nil {
 				return err
 			}
 		}
 		// check if the CodeFlare operator is installed: it should not be installed
 		// Both ODH and RHOAI should have the same operator name
 		dependentOperator := CodeflareOperator
 
-		if found, err := deploy.OperatorExists(cli, dependentOperator); err != nil {
+		if found, err := cluster.OperatorExists(cli, dependentOperator); err != nil {
 			return fmt.Errorf("operator exists throws error %w", err)
 		} else if found {
 			return fmt.Errorf("operator %s is found. Please uninstall the operator before enabling %s component",
@@ -115,10 +118,10 @@ func (c *CodeFlare) ReconcileComponent(ctx context.Context, cli client.Client, l
 		}
 
 		// inject prometheus codeflare*.rules in to /opt/manifests/monitoring/prometheus/prometheus-configs.yaml
-		if err = c.UpdatePrometheusConfig(cli, enabled && monitoringEnabled, ComponentName); err != nil {
+		if err := c.UpdatePrometheusConfig(cli, enabled && monitoringEnabled, ComponentName); err != nil {
 			return err
 		}
-		if err = deploy.DeployManifestsFromPath(cli, owner,
+		if err := deploy.DeployManifestsFromPath(cli, owner,
 			filepath.Join(deploy.DefaultManifestPath, "monitoring", "prometheus", "apps"),
 			dscispec.Monitoring.Namespace,
 			"prometheus", true); err != nil {

components/component.go

@@ -15,6 +15,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	dsciv1 "github.com/opendatahub-io/opendatahub-operator/v2/apis/dscinitialization/v1"
+	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/cluster"
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/common"
 )
 
@@ -68,9 +69,9 @@ type ManifestsConfig struct {
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,order=1
 	URI string `json:"uri,omitempty"`
 
-	// contextDir is the relative path to the folder containing manifests in a repository
+	// contextDir is the relative path to the folder containing manifests in a repository, default value "manifests"
 	// +optional
-	// +kubebuilder:default:=""
+	// +kubebuilder:default:="manifests"
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,order=2
 	ContextDir string `json:"contextDir,omitempty"`
 
@@ -83,7 +84,7 @@ type ManifestsConfig struct {
 
 type ComponentInterface interface {
 	ReconcileComponent(ctx context.Context, cli client.Client, logger logr.Logger,
-		owner metav1.Object, DSCISpec *dsciv1.DSCInitializationSpec, currentComponentStatus bool) error
+		owner metav1.Object, DSCISpec *dsciv1.DSCInitializationSpec, platform cluster.Platform, currentComponentStatus bool) error
 	Cleanup(cli client.Client, DSCISpec *dsciv1.DSCInitializationSpec) error
 	GetComponentName() string
 	GetManagementState() operatorv1.ManagementState

components/dashboard/dashboard.go

@@ -87,13 +87,11 @@ func (d *Dashboard) ReconcileComponent(ctx context.Context,
 	logger logr.Logger,
 	owner metav1.Object,
 	dscispec *dsciv1.DSCInitializationSpec,
+	platform cluster.Platform,
 	currentComponentExist bool,
 ) error {
 	var l logr.Logger
-	platform, err := cluster.GetPlatform(cli)
-	if err != nil {
-		return err
-	}
+
 	if platform == cluster.SelfManagedRhods || platform == cluster.ManagedRhods {
 		l = d.ConfigComponentLogger(logger, ComponentNameSupported, dscispec)
 	} else {
@@ -126,14 +124,14 @@ func (d *Dashboard) ReconcileComponent(ctx context.Context,
 
 		// 2. platform specific RBAC
 		if platform == cluster.OpenDataHub || platform == "" {
-			err := cluster.UpdatePodSecurityRolebinding(cli, dscispec.ApplicationsNamespace, "odh-dashboard")
+			err := cluster.UpdatePodSecurityRolebinding(ctx, cli, dscispec.ApplicationsNamespace, "odh-dashboard")
 			if err != nil {
 				return err
 			}
 		}
 
 		if platform == cluster.SelfManagedRhods || platform == cluster.ManagedRhods {
-			err := cluster.UpdatePodSecurityRolebinding(cli, dscispec.ApplicationsNamespace, "rhods-dashboard")
+			err := cluster.UpdatePodSecurityRolebinding(ctx, cli, dscispec.ApplicationsNamespace, "rhods-dashboard")
 			if err != nil {
 				return err
 			}
@@ -152,7 +150,7 @@ func (d *Dashboard) ReconcileComponent(ctx context.Context,
 	switch platform {
 	case cluster.SelfManagedRhods, cluster.ManagedRhods:
 		// anaconda
-		if err := cluster.CreateSecret(cli, "anaconda-ce-access", dscispec.ApplicationsNamespace); err != nil {
+		if err := cluster.CreateSecret(ctx, cli, "anaconda-ce-access", dscispec.ApplicationsNamespace); err != nil {
 			return fmt.Errorf("failed to create access-secret for anaconda: %w", err)
 		}
 		// overlay which including ../../base + anaconda-ce-validator
@@ -183,7 +181,7 @@ func (d *Dashboard) ReconcileComponent(ctx context.Context,
 			if err := d.UpdatePrometheusConfig(cli, enabled && monitoringEnabled, ComponentNameSupported); err != nil {
 				return err
 			}
-			if err = deploy.DeployManifestsFromPath(cli, owner,
+			if err := deploy.DeployManifestsFromPath(cli, owner,
 				filepath.Join(deploy.DefaultManifestPath, "monitoring", "prometheus", "apps"),
 				dscispec.Monitoring.Namespace,
 				"prometheus", true); err != nil {
@@ -194,11 +192,11 @@ func (d *Dashboard) ReconcileComponent(ctx context.Context,
 		return nil
 	default:
 		// base
-		if err = deploy.DeployManifestsFromPath(cli, owner, Path, dscispec.ApplicationsNamespace, ComponentName, enabled); err != nil {
+		if err := deploy.DeployManifestsFromPath(cli, owner, Path, dscispec.ApplicationsNamespace, ComponentName, enabled); err != nil {
 			return err
 		}
 		// ISV
-		if err = deploy.DeployManifestsFromPath(cli, owner, PathISV, dscispec.ApplicationsNamespace, ComponentName, enabled); err != nil {
+		if err := deploy.DeployManifestsFromPath(cli, owner, PathISV, dscispec.ApplicationsNamespace, ComponentName, enabled); err != nil {
 			return err
 		}
 		// consolelink