diff --git a/Makefile b/Makefile index 33078c785..b776a4270 100644 --- a/Makefile +++ b/Makefile @@ -61,6 +61,12 @@ NOOBAA_SUBSCRIPTION_CHANNEL=$(NOOBAA_SUBSCRIPTION_CHANNEL) NOOBAA_SUBSCRIPTION_STARTINGCSV=$(NOOBAA_SUBSCRIPTION_STARTINGCSV) NOOBAA_SUBSCRIPTION_CATALOGSOURCE=$(NOOBAA_SUBSCRIPTION_CATALOGSOURCE) NOOBAA_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=$(NOOBAA_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE) +CSI_ADDONS_SUBSCRIPTION_CATALOGSOURCE=$(CSI_ADDONS_SUBSCRIPTION_CATALOGSOURCE) +CSI_ADDONS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=$(CSI_ADDONS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE) +CSI_ADDONS_SUBSCRIPTION_CHANNEL=$(CSI_ADDONS_SUBSCRIPTION_CHANNEL) +CSI_ADDONS_SUBSCRIPTION_NAME=$(CSI_ADDONS_SUBSCRIPTION_NAME) +CSI_ADDONS_SUBSCRIPTION_PACKAGE=$(CSI_ADDONS_SUBSCRIPTION_PACKAGE) +CSI_ADDONS_SUBSCRIPTION_STARTINGCSV=$(CSI_ADDONS_SUBSCRIPTION_STARTINGCSV) OCS_SUBSCRIPTION_NAME=$(OCS_SUBSCRIPTION_NAME) OCS_SUBSCRIPTION_PACKAGE=$(OCS_SUBSCRIPTION_PACKAGE) OCS_SUBSCRIPTION_CHANNEL=$(OCS_SUBSCRIPTION_CHANNEL) diff --git a/bundle/manifests/odf-operator-manager-config_v1_configmap.yaml b/bundle/manifests/odf-operator-manager-config_v1_configmap.yaml index 37d621bd6..9eaa76760 100644 --- a/bundle/manifests/odf-operator-manager-config_v1_configmap.yaml +++ b/bundle/manifests/odf-operator-manager-config_v1_configmap.yaml @@ -1,5 +1,11 @@ apiVersion: v1 data: + CSI_ADDONS_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource + CSI_ADDONS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-storage + CSI_ADDONS_SUBSCRIPTION_CHANNEL: alpha + CSI_ADDONS_SUBSCRIPTION_NAME: csi-addons + CSI_ADDONS_SUBSCRIPTION_PACKAGE: csi-addons + CSI_ADDONS_SUBSCRIPTION_STARTINGCSV: csi-addons.latest IBM_CSI_SUBSCRIPTION_STARTINGCSV: ibm-block-csi-operator.v1.6.0 IBM_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource IBM_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-storage diff --git a/bundle/manifests/odf-operator.clusterserviceversion.yaml b/bundle/manifests/odf-operator.clusterserviceversion.yaml index 7e05a288f..42afde471 100644 --- a/bundle/manifests/odf-operator.clusterserviceversion.yaml +++ b/bundle/manifests/odf-operator.clusterserviceversion.yaml @@ -385,7 +385,7 @@ spec: envFrom: - configMapRef: name: odf-operator-manager-config - image: quay.io/ocs-dev/odf-operator:latest + image: quay.io/ypadia/odf-operator:test livenessProbe: httpGet: path: /healthz diff --git a/bundle/metadata/dependencies.yaml b/bundle/metadata/dependencies.yaml index 437a23a6b..4c477b95a 100644 --- a/bundle/metadata/dependencies.yaml +++ b/bundle/metadata/dependencies.yaml @@ -3,3 +3,7 @@ dependencies: value: packageName: ocs-operator version: ">=4.8.0 <4.9.0 || 4.9.0" +- type: olm.package + value: + packageName: csi-addons + version: latest diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index b14ba0873..96c1d1064 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -14,5 +14,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization images: - name: controller - newName: quay.io/ocs-dev/odf-operator - newTag: latest + newName: quay.io/ypadia/odf-operator + newTag: test diff --git a/config/manager/manager.env b/config/manager/manager.env index df568b6fd..3aca2d9c2 100644 --- a/config/manager/manager.env +++ b/config/manager/manager.env @@ -7,6 +7,12 @@ NOOBAA_SUBSCRIPTION_CHANNEL=alpha NOOBAA_SUBSCRIPTION_STARTINGCSV=noobaa-operator.v5.9.0 NOOBAA_SUBSCRIPTION_CATALOGSOURCE=odf-catalogsource NOOBAA_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-storage +CSI_ADDONS_SUBSCRIPTION_CATALOGSOURCE=odf-catalogsource +CSI_ADDONS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-storage +CSI_ADDONS_SUBSCRIPTION_CHANNEL=alpha +CSI_ADDONS_SUBSCRIPTION_NAME=csi-addons +CSI_ADDONS_SUBSCRIPTION_PACKAGE=csi-addons +CSI_ADDONS_SUBSCRIPTION_STARTINGCSV=csi-addons.latest OCS_SUBSCRIPTION_NAME=ocs-operator OCS_SUBSCRIPTION_PACKAGE=ocs-operator OCS_SUBSCRIPTION_CHANNEL=alpha diff --git a/controllers/defaults.go b/controllers/defaults.go index 855296543..3d0688efe 100644 --- a/controllers/defaults.go +++ b/controllers/defaults.go @@ -43,6 +43,13 @@ var ( "OCS_SUBSCRIPTION_CATALOGSOURCE": "odf-catalogsource", "OCS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE": "openshift-storage", + "CSI_ADDONS_SUBSCRIPTION_CATALOGSOURCE": "odf-catalogsource", + "CSI_ADDONS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE": "openshift-storage", + "CSI_ADDONS_SUBSCRIPTION_CHANNEL": "alpha", + "CSI_ADDONS_SUBSCRIPTION_NAME": "csi-addons", + "CSI_ADDONS_SUBSCRIPTION_PACKAGE": "csi-addons", + "CSI_ADDONS_SUBSCRIPTION_STARTINGCSV": "csi-addons.latest", + "IBM_SUBSCRIPTION_NAME": "ibm-storage-odf-operator", "IBM_SUBSCRIPTION_PACKAGE": "ibm-storage-odf-operator", "IBM_SUBSCRIPTION_CHANNEL": "stable-v1", @@ -72,6 +79,13 @@ var ( NoobaaSubscriptionCatalogSource = GetEnvOrDefault("NOOBAA_SUBSCRIPTION_CATALOGSOURCE") NoobaaSubscriptionCatalogSourceNamespace = GetEnvOrDefault("NOOBAA_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE") + CSIAddonsSubscriptionName = GetEnvOrDefault("CSI_ADDONS_SUBSCRIPTION_NAME") + CSIAddonsSubscriptionPackage = GetEnvOrDefault("CSI_ADDONS_SUBSCRIPTION_PACKAGE") + CSIAddonsSubscriptionChannel = GetEnvOrDefault("CSI_ADDONS_SUBSCRIPTION_CHANNEL") + CSIAddonsSubscriptionStartingCSV = GetEnvOrDefault("CSI_ADDONS_SUBSCRIPTION_STARTINGCSV") + CSIAddonsSubscriptionCatalogSource = GetEnvOrDefault("CSI_ADDONS_SUBSCRIPTION_CATALOGSOURCE") + CSIAddonsSubscriptionCatalogSourceNamespace = GetEnvOrDefault("CSI_ADDONS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE") + IbmSubscriptionName = GetEnvOrDefault("IBM_SUBSCRIPTION_NAME") IbmSubscriptionPackage = GetEnvOrDefault("IBM_SUBSCRIPTION_PACKAGE") IbmSubscriptionChannel = GetEnvOrDefault("IBM_SUBSCRIPTION_CHANNEL") diff --git a/hack/make-bundle-vars.mk b/hack/make-bundle-vars.mk index 7e188e446..7cae6dee0 100644 --- a/hack/make-bundle-vars.mk +++ b/hack/make-bundle-vars.mk @@ -65,6 +65,11 @@ NOOBAA_BUNDLE_IMG_TAG ?= v5.9.0 NOOBAA_BUNDLE_IMG_LOCATION ?= quay.io/noobaa NOOBAA_BUNDLE_IMG ?= $(NOOBAA_BUNDLE_IMG_LOCATION)/$(NOOBAA_BUNDLE_IMG_NAME):$(NOOBAA_BUNDLE_IMG_TAG) +CSI_ADDONS_BUNDLE_IMG_TAG ?= latest +CSI_ADDONS_BUNDLE_IMG_LOCATION ?= quay.io/csiaddons/k8s-bundle +CSI_ADDONS_BUNDLE_IMG ?= $(CSI_ADDONS_BUNDLE_IMG_LOCATION):$(CSI_ADDONS_IMAGE_TAG) +CSI_ADDONS_BUNDLE_NAME ?= csi-addons + IBM_BUNDLE_NAME ?= ibm-storage-odf-operator IBM_BUNDLE_IMG_NAME ?= $(IBM_BUNDLE_NAME)-bundle IBM_BUNDLE_IMG_TAG ?= 1.0.0 @@ -78,7 +83,7 @@ ODF_CONSOLE_IMG ?= $(ODF_CONSOLE_IMG_LOCATION)/$(ODF_CONSOLE_IMG_NAME):$(ODF_CON # A comma-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 ?= $(shell echo $(BUNDLE_IMG) $(OCS_BUNDLE_IMG) $(IBM_BUNDLE_IMG) $(NOOBAA_BUNDLE_IMG) | sed "s/ /,/g") +BUNDLE_IMGS ?= $(shell echo $(BUNDLE_IMG) $(OCS_BUNDLE_IMG) $(IBM_BUNDLE_IMG) $(CSI_ADDONS_BUNDLE_IMG) $(NOOBAA_BUNDLE_IMG) | sed "s/ /,/g") # Set CATALOG_BASE_IMG to an existing catalog image tag to add $BUNDLE_IMGS to that image. ifneq ($(origin CATALOG_BASE_IMG), undefined) @@ -99,6 +104,13 @@ NOOBAA_SUBSCRIPTION_STARTINGCSV ?= $(NOOBAA_BUNDLE_NAME).$(NOOBAA_BUNDLE_IMG_TAG NOOBAA_SUBSCRIPTION_CATALOGSOURCE ?= $(OPERATOR_CATALOGSOURCE) NOOBAA_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE ?= $(OPERATOR_NAMESPACE) +CSI_ADDONS_SUBSCRIPTION_CATALOGSOURCE ?= $(OPERATOR_CATALOGSOURCE) +CSI_ADDONS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE ?= $(OPERATOR_NAMESPACE) +CSI_ADDONS_SUBSCRIPTION_CHANNEL ?= $(DEFAULT_CHANNEL) +CSI_ADDONS_SUBSCRIPTION_NAME ?= $(CSI_ADDONS_BUNDLE_NAME) +CSI_ADDONS_SUBSCRIPTION_PACKAGE ?= $(CSI_ADDONS_BUNDLE_NAME) +CSI_ADDONS_SUBSCRIPTION_STARTINGCSV ?= $(CSI_ADDONS_BUNDLE_NAME).$(CSI_ADDONS_BUNDLE_IMG_TAG) + OCS_SUBSCRIPTION_NAME ?= $(OCS_BUNDLE_NAME) OCS_SUBSCRIPTION_PACKAGE ?= $(OCS_BUNDLE_NAME) OCS_SUBSCRIPTION_CHANNEL ?= $(DEFAULT_CHANNEL)