Merge pull request #499 from iamniting/bundle-deps

makefile: add target to create a new deps bundle

.github/workflows/docker-build.yaml

@@ -69,5 +69,6 @@ jobs:
       run: |
         docker run -d -p 5000:5000 --name registry registry:2
         make bundle-build bundle-push catalog-build catalog-deps-build
+        sed -i 's|localhost:5000|quay.io|g' catalog/odf-dependencies.yaml
         msg='Uncommitted catalog changes. run `make catalog` and commit results.'
         git diff --exit-code catalog || (echo -e '\e[31m'"$msg"; exit 1)

Makefile

@@ -64,6 +64,12 @@ e2e-test: ginkgo ## Run end to end functional tests.
 	./hack/e2e-test.sh
 
 define MANAGER_ENV_VARS
+ODF_DEPS_SUBSCRIPTION_NAME=$(ODF_DEPS_SUBSCRIPTION_NAME)
+ODF_DEPS_SUBSCRIPTION_PACKAGE=$(ODF_DEPS_SUBSCRIPTION_PACKAGE)
+ODF_DEPS_SUBSCRIPTION_CHANNEL=$(ODF_DEPS_SUBSCRIPTION_CHANNEL)
+ODF_DEPS_SUBSCRIPTION_STARTINGCSV=$(ODF_DEPS_SUBSCRIPTION_STARTINGCSV)
+ODF_DEPS_SUBSCRIPTION_CATALOGSOURCE=$(ODF_DEPS_SUBSCRIPTION_CATALOGSOURCE)
+ODF_DEPS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=$(ODF_DEPS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE)
 NOOBAA_SUBSCRIPTION_NAME=$(NOOBAA_SUBSCRIPTION_NAME)
 NOOBAA_SUBSCRIPTION_PACKAGE=$(NOOBAA_SUBSCRIPTION_PACKAGE)
 NOOBAA_SUBSCRIPTION_CHANNEL=$(NOOBAA_SUBSCRIPTION_CHANNEL)
@@ -170,10 +176,18 @@ undeploy-with-olm: ## Undeploy controller from the K8s cluster
 
 # Make target to ignore (git checkout) changes if there are only timestamp changes in the bundle
 checkout-bundle-timestamp:
-	(git diff --quiet --ignore-matching-lines createdAt bundle && git checkout --quiet bundle) || true
+	(git diff --quiet --ignore-matching-lines createdAt bundle/odf-operator && git checkout --quiet bundle/odf-operator) || true
+	(git diff --quiet --ignore-matching-lines createdAt bundle/odf-dependencies && git checkout --quiet bundle/odf-dependencies) || true
 
 .PHONY: bundle
 bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metadata, then validate generated files.
+	# Dependencies bundle
+	$(KUSTOMIZE) build config/bundle | $(OPERATOR_SDK) generate bundle -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS) \
+		--output-dir bundle/odf-dependencies --package odf-dependencies
+	$(OPERATOR_SDK) bundle validate bundle/odf-dependencies
+	@mv bundle.Dockerfile bundle.deps.Dockerfile
+
+	# Main odf-operator bundle
 	$(OPERATOR_SDK) generate kustomize manifests -q
 	cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
 	cd config/default && $(KUSTOMIZE) edit set image rbac-proxy=$(RBAC_PROXY_IMG)
@@ -184,24 +198,28 @@ bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metada
 		'olm.properties':'[{"type": "olm.maxOpenShiftVersion", "value": "$(MAX_OCP_VERSION)"}]' && \
 		$(KUSTOMIZE) edit add patch --name odf-operator.v0.0.0 --kind ClusterServiceVersion \
 		--patch '[{"op": "replace", "path": "/spec/replaces", "value": "$(REPLACES)"}]'
-	$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS)
-	$(OPERATOR_SDK) bundle validate ./bundle
+	$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS) \
+		--output-dir bundle/odf-operator
+	$(OPERATOR_SDK) bundle validate bundle/odf-operator
 	@$(MAKE) --no-print-directory checkout-bundle-timestamp
 
 .PHONY: bundle-build
 bundle-build: bundle ## Build the bundle image.
 	docker build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
+	docker build -f bundle.deps.Dockerfile -t $(ODF_DEPS_BUNDLE_IMG) .
 
 .PHONY: bundle-push
 bundle-push: ## Push the bundle image.
 	$(MAKE) docker-push IMG=$(BUNDLE_IMG)
+	$(MAKE) docker-push IMG=$(ODF_DEPS_BUNDLE_IMG)
 
 # Build a catalog image by adding bundle images to an empty catalog using the operator package manager tool, 'opm'.
 # This recipe invokes 'opm' in 'semver' bundle add mode. For more information on add modes, see:
 # https://github.com/operator-framework/community-operators/blob/7f1438c/docs/packaging-operator.md#updating-your-existing-operator
 .PHONY: catalog
 catalog: opm ## Generate catalog manifests and then validate generated files.
 	$(OPM) render --output=yaml $(BUNDLE_IMG) $(OPM_RENDER_OPTS) > catalog/odf.yaml
+	$(OPM) render --output=yaml $(ODF_DEPS_BUNDLE_IMG) $(OPM_RENDER_OPTS) > catalog/odf-dependencies.yaml
 	$(OPM) render --output=yaml $(OCS_BUNDLE_IMG) $(OPM_RENDER_OPTS) > catalog/ocs.yaml
 	$(OPM) render --output=yaml $(OCS_CLIENT_BUNDLE_IMG) $(OPM_RENDER_OPTS) > catalog/ocs-client.yaml
 	$(OPM) render --output=yaml $(IBM_BUNDLE_IMG) $(OPM_RENDER_OPTS) > catalog/ibm.yaml

bundle.Dockerfile

@@ -16,6 +16,6 @@ LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1
 LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/
 
 # Copy files to locations specified by labels.
-COPY bundle/manifests /manifests/
-COPY bundle/metadata /metadata/
-COPY bundle/tests/scorecard /tests/scorecard/
+COPY bundle/odf-operator/manifests /manifests/
+COPY bundle/odf-operator/metadata /metadata/
+COPY bundle/odf-operator/tests/scorecard /tests/scorecard/

bundle.deps.Dockerfile

@@ -0,0 +1,16 @@
+FROM scratch
+
+# Core bundle labels.
+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=odf-dependencies
+LABEL operators.operatorframework.io.bundle.channels.v1=alpha
+LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.31.0
+LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
+LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
+
+# Copy files to locations specified by labels.
+COPY bundle/odf-dependencies/manifests /manifests/
+COPY bundle/odf-dependencies/metadata /metadata/

bundle/odf-dependencies/manifests/odf-dependencies.clusterserviceversion.yaml

@@ -0,0 +1,49 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: ClusterServiceVersion
+metadata:
+  annotations:
+    alm-examples: '[]'
+    createdAt: "2024-11-14T03:00:40Z"
+    operatorframework.io/suggested-namespace: openshift-storage
+    operators.operatorframework.io/builder: operator-sdk-v1.31.0
+    operators.operatorframework.io/operator-type: non-standalone
+    operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
+  labels:
+    operatorframework.io/arch.amd64: supported
+    operatorframework.io/arch.ppc64le: supported
+    operatorframework.io/arch.s390x: supported
+  name: odf-dependencies.v4.18.0
+  namespace: placeholder
+spec:
+  apiservicedefinitions: {}
+  customresourcedefinitions: {}
+  description: |
+    deploys dependencies.
+  displayName: Data Foundation Dependencies
+  icon:
+  - base64data: PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxOTIgMTQ1Ij48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6I2UwMDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPlJlZEhhdC1Mb2dvLUhhdC1Db2xvcjwvdGl0bGU+PHBhdGggZD0iTTE1Ny43Nyw2Mi42MWExNCwxNCwwLDAsMSwuMzEsMy40MmMwLDE0Ljg4LTE4LjEsMTcuNDYtMzAuNjEsMTcuNDZDNzguODMsODMuNDksNDIuNTMsNTMuMjYsNDIuNTMsNDRhNi40Myw2LjQzLDAsMCwxLC4yMi0xLjk0bC0zLjY2LDkuMDZhMTguNDUsMTguNDUsMCwwLDAtMS41MSw3LjMzYzAsMTguMTEsNDEsNDUuNDgsODcuNzQsNDUuNDgsMjAuNjksMCwzNi40My03Ljc2LDM2LjQzLTIxLjc3LDAtMS4wOCwwLTEuOTQtMS43My0xMC4xM1oiLz48cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik0xMjcuNDcsODMuNDljMTIuNTEsMCwzMC42MS0yLjU4LDMwLjYxLTE3LjQ2YTE0LDE0LDAsMCwwLS4zMS0zLjQybC03LjQ1LTMyLjM2Yy0xLjcyLTcuMTItMy4yMy0xMC4zNS0xNS43My0xNi42QzEyNC44OSw4LjY5LDEwMy43Ni41LDk3LjUxLjUsOTEuNjkuNSw5MCw4LDgzLjA2LDhjLTYuNjgsMC0xMS42NC01LjYtMTcuODktNS42LTYsMC05LjkxLDQuMDktMTIuOTMsMTIuNSwwLDAtOC40MSwyMy43Mi05LjQ5LDI3LjE2QTYuNDMsNi40MywwLDAsMCw0Mi41Myw0NGMwLDkuMjIsMzYuMywzOS40NSw4NC45NCwzOS40NU0xNjAsNzIuMDdjMS43Myw4LjE5LDEuNzMsOS4wNSwxLjczLDEwLjEzLDAsMTQtMTUuNzQsMjEuNzctMzYuNDMsMjEuNzdDNzguNTQsMTA0LDM3LjU4LDc2LjYsMzcuNTgsNTguNDlhMTguNDUsMTguNDUsMCwwLDEsMS41MS03LjMzQzIyLjI3LDUyLC41LDU1LC41LDc0LjIyYzAsMzEuNDgsNzQuNTksNzAuMjgsMTMzLjY1LDcwLjI4LDQ1LjI4LDAsNTYuNy0yMC40OCw1Ni43LTM2LjY1LDAtMTIuNzItMTEtMjcuMTYtMzAuODMtMzUuNzgiLz48L3N2Zz4=
+    mediatype: image/svg+xml
+  install:
+    spec:
+      deployments: []
+    strategy: deployment
+  installModes:
+  - supported: true
+    type: OwnNamespace
+  - supported: true
+    type: SingleNamespace
+  - supported: false
+    type: MultiNamespace
+  - supported: false
+    type: AllNamespaces
+  links:
+  - name: Source Code
+    url: https://github.com/red-hat-storage/odf-operator
+  maintainers:
+  - email: ocs-support@redhat.com
+    name: Red Hat Support
+  maturity: alpha
+  minKubeVersion: 1.16.0
+  provider:
+    name: Red Hat
+  version: 4.18.0

bundle/odf-dependencies/metadata/annotations.yaml

@@ -0,0 +1,11 @@
+annotations:
+  # Core bundle annotations.
+  operators.operatorframework.io.bundle.mediatype.v1: registry+v1
+  operators.operatorframework.io.bundle.manifests.v1: manifests/
+  operators.operatorframework.io.bundle.metadata.v1: metadata/
+  operators.operatorframework.io.bundle.package.v1: odf-dependencies
+  operators.operatorframework.io.bundle.channels.v1: alpha
+  operators.operatorframework.io.bundle.channel.default.v1: alpha
+  operators.operatorframework.io.metrics.builder: operator-sdk-v1.31.0
+  operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
+  operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3

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

@@ -36,6 +36,12 @@ data:
   OCS_SUBSCRIPTION_NAME: ocs-operator
   OCS_SUBSCRIPTION_PACKAGE: ocs-operator
   OCS_SUBSCRIPTION_STARTINGCSV: ocs-operator.v4.18.0
+  ODF_DEPS_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource
+  ODF_DEPS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-marketplace
+  ODF_DEPS_SUBSCRIPTION_CHANNEL: alpha
+  ODF_DEPS_SUBSCRIPTION_NAME: odf-dependencies
+  ODF_DEPS_SUBSCRIPTION_PACKAGE: odf-dependencies
+  ODF_DEPS_SUBSCRIPTION_STARTINGCSV: odf-dependencies.v4.18.0
   PROMETHEUS_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource
   PROMETHEUS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-marketplace
   PROMETHEUS_SUBSCRIPTION_CHANNEL: beta

bundle/manifests/odf-operator.clusterserviceversion.yaml → bundle/odf-operator/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-11-13T13:01:04Z"
+    createdAt: "2024-11-14T03:00:40Z"
     description: OpenShift Data Foundation provides a common control plane for storage
       solutions on OpenShift Container Platform.
     features.operators.openshift.io/token-auth-aws: "true"
@@ -418,6 +418,7 @@ spec:
                     port: 8081
                   initialDelaySeconds: 5
                   periodSeconds: 10
+                  timeoutSeconds: 90
                 resources:
                   limits:
                     cpu: 200m

catalog/index.yaml

@@ -9,6 +9,17 @@ name: alpha
 entries:
   - name: odf-operator.v4.18.0
 
+---
+defaultChannel: alpha
+name: odf-dependencies
+schema: olm.package
+---
+schema: olm.channel
+package: odf-dependencies
+name: alpha
+entries:
+  - name: odf-dependencies.v4.18.0
+
 ---
 defaultChannel: alpha
 name: ocs-operator

catalog/odf-dependencies.yaml

@@ -0,0 +1,48 @@
+---
+image: quay.io/ocs-dev/odf-dependencies-bundle:latest
+name: odf-dependencies.v4.18.0
+package: odf-dependencies
+properties:
+- type: olm.package
+  value:
+    packageName: odf-dependencies
+    version: 4.18.0
+- type: olm.package.required
+  value:
+    packageName: cephcsi-operator
+    versionRange: '>=4.17.0 <=4.18.0'
+- type: olm.package.required
+  value:
+    packageName: csi-addons
+    versionRange: '>=0.9.1 <=0.10.0'
+- type: olm.package.required
+  value:
+    packageName: noobaa-operator
+    versionRange: '>=5.17.0 <=5.18.0'
+- type: olm.package.required
+  value:
+    packageName: ocs-client-operator
+    versionRange: '>=4.17.0 <=4.18.0'
+- type: olm.package.required
+  value:
+    packageName: ocs-operator
+    versionRange: '>=4.17.0 <=4.18.0'
+- type: olm.package.required
+  value:
+    packageName: odf-prometheus-operator
+    versionRange: '>=4.17.0 <=4.18.0'
+- type: olm.package.required
+  value:
+    packageName: recipe
+    versionRange: 0.0.1
+- type: olm.package.required
+  value:
+    packageName: rook-ceph-operator
+    versionRange: '>=4.17.0 <=4.18.0'
+- type: olm.bundle.object
+  value:
+    data: eyJhcGlWZXJzaW9uIjoib3BlcmF0b3JzLmNvcmVvcy5jb20vdjFhbHBoYTEiLCJraW5kIjoiQ2x1c3RlclNlcnZpY2VWZXJzaW9uIiwibWV0YWRhdGEiOnsiYW5ub3RhdGlvbnMiOnsiYWxtLWV4YW1wbGVzIjoiW10iLCJjcmVhdGVkQXQiOiIyMDI0LTExLTE0VDAzOjAwOjQwWiIsIm9wZXJhdG9yZnJhbWV3b3JrLmlvL3N1Z2dlc3RlZC1uYW1lc3BhY2UiOiJvcGVuc2hpZnQtc3RvcmFnZSIsIm9wZXJhdG9ycy5vcGVyYXRvcmZyYW1ld29yay5pby9idWlsZGVyIjoib3BlcmF0b3Itc2RrLXYxLjMxLjAiLCJvcGVyYXRvcnMub3BlcmF0b3JmcmFtZXdvcmsuaW8vb3BlcmF0b3ItdHlwZSI6Im5vbi1zdGFuZGFsb25lIiwib3BlcmF0b3JzLm9wZXJhdG9yZnJhbWV3b3JrLmlvL3Byb2plY3RfbGF5b3V0IjoiZ28ua3ViZWJ1aWxkZXIuaW8vdjMifSwibGFiZWxzIjp7Im9wZXJhdG9yZnJhbWV3b3JrLmlvL2FyY2guYW1kNjQiOiJzdXBwb3J0ZWQiLCJvcGVyYXRvcmZyYW1ld29yay5pby9hcmNoLnBwYzY0bGUiOiJzdXBwb3J0ZWQiLCJvcGVyYXRvcmZyYW1ld29yay5pby9hcmNoLnMzOTB4Ijoic3VwcG9ydGVkIn0sIm5hbWUiOiJvZGYtZGVwZW5kZW5jaWVzLnY0LjE4LjAiLCJuYW1lc3BhY2UiOiJwbGFjZWhvbGRlciJ9LCJzcGVjIjp7ImFwaXNlcnZpY2VkZWZpbml0aW9ucyI6e30sImN1c3RvbXJlc291cmNlZGVmaW5pdGlvbnMiOnt9LCJkZXNjcmlwdGlvbiI6ImRlcGxveXMgZGVwZW5kZW5jaWVzLlxuIiwiZGlzcGxheU5hbWUiOiJEYXRhIEZvdW5kYXRpb24gRGVwZW5kZW5jaWVzIiwiaWNvbiI6W3siYmFzZTY0ZGF0YSI6IlBITjJaeUJwWkQwaVRHRjVaWEpmTVNJZ1pHRjBZUzF1WVcxbFBTSk1ZWGxsY2lBeElpQjRiV3h1Y3owaWFIUjBjRG92TDNkM2R5NTNNeTV2Y21jdk1qQXdNQzl6ZG1jaUlIWnBaWGRDYjNnOUlqQWdNQ0F4T1RJZ01UUTFJajQ4WkdWbWN6NDhjM1I1YkdVK0xtTnNjeTB4ZTJacGJHdzZJMlV3TUR0OVBDOXpkSGxzWlQ0OEwyUmxabk0rUEhScGRHeGxQbEpsWkVoaGRDMU1iMmR2TFVoaGRDMURiMnh2Y2p3dmRHbDBiR1UrUEhCaGRHZ2daRDBpVFRFMU55NDNOeXcyTWk0Mk1XRXhOQ3d4TkN3d0xEQXNNU3d1TXpFc015NDBNbU13TERFMExqZzRMVEU0TGpFc01UY3VORFl0TXpBdU5qRXNNVGN1TkRaRE56Z3VPRE1zT0RNdU5Ea3NOREl1TlRNc05UTXVNallzTkRJdU5UTXNORFJoTmk0ME15dzJMalF6TERBc01Dd3hMQzR5TWkweExqazBiQzB6TGpZMkxEa3VNRFpoTVRndU5EVXNNVGd1TkRVc01Dd3dMREF0TVM0MU1TdzNMak16WXpBc01UZ3VNVEVzTkRFc05EVXVORGdzT0RjdU56UXNORFV1TkRnc01qQXVOamtzTUN3ek5pNDBNeTAzTGpjMkxETTJMalF6TFRJeExqYzNMREF0TVM0d09Dd3dMVEV1T1RRdE1TNDNNeTB4TUM0eE0xb2lMejQ4Y0dGMGFDQmpiR0Z6Y3owaVkyeHpMVEVpSUdROUlrMHhNamN1TkRjc09ETXVORGxqTVRJdU5URXNNQ3d6TUM0Mk1TMHlMalU0TERNd0xqWXhMVEUzTGpRMllURTBMREUwTERBc01Dd3dMUzR6TVMwekxqUXliQzAzTGpRMUxUTXlMak0yWXkweExqY3lMVGN1TVRJdE15NHlNeTB4TUM0ek5TMHhOUzQzTXkweE5pNDJRekV5TkM0NE9TdzRMalk1TERFd015NDNOaTQxTERrM0xqVXhMalVzT1RFdU5qa3VOU3c1TUN3NExEZ3pMakEyTERoakxUWXVOamdzTUMweE1TNDJOQzAxTGpZdE1UY3VPRGt0TlM0MkxUWXNNQzA1TGpreExEUXVNRGt0TVRJdU9UTXNNVEl1TlN3d0xEQXRPQzQwTVN3eU15NDNNaTA1TGpRNUxESTNMakUyUVRZdU5ETXNOaTQwTXl3d0xEQXNNQ3cwTWk0MU15dzBOR013TERrdU1qSXNNell1TXl3ek9TNDBOU3c0TkM0NU5Dd3pPUzQwTlUweE5qQXNOekl1TURkak1TNDNNeXc0TGpFNUxERXVOek1zT1M0d05Td3hMamN6TERFd0xqRXpMREFzTVRRdE1UVXVOelFzTWpFdU56Y3RNell1TkRNc01qRXVOemRETnpndU5UUXNNVEEwTERNM0xqVTRMRGMyTGpZc016Y3VOVGdzTlRndU5EbGhNVGd1TkRVc01UZ3VORFVzTUN3d0xERXNNUzQxTVMwM0xqTXpRekl5TGpJM0xEVXlMQzQxTERVMUxDNDFMRGMwTGpJeVl6QXNNekV1TkRnc056UXVOVGtzTnpBdU1qZ3NNVE16TGpZMUxEY3dMakk0TERRMUxqSTRMREFzTlRZdU55MHlNQzQwT0N3MU5pNDNMVE0yTGpZMUxEQXRNVEl1TnpJdE1URXRNamN1TVRZdE16QXVPRE10TXpVdU56Z2lMejQ4TDNOMlp6ND0iLCJtZWRpYXR5cGUiOiJpbWFnZS9zdmcreG1sIn1dLCJpbnN0YWxsIjp7InNwZWMiOnsiZGVwbG95bWVudHMiOltdfSwic3RyYXRlZ3kiOiJkZXBsb3ltZW50In0sImluc3RhbGxNb2RlcyI6W3sic3VwcG9ydGVkIjp0cnVlLCJ0eXBlIjoiT3duTmFtZXNwYWNlIn0seyJzdXBwb3J0ZWQiOnRydWUsInR5cGUiOiJTaW5nbGVOYW1lc3BhY2UifSx7InN1cHBvcnRlZCI6ZmFsc2UsInR5cGUiOiJNdWx0aU5hbWVzcGFjZSJ9LHsic3VwcG9ydGVkIjpmYWxzZSwidHlwZSI6IkFsbE5hbWVzcGFjZXMifV0sImxpbmtzIjpbeyJuYW1lIjoiU291cmNlIENvZGUiLCJ1cmwiOiJodHRwczovL2dpdGh1Yi5jb20vcmVkLWhhdC1zdG9yYWdlL29kZi1vcGVyYXRvciJ9XSwibWFpbnRhaW5lcnMiOlt7ImVtYWlsIjoib2NzLXN1cHBvcnRAcmVkaGF0LmNvbSIsIm5hbWUiOiJSZWQgSGF0IFN1cHBvcnQifV0sIm1hdHVyaXR5IjoiYWxwaGEiLCJtaW5LdWJlVmVyc2lvbiI6IjEuMTYuMCIsInByb3ZpZGVyIjp7Im5hbWUiOiJSZWQgSGF0In0sInZlcnNpb24iOiI0LjE4LjAifX0=
+relatedImages:
+- image: quay.io/ocs-dev/odf-dependencies-bundle:latest
+  name: ""
+schema: olm.bundle

config/bundle/csv.yaml

@@ -0,0 +1,40 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: ClusterServiceVersion
+metadata:
+  annotations:
+    operatorframework.io/suggested-namespace: openshift-storage
+    operators.operatorframework.io/operator-type: non-standalone
+  labels:
+    operatorframework.io/arch.amd64: supported
+    operatorframework.io/arch.ppc64le: supported
+    operatorframework.io/arch.s390x: supported
+  name: odf-dependencies.v0.0.0
+  namespace: placeholder
+spec:
+  apiservicedefinitions: {}
+  description: |
+    deploys dependencies.
+  displayName: Data Foundation Dependencies
+  icon:
+  - base64data: PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxOTIgMTQ1Ij48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6I2UwMDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPlJlZEhhdC1Mb2dvLUhhdC1Db2xvcjwvdGl0bGU+PHBhdGggZD0iTTE1Ny43Nyw2Mi42MWExNCwxNCwwLDAsMSwuMzEsMy40MmMwLDE0Ljg4LTE4LjEsMTcuNDYtMzAuNjEsMTcuNDZDNzguODMsODMuNDksNDIuNTMsNTMuMjYsNDIuNTMsNDRhNi40Myw2LjQzLDAsMCwxLC4yMi0xLjk0bC0zLjY2LDkuMDZhMTguNDUsMTguNDUsMCwwLDAtMS41MSw3LjMzYzAsMTguMTEsNDEsNDUuNDgsODcuNzQsNDUuNDgsMjAuNjksMCwzNi40My03Ljc2LDM2LjQzLTIxLjc3LDAtMS4wOCwwLTEuOTQtMS43My0xMC4xM1oiLz48cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik0xMjcuNDcsODMuNDljMTIuNTEsMCwzMC42MS0yLjU4LDMwLjYxLTE3LjQ2YTE0LDE0LDAsMCwwLS4zMS0zLjQybC03LjQ1LTMyLjM2Yy0xLjcyLTcuMTItMy4yMy0xMC4zNS0xNS43My0xNi42QzEyNC44OSw4LjY5LDEwMy43Ni41LDk3LjUxLjUsOTEuNjkuNSw5MCw4LDgzLjA2LDhjLTYuNjgsMC0xMS42NC01LjYtMTcuODktNS42LTYsMC05LjkxLDQuMDktMTIuOTMsMTIuNSwwLDAtOC40MSwyMy43Mi05LjQ5LDI3LjE2QTYuNDMsNi40MywwLDAsMCw0Mi41Myw0NGMwLDkuMjIsMzYuMywzOS40NSw4NC45NCwzOS40NU0xNjAsNzIuMDdjMS43Myw4LjE5LDEuNzMsOS4wNSwxLjczLDEwLjEzLDAsMTQtMTUuNzQsMjEuNzctMzYuNDMsMjEuNzdDNzguNTQsMTA0LDM3LjU4LDc2LjYsMzcuNTgsNTguNDlhMTguNDUsMTguNDUsMCwwLDEsMS41MS03LjMzQzIyLjI3LDUyLC41LDU1LC41LDc0LjIyYzAsMzEuNDgsNzQuNTksNzAuMjgsMTMzLjY1LDcwLjI4LDQ1LjI4LDAsNTYuNy0yMC40OCw1Ni43LTM2LjY1LDAtMTIuNzItMTEtMjcuMTYtMzAuODMtMzUuNzgiLz48L3N2Zz4=
+    mediatype: image/svg+xml
+  installModes:
+  - supported: true
+    type: OwnNamespace
+  - supported: true
+    type: SingleNamespace
+  - supported: false
+    type: MultiNamespace
+  - supported: false
+    type: AllNamespaces
+  links:
+  - name: Source Code
+    url: https://github.com/red-hat-storage/odf-operator
+  maintainers:
+  - email: ocs-support@redhat.com
+    name: Red Hat Support
+  maturity: alpha
+  minKubeVersion: 1.16.0
+  provider:
+    name: Red Hat
+  version: 0.0.0

config/bundle/kustomization.yaml

@@ -0,0 +1,2 @@
+resources:
+- csv.yaml

config/manager/manager.env

@@ -1,3 +1,9 @@
+ODF_DEPS_SUBSCRIPTION_NAME=odf-dependencies
+ODF_DEPS_SUBSCRIPTION_PACKAGE=odf-dependencies
+ODF_DEPS_SUBSCRIPTION_CHANNEL=alpha
+ODF_DEPS_SUBSCRIPTION_STARTINGCSV=odf-dependencies.v4.18.0
+ODF_DEPS_SUBSCRIPTION_CATALOGSOURCE=odf-catalogsource
+ODF_DEPS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-marketplace
 NOOBAA_SUBSCRIPTION_NAME=noobaa-operator
 NOOBAA_SUBSCRIPTION_PACKAGE=noobaa-operator
 NOOBAA_SUBSCRIPTION_CHANNEL=alpha

config/manager/manager.yaml

@@ -50,6 +50,7 @@ spec:
             drop:
               - ALL
           readOnlyRootFilesystem: true
+        # ref https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes
         livenessProbe:
           httpGet:
             path: /healthz
@@ -62,6 +63,7 @@ spec:
             port: 8081
           initialDelaySeconds: 5
           periodSeconds: 10
+          timeoutSeconds: 90
         resources:
           limits:
             cpu: 200m