ODH Release 2.35.0: Update release branch

Signed-off-by: Ajay Jaganathan <36824134+AjayJagan@users.noreply.github.com>

Author: AjayJagan

Dockerfiles/bundle.Dockerfile

@@ -4,7 +4,7 @@ FROM scratch
 LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
-LABEL operators.operatorframework.io.bundle.package.v1=rhods-operator
+LABEL operators.operatorframework.io.bundle.package.v1=opendatahub-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=alpha,stable,fast
 LABEL operators.operatorframework.io.bundle.channel.default.v1=stable
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.39.2

Makefile

@@ -3,7 +3,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION ?= 2.25.0
+VERSION ?= 2.35.0
 # IMAGE_TAG_BASE defines the opendatahub.io namespace and part of the image name for remote images.
 # This variable is used to construct full image tags for bundle and catalog images.
 #
@@ -161,7 +161,7 @@ endef
 
 .PHONY: manifests
 manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
-	$(CONTROLLER_GEN) rbac:roleName=rhods-operator-role crd:ignoreUnexportedFields=true webhook paths="./..." output:crd:artifacts:config=config/crd/bases
+	$(CONTROLLER_GEN) rbac:roleName=controller-manager-role crd:ignoreUnexportedFields=true webhook paths="./..." output:crd:artifacts:config=config/crd/bases
 	$(call fetch-external-crds,github.com/openshift/api,route/v1)
 	$(call fetch-external-crds,github.com/openshift/api,user/v1)
 
@@ -342,7 +342,7 @@ bundle: prepare operator-sdk ## Generate bundle manifests and metadata, then val
 	$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS) 2>&1 | grep -v $(WARNINGMSG)
 	$(OPERATOR_SDK) bundle validate ./$(BUNDLE_DIR) 2>&1 | grep -v $(WARNINGMSG)
 	mv bundle.Dockerfile Dockerfiles/
-	rm -f bundle/manifests/rhods-operator-webhook-service_v1_service.yaml
+	rm -f bundle/manifests/opendatahub-operator-webhook-service_v1_service.yaml
 .PHONY: bundle-build
 bundle-build: bundle
 	$(IMAGE_BUILDER) build --no-cache -f Dockerfiles/bundle.Dockerfile -t $(BUNDLE_IMG) .

PROJECT

@@ -9,7 +9,7 @@ multigroup: true
 plugins:
   manifests.sdk.operatorframework.io/v2: {}
   scorecard.sdk.operatorframework.io/v2: {}
-projectName: rhods-operator
+projectName: opendatahub-operator
 repo: github.com/opendatahub-io/opendatahub-operator
 resources:
 - api:

api/components/v1alpha1/modelregistry_types.go

@@ -37,8 +37,8 @@ type ModelRegistryCommonSpec struct {
 	// model registry spec exposed to DSC api
 	common.DevFlagsSpec `json:",inline"`
 
-	// Namespace for model registries to be installed, configurable only once when model registry is enabled, defaults to "rhoai-model-registries"
-	// +kubebuilder:default="rhoai-model-registries"
+	// Namespace for model registries to be installed, configurable only once when model registry is enabled, defaults to "odh-model-registries"
+	// +kubebuilder:default="odh-model-registries"
 	// +kubebuilder:validation:Pattern="^([a-z0-9]([-a-z0-9]*[a-z0-9])?)?$"
 	// +kubebuilder:validation:MaxLength=63
 	RegistriesNamespace string `json:"registriesNamespace,omitempty"`

api/components/v1alpha1/workbenches_types.go

@@ -37,8 +37,8 @@ type WorkbenchesCommonSpec struct {
 	common.DevFlagsSpec `json:",inline"`
 	// workbenches spec exposed only to internal api
 
-	// Namespace for workbenches to be installed, defaults to "rhods-notebooks" configurable once when component is enabled.
-	// +kubebuilder:default="rhods-notebooks"
+	// Namespace for workbenches to be installed, defaults to "opendatahub" configurable once when component is enabled.
+	// +kubebuilder:default="opendatahub"
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="WorkbenchNamespace is immutable"
 	// +kubebuilder:validation:Pattern="^([a-z0-9]([-a-z0-9]*[a-z0-9])?)?$"
 	// +kubebuilder:validation:MaxLength=63

api/dscinitialization/v1/dscinitialization_types.go

@@ -28,8 +28,8 @@ import (
 
 // DSCInitializationSpec defines the desired state of DSCInitialization.
 type DSCInitializationSpec struct {
-	// Namespace for applications to be installed, non-configurable, default to "redhat-ods-applications"
-	// +kubebuilder:default:=redhat-ods-applications
+	// Namespace for applications to be installed, non-configurable, default to "opendatahub"
+	// +kubebuilder:default:=opendatahub
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="ApplicationsNamespace is immutable"
 	// +kubebuilder:validation:Pattern="^([a-z0-9]([-a-z0-9]*[a-z0-9])?)?$"
 	// +kubebuilder:validation:MaxLength=63

api/services/v1alpha1/monitoring_types.go

@@ -175,7 +175,7 @@ type Monitoring struct {
 type MonitoringCommonSpec struct {
 	// monitoring spec exposed to DSCI api
 	// Namespace for monitoring if it is enabled
-	// +kubebuilder:default=redhat-ods-monitoring
+	// +kubebuilder:default=opendatahub
 	// +kubebuilder:validation:Pattern="^([a-z0-9]([-a-z0-9]*[a-z0-9])?)?$"
 	// +kubebuilder:validation:MaxLength=63
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="MonitoringNamespace is immutable"

bundle/manifests/components.platform.opendatahub.io_modelregistries.yaml

@@ -75,9 +75,9 @@ spec:
                     type: array
                 type: object
               registriesNamespace:
-                default: rhoai-model-registries
+                default: odh-model-registries
                 description: Namespace for model registries to be installed, configurable
-                  only once when model registry is enabled, defaults to "rhoai-model-registries"
+                  only once when model registry is enabled, defaults to "odh-model-registries"
                 maxLength: 63
                 pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?)?$
                 type: string

bundle/manifests/components.platform.opendatahub.io_workbenches.yaml

@@ -75,9 +75,9 @@ spec:
                     type: array
                 type: object
               workbenchNamespace:
-                default: rhods-notebooks
+                default: opendatahub
                 description: Namespace for workbenches to be installed, defaults to
-                  "rhods-notebooks" configurable once when component is enabled.
+                  "opendatahub" configurable once when component is enabled.
                 maxLength: 63
                 pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?)?$
                 type: string

…-manager-metrics-service_v1_service.yaml …-manager-metrics-service_v1_service.yamlbundle/manifests/redhat-ods-operator-controller-manager-metrics-service_v1_service.yaml renamed to bundle/manifests/controller-manager-metrics-service_v1_service.yaml bundle/manifests/redhat-ods-operator-controller-manager-metrics-service_v1_service.yaml renamed to bundle/manifests/controller-manager-metrics-service_v1_service.yaml

@@ -3,15 +3,15 @@ kind: Service
 metadata:
   creationTimestamp: null
   labels:
-    name: rhods-operator
-  name: redhat-ods-operator-controller-manager-metrics-service
+    control-plane: controller-manager
+  name: controller-manager-metrics-service
 spec:
   ports:
-  - name: http
+  - name: https
     port: 8443
     protocol: TCP
-    targetPort: http
+    targetPort: 8080
   selector:
-    name: rhods-operator
+    control-plane: controller-manager
 status:
   loadBalancer: {}