Add new rook subscription

.gitignore

@@ -30,3 +30,4 @@ catalog/ibm.yaml
 catalog/noobaa.yaml
 catalog/ocs.yaml
 catalog/odf.yaml
+catalog/rook.yaml

Makefile

@@ -88,6 +88,12 @@ IBM_SUBSCRIPTION_CHANNEL=$(IBM_SUBSCRIPTION_CHANNEL)
 IBM_SUBSCRIPTION_STARTINGCSV=$(IBM_SUBSCRIPTION_STARTINGCSV)
 IBM_SUBSCRIPTION_CATALOGSOURCE=$(IBM_SUBSCRIPTION_CATALOGSOURCE)
 IBM_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=$(IBM_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE)
+ROOK_SUBSCRIPTION_NAME=$(ROOK_SUBSCRIPTION_NAME)
+ROOK_SUBSCRIPTION_PACKAGE=$(ROOK_SUBSCRIPTION_PACKAGE)
+ROOK_SUBSCRIPTION_CHANNEL=$(ROOK_SUBSCRIPTION_CHANNEL)
+ROOK_SUBSCRIPTION_STARTINGCSV=$(ROOK_SUBSCRIPTION_STARTINGCSV)
+ROOK_SUBSCRIPTION_CATALOGSOURCE=$(ROOK_SUBSCRIPTION_CATALOGSOURCE)
+ROOK_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=$(ROOK_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE)
 endef
 export MANAGER_ENV_VARS
 
@@ -168,6 +174,7 @@ catalog: opm ## Generate catalog manifests and then validate generated files.
 	$(OPM) render --output=yaml $(IBM_BUNDLE_IMG) $(OPM_RENDER_OPTS) > catalog/ibm.yaml
 	$(OPM) render --output=yaml $(NOOBAA_BUNDLE_IMG) $(OPM_RENDER_OPTS) > catalog/noobaa.yaml
 	$(OPM) render --output=yaml $(CSIADDONS_BUNDLE_IMG) $(OPM_RENDER_OPTS) > catalog/csiaddons.yaml
+	$(OPM) render --output=yaml $(ROOK_BUNDLE_IMG) $(OPM_RENDER_OPTS) > catalog/rook.yaml
 	$(OPM) validate catalog
 
 .PHONY: catalog-build

bundle/manifests/odf-operator-manager-config_v1_configmap.yaml

@@ -24,6 +24,12 @@ data:
   OCS_SUBSCRIPTION_NAME: ocs-operator
   OCS_SUBSCRIPTION_PACKAGE: ocs-operator
   OCS_SUBSCRIPTION_STARTINGCSV: ocs-operator.v4.15.0
+  ROOK_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource
+  ROOK_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-marketplace
+  ROOK_SUBSCRIPTION_CHANNEL: alpha
+  ROOK_SUBSCRIPTION_NAME: rook-ceph-operator
+  ROOK_SUBSCRIPTION_PACKAGE: rook-ceph-operator
+  ROOK_SUBSCRIPTION_STARTINGCSV: rook-ceph-operator.v4.15.0
   controller_manager_config.yaml: |
     apiVersion: controller-runtime.sigs.k8s.io/v1alpha1
     kind: ControllerManagerConfig

bundle/manifests/odf-operator.clusterserviceversion.yaml

@@ -35,7 +35,7 @@ metadata:
     categories: Storage
     console.openshift.io/plugins: '["odf-console"]'
     containerImage: quay.io/ocs-dev/odf-operator:latest
-    createdAt: "2024-02-09T04:53:49Z"
+    createdAt: "2024-03-13T06:42:11Z"
     description: OpenShift Data Foundation provides a common control plane for storage
       solutions on OpenShift Container Platform.
     features.operators.openshift.io/token-auth-aws: "true"

bundle/metadata/dependencies.yaml

@@ -3,6 +3,10 @@ dependencies:
   value:
     packageName: ocs-operator
     version: ">=4.14.0 <4.15.0 || 4.15.0"
+- type: olm.package
+  value:
+    packageName: rook-ceph-operator
+    version: ">=4.14.0 <4.15.0 || 4.15.0"
 - type: olm.package
   value:
     packageName: noobaa-operator

catalog/index.yaml

@@ -52,3 +52,14 @@ package: ibm-storage-odf-operator
 name: stable-v1.4
 entries:
   - name: ibm-storage-odf-operator.v1.4.1
+
+---
+defaultChannel: alpha
+name: rook-ceph-operator
+schema: olm.package
+---
+schema: olm.channel
+package: rook-ceph-operator
+name: alpha
+entries:
+  - name: rook-ceph-operator.v4.15.0

config/manager/manager.env

@@ -22,3 +22,9 @@ IBM_SUBSCRIPTION_CHANNEL=stable-v1.4
 IBM_SUBSCRIPTION_STARTINGCSV=ibm-storage-odf-operator.v1.4.1
 IBM_SUBSCRIPTION_CATALOGSOURCE=odf-catalogsource
 IBM_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-marketplace
+ROOK_SUBSCRIPTION_NAME=rook-ceph-operator
+ROOK_SUBSCRIPTION_PACKAGE=rook-ceph-operator
+ROOK_SUBSCRIPTION_CHANNEL=alpha
+ROOK_SUBSCRIPTION_STARTINGCSV=rook-ceph-operator.v4.15.0
+ROOK_SUBSCRIPTION_CATALOGSOURCE=odf-catalogsource
+ROOK_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-marketplace

controllers/defaults.go

@@ -51,6 +51,13 @@ var (
 		"IBM_SUBSCRIPTION_STARTINGCSV":             "ibm-storage-odf-operator.v1.4.1",
 		"IBM_SUBSCRIPTION_CATALOGSOURCE":           "odf-catalogsource",
 		"IBM_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE": "openshift-marketplace",
+
+		"ROOK_SUBSCRIPTION_NAME":                    "rook-ceph-operator",
+		"ROOK_SUBSCRIPTION_PACKAGE":                 "rook-ceph-operator",
+		"ROOK_SUBSCRIPTION_CHANNEL":                 "alpha",
+		"ROOK_SUBSCRIPTION_STARTINGCSV":             "rook-ceph-operator.v4.15.0",
+		"ROOK_SUBSCRIPTION_CATALOGSOURCE":           "odf-catalogsource",
+		"ROOK_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE": "openshift-marketplace",
 	}
 
 	OperatorNamespace = GetEnvOrDefault("OPERATOR_NAMESPACE")
@@ -82,6 +89,13 @@ var (
 	IbmSubscriptionStartingCSV            = GetEnvOrDefault("IBM_SUBSCRIPTION_STARTINGCSV")
 	IbmSubscriptionCatalogSource          = GetEnvOrDefault("IBM_SUBSCRIPTION_CATALOGSOURCE")
 	IbmSubscriptionCatalogSourceNamespace = GetEnvOrDefault("IBM_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE")
+
+	RookSubscriptionName                   = GetEnvOrDefault("ROOK_SUBSCRIPTION_NAME")
+	RookSubscriptionPackage                = GetEnvOrDefault("ROOK_SUBSCRIPTION_PACKAGE")
+	RookSubscriptionChannel                = GetEnvOrDefault("ROOK_SUBSCRIPTION_CHANNEL")
+	RookSubscriptionStartingCSV            = GetEnvOrDefault("ROOK_SUBSCRIPTION_STARTINGCSV")
+	RookSubscriptionCatalogSource          = GetEnvOrDefault("ROOK_SUBSCRIPTION_CATALOGSOURCE")
+	RookSubscriptionCatalogSourceNamespace = GetEnvOrDefault("ROOK_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE")
 )
 
 const (

controllers/subscriptions.go

@@ -223,7 +223,7 @@ func GetVendorCsvNames(kind odfv1alpha1.StorageKind) []string {
 	if kind == VendorFlashSystemCluster() {
 		csvNames = []string{IbmSubscriptionStartingCSV}
 	} else if kind == VendorStorageCluster() {
-		csvNames = []string{NoobaaSubscriptionStartingCSV, OcsSubscriptionStartingCSV, CSIAddonsSubscriptionStartingCSV}
+		csvNames = []string{OcsSubscriptionStartingCSV, RookSubscriptionStartingCSV, NoobaaSubscriptionStartingCSV, CSIAddonsSubscriptionStartingCSV}
 	}
 
 	return csvNames
@@ -385,7 +385,22 @@ func GetStorageClusterSubscriptions() []*operatorv1alpha1.Subscription {
 		},
 	}
 
-	return []*operatorv1alpha1.Subscription{noobaaSubscription, ocsSubscription, csiAddonsSubscription}
+	rookSubscription := &operatorv1alpha1.Subscription{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      RookSubscriptionName,
+			Namespace: OperatorNamespace,
+		},
+		Spec: &operatorv1alpha1.SubscriptionSpec{
+			CatalogSource:          RookSubscriptionCatalogSource,
+			CatalogSourceNamespace: RookSubscriptionCatalogSourceNamespace,
+			Package:                RookSubscriptionPackage,
+			Channel:                RookSubscriptionChannel,
+			StartingCSV:            RookSubscriptionStartingCSV,
+			InstallPlanApproval:    operatorv1alpha1.ApprovalAutomatic,
+		},
+	}
+
+	return []*operatorv1alpha1.Subscription{ocsSubscription, rookSubscription, noobaaSubscription, csiAddonsSubscription}
 }
 
 // GetFlashSystemClusterSubscription return subscription for FlashSystemCluster

e2e/config.go

@@ -24,6 +24,8 @@ var (
 	NoobaClusterServiceVersion string
 	// CsiaddonsClusterServiceVersion is the name of Csiaddons csv
 	CsiaddonsClusterServiceVersion string
+	// RookClusterServiceVersion is the name of Rook csv
+	RookClusterServiceVersion string
 )
 
 var (
@@ -46,13 +48,15 @@ func init() {
 	flag.StringVar(&OcsClusterServiceVersion, "ocs-cluster-service-version", "", "The OCS CSV name which needs to verified")
 	flag.StringVar(&NoobaClusterServiceVersion, "nooba-cluster-service-version", "", "The Nooba CSV name which needs to verified")
 	flag.StringVar(&CsiaddonsClusterServiceVersion, "csiaddons-cluster-service-version", "", "The CSI Addon CSV name which needs to verified")
+	flag.StringVar(&RookClusterServiceVersion, "rook-cluster-service-version", "", "The Rook CSV name which needs to verified")
 	flag.Parse()
 
 	verifyFlags()
 
 	// A list of names of all the csvs that should be installed
 	CsvNames = []string{OdfClusterServiceVersion, OcsClusterServiceVersion,
-		NoobaClusterServiceVersion, CsiaddonsClusterServiceVersion}
+		RookClusterServiceVersion, NoobaClusterServiceVersion,
+		CsiaddonsClusterServiceVersion}
 
 	dm, err := deploymanager.NewDeployManager()
 	if err != nil {
@@ -86,4 +90,8 @@ func verifyFlags() {
 	if CsiaddonsClusterServiceVersion == "" {
 		panic("csiaddons-cluster-service-version is not provided")
 	}
+
+	if RookClusterServiceVersion == "" {
+		panic("rook-cluster-service-version is not provided")
+	}
 }

hack/e2e-test.sh

@@ -10,4 +10,5 @@ cd e2e/odf && ${GINKGO} build && ./odf.test \
     --odf-cluster-service-version=odf-operator.v${VERSION} \
     --ocs-cluster-service-version=${OCS_SUBSCRIPTION_STARTINGCSV} \
     --nooba-cluster-service-version=${NOOBAA_SUBSCRIPTION_STARTINGCSV} \
-    --csiaddons-cluster-service-version=${CSIADDONS_SUBSCRIPTION_STARTINGCSV}
+    --csiaddons-cluster-service-version=${CSIADDONS_SUBSCRIPTION_STARTINGCSV} \
+    --rook-cluster-service-version=${ROOK_SUBSCRIPTION_STARTINGCSV}

hack/make-bundle-vars.mk

@@ -96,9 +96,15 @@ ODF_CONSOLE_IMG_TAG ?= latest
 ODF_CONSOLE_IMG_LOCATION ?= quay.io/ocs-dev
 ODF_CONSOLE_IMG ?= $(ODF_CONSOLE_IMG_LOCATION)/$(ODF_CONSOLE_IMG_NAME):$(ODF_CONSOLE_IMG_TAG)
 
+ROOK_BUNDLE_NAME ?= rook-ceph-operator
+ROOK_BUNDLE_IMG_NAME ?= $(ROOK_BUNDLE_NAME)-bundle
+ROOK_BUNDLE_IMG_TAG ?= v4.15.0
+ROOK_BUNDLE_IMG_LOCATION ?= quay.io/ocs-dev
+ROOK_BUNDLE_IMG ?= $(ROOK_BUNDLE_IMG_LOCATION)/$(ROOK_BUNDLE_IMG_NAME):$(ROOK_BUNDLE_IMG_TAG)
+
 # A space-separated list of bundle images (e.g. make catalog-build BUNDLE_IMGS=example.com/operator-bundle:v0.1.0 example.com/operator-bundle:v0.2.0).
 # These images MUST exist in a registry and be pull-able.
-BUNDLE_IMGS ?= $(BUNDLE_IMG) $(OCS_BUNDLE_IMG) $(IBM_BUNDLE_IMG) $(NOOBAA_BUNDLE_IMG) $(CSIADDONS_BUNDLE_IMG)
+BUNDLE_IMGS ?= $(BUNDLE_IMG) $(OCS_BUNDLE_IMG) $(IBM_BUNDLE_IMG) $(NOOBAA_BUNDLE_IMG) $(CSIADDONS_BUNDLE_IMG) $(ROOK_BUNDLE_IMG)
 
 # Set CATALOG_BASE_IMG to an existing catalog image tag to add $BUNDLE_IMGS to that image.
 ifneq ($(origin CATALOG_BASE_IMG), undefined)
@@ -138,6 +144,13 @@ IBM_SUBSCRIPTION_STARTINGCSV ?= $(IBM_BUNDLE_NAME).v$(IBM_BUNDLE_IMG_TAG)
 IBM_SUBSCRIPTION_CATALOGSOURCE ?= $(OPERATOR_CATALOGSOURCE)
 IBM_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE ?= $(OPERATOR_CATALOGSOURCE_NAMESPACE)
 
+ROOK_SUBSCRIPTION_NAME ?= $(ROOK_BUNDLE_NAME)
+ROOK_SUBSCRIPTION_PACKAGE ?= $(ROOK_BUNDLE_NAME)
+ROOK_SUBSCRIPTION_CHANNEL ?= $(DEFAULT_CHANNEL)
+ROOK_SUBSCRIPTION_STARTINGCSV ?= $(ROOK_BUNDLE_NAME).$(ROOK_BUNDLE_IMG_TAG)
+ROOK_SUBSCRIPTION_CATALOGSOURCE ?= $(OPERATOR_CATALOGSOURCE)
+ROOK_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE ?= $(OPERATOR_CATALOGSOURCE_NAMESPACE)
+
 # kube rbac proxy image variables
 CLUSTER_ENV ?= openshift
 KUBE_RBAC_PROXY_IMG ?= gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1