Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ catalog: opm ## Generate catalog manifests and then validate generated files.
$(OPM) render --output=yaml $(IBM_ODF_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 $(ODF_SNAPSHOT_CONTROLLER_BUNDLE_IMG) $(OPM_RENDER_OPTS) > catalog/odf-external-snapshotter-operator.yaml
$(OPM) render --output=yaml $(CEPHCSI_BUNDLE_IMG) $(OPM_RENDER_OPTS) > catalog/cephcsi.yaml
$(OPM) render --output=yaml $(ROOK_BUNDLE_IMG) $(OPM_RENDER_OPTS) > catalog/rook.yaml
$(OPM) render --output=yaml $(PROMETHEUS_BUNDLE_IMG) $(OPM_RENDER_OPTS) > catalog/prometheus.yaml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: ClusterServiceVersion
metadata:
annotations:
alm-examples: '[]'
createdAt: "2025-03-06T06:49:16Z"
createdAt: "2025-06-12T07:10:20Z"
olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.20"}]'
olm.skipRange: ""
operatorframework.io/suggested-namespace: openshift-storage
Expand Down
4 changes: 4 additions & 0 deletions bundle/odf-dependencies/metadata/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ dependencies:
value:
packageName: csi-addons
version: "0.12.0"
- type: olm.package
value:
packageName: odf-external-snapshotter-operator
version: "4.20.0"
- type: olm.package
value:
packageName: cephcsi-operator
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@ data:
pkg: rook-ceph-operator
scaleUpOnInstanceOf:
- cephclusters.ceph.rook.io
SNAPSHOT_CONTROLLER: |
channel: alpha
csv: odf-external-snapshotter-operator.v4.20.0
pkg: odf-external-snapshotter-operator
scaleUpOnInstanceOf:
- cephclusters.ceph.rook.io
kind: ConfigMap
metadata:
name: odf-operator-pkgs-config-4.19.0
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ metadata:
categories: Storage
console.openshift.io/plugins: '["odf-console"]'
containerImage: quay.io/ocs-dev/odf-operator:latest
createdAt: "2025-04-03T06:26:57Z"
createdAt: "2025-06-12T07:10:21Z"
description: OpenShift Data Foundation provides a common control plane for storage
solutions on OpenShift Container Platform.
features.operators.openshift.io/token-auth-aws: "true"
Expand Down
11 changes: 11 additions & 0 deletions catalog/index.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,17 @@ name: alpha
entries:
- name: csi-addons.v0.12.0

---
defaultChannel: alpha
name: odf-external-snapshotter-operator
schema: olm.package
---
schema: olm.channel
package: odf-external-snapshotter-operator
name: alpha
entries:
- name: odf-external-snapshotter-operator.v4.20.0

---
defaultChannel: alpha
name: cephcsi-operator
Expand Down
6 changes: 5 additions & 1 deletion catalog/odf-dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ properties:
value:
packageName: ocs-operator
versionRange: 4.19.0
- type: olm.package.required
value:
packageName: odf-external-snapshotter-operator
versionRange: 4.20.0
- type: olm.package.required
value:
packageName: odf-prometheus-operator
Expand All @@ -43,7 +47,7 @@ properties:
versionRange: 4.19.0
- type: olm.bundle.object
value:
data: eyJhcGlWZXJzaW9uIjoib3BlcmF0b3JzLmNvcmVvcy5jb20vdjFhbHBoYTEiLCJraW5kIjoiQ2x1c3RlclNlcnZpY2VWZXJzaW9uIiwibWV0YWRhdGEiOnsiYW5ub3RhdGlvbnMiOnsiYWxtLWV4YW1wbGVzIjoiW10iLCJjcmVhdGVkQXQiOiIyMDI1LTAzLTA2VDA2OjQ5OjE2WiIsIm9sbS5wcm9wZXJ0aWVzIjoiW3tcInR5cGVcIjogXCJvbG0ubWF4T3BlblNoaWZ0VmVyc2lvblwiLCBcInZhbHVlXCI6IFwiNC4yMFwifV0iLCJvbG0uc2tpcFJhbmdlIjoiIiwib3BlcmF0b3JmcmFtZXdvcmsuaW8vc3VnZ2VzdGVkLW5hbWVzcGFjZSI6Im9wZW5zaGlmdC1zdG9yYWdlIiwib3BlcmF0b3JzLm9wZXJhdG9yZnJhbWV3b3JrLmlvL2J1aWxkZXIiOiJvcGVyYXRvci1zZGstdjEuMzEuMCIsIm9wZXJhdG9ycy5vcGVyYXRvcmZyYW1ld29yay5pby9vcGVyYXRvci10eXBlIjoibm9uLXN0YW5kYWxvbmUiLCJvcGVyYXRvcnMub3BlcmF0b3JmcmFtZXdvcmsuaW8vcHJvamVjdF9sYXlvdXQiOiJnby5rdWJlYnVpbGRlci5pby92MyJ9LCJsYWJlbHMiOnsib3BlcmF0b3JmcmFtZXdvcmsuaW8vYXJjaC5hbWQ2NCI6InN1cHBvcnRlZCIsIm9wZXJhdG9yZnJhbWV3b3JrLmlvL2FyY2gucHBjNjRsZSI6InN1cHBvcnRlZCIsIm9wZXJhdG9yZnJhbWV3b3JrLmlvL2FyY2guczM5MHgiOiJzdXBwb3J0ZWQifSwibmFtZSI6Im9kZi1kZXBlbmRlbmNpZXMudjQuMTkuMCIsIm5hbWVzcGFjZSI6InBsYWNlaG9sZGVyIn0sInNwZWMiOnsiYXBpc2VydmljZWRlZmluaXRpb25zIjp7fSwiY3VzdG9tcmVzb3VyY2VkZWZpbml0aW9ucyI6e30sImRlc2NyaXB0aW9uIjoiZGVwbG95cyBkZXBlbmRlbmNpZXMuXG4iLCJkaXNwbGF5TmFtZSI6IkRhdGEgRm91bmRhdGlvbiBEZXBlbmRlbmNpZXMiLCJpY29uIjpbeyJiYXNlNjRkYXRhIjoiUEhOMlp5QnBaRDBpVEdGNVpYSmZNU0lnWkdGMFlTMXVZVzFsUFNKTVlYbGxjaUF4SWlCNGJXeHVjejBpYUhSMGNEb3ZMM2QzZHk1M015NXZjbWN2TWpBd01DOXpkbWNpSUhacFpYZENiM2c5SWpBZ01DQXhPVElnTVRRMUlqNDhaR1ZtY3o0OGMzUjViR1UrTG1Oc2N5MHhlMlpwYkd3NkkyVXdNRHQ5UEM5emRIbHNaVDQ4TDJSbFpuTStQSFJwZEd4bFBsSmxaRWhoZEMxTWIyZHZMVWhoZEMxRGIyeHZjand2ZEdsMGJHVStQSEJoZEdnZ1pEMGlUVEUxTnk0M055dzJNaTQyTVdFeE5Dd3hOQ3d3TERBc01Td3VNekVzTXk0ME1tTXdMREUwTGpnNExURTRMakVzTVRjdU5EWXRNekF1TmpFc01UY3VORFpETnpndU9ETXNPRE11TkRrc05ESXVOVE1zTlRNdU1qWXNOREl1TlRNc05EUmhOaTQwTXl3MkxqUXpMREFzTUN3eExDNHlNaTB4TGprMGJDMHpMalkyTERrdU1EWmhNVGd1TkRVc01UZ3VORFVzTUN3d0xEQXRNUzQxTVN3M0xqTXpZekFzTVRndU1URXNOREVzTkRVdU5EZ3NPRGN1TnpRc05EVXVORGdzTWpBdU5qa3NNQ3d6Tmk0ME15MDNMamMyTERNMkxqUXpMVEl4TGpjM0xEQXRNUzR3T0N3d0xURXVPVFF0TVM0M015MHhNQzR4TTFvaUx6NDhjR0YwYUNCamJHRnpjejBpWTJ4ekxURWlJR1E5SWsweE1qY3VORGNzT0RNdU5EbGpNVEl1TlRFc01Dd3pNQzQyTVMweUxqVTRMRE13TGpZeExURTNMalEyWVRFMExERTBMREFzTUN3d0xTNHpNUzB6TGpReWJDMDNMalExTFRNeUxqTTJZeTB4TGpjeUxUY3VNVEl0TXk0eU15MHhNQzR6TlMweE5TNDNNeTB4Tmk0MlF6RXlOQzQ0T1N3NExqWTVMREV3TXk0M05pNDFMRGszTGpVeExqVXNPVEV1TmprdU5TdzVNQ3c0TERnekxqQTJMRGhqTFRZdU5qZ3NNQzB4TVM0Mk5DMDFMall0TVRjdU9Ea3ROUzQyTFRZc01DMDVMamt4TERRdU1Ea3RNVEl1T1RNc01USXVOU3d3TERBdE9DNDBNU3d5TXk0M01pMDVMalE1TERJM0xqRTJRVFl1TkRNc05pNDBNeXd3TERBc01DdzBNaTQxTXl3ME5HTXdMRGt1TWpJc016WXVNeXd6T1M0ME5TdzROQzQ1TkN3ek9TNDBOVTB4TmpBc056SXVNRGRqTVM0M015dzRMakU1TERFdU56TXNPUzR3TlN3eExqY3pMREV3TGpFekxEQXNNVFF0TVRVdU56UXNNakV1TnpjdE16WXVORE1zTWpFdU56ZEROemd1TlRRc01UQTBMRE0zTGpVNExEYzJMallzTXpjdU5UZ3NOVGd1TkRsaE1UZ3VORFVzTVRndU5EVXNNQ3d3TERFc01TNDFNUzAzTGpNelF6SXlMakkzTERVeUxDNDFMRFUxTEM0MUxEYzBMakl5WXpBc016RXVORGdzTnpRdU5Ua3NOekF1TWpnc01UTXpMalkxTERjd0xqSTRMRFExTGpJNExEQXNOVFl1TnkweU1DNDBPQ3cxTmk0M0xUTTJMalkxTERBdE1USXVOekl0TVRFdE1qY3VNVFl0TXpBdU9ETXRNelV1TnpnaUx6NDhMM04yWno0PSIsIm1lZGlhdHlwZSI6ImltYWdlL3N2Zyt4bWwifV0sImluc3RhbGwiOnsic3BlYyI6eyJkZXBsb3ltZW50cyI6W119LCJzdHJhdGVneSI6ImRlcGxveW1lbnQifSwiaW5zdGFsbE1vZGVzIjpbeyJzdXBwb3J0ZWQiOnRydWUsInR5cGUiOiJPd25OYW1lc3BhY2UifSx7InN1cHBvcnRlZCI6dHJ1ZSwidHlwZSI6IlNpbmdsZU5hbWVzcGFjZSJ9LHsic3VwcG9ydGVkIjpmYWxzZSwidHlwZSI6Ik11bHRpTmFtZXNwYWNlIn0seyJzdXBwb3J0ZWQiOmZhbHNlLCJ0eXBlIjoiQWxsTmFtZXNwYWNlcyJ9XSwibGlua3MiOlt7Im5hbWUiOiJTb3VyY2UgQ29kZSIsInVybCI6Imh0dHBzOi8vZ2l0aHViLmNvbS9yZWQtaGF0LXN0b3JhZ2Uvb2RmLW9wZXJhdG9yIn1dLCJtYWludGFpbmVycyI6W3siZW1haWwiOiJvY3Mtc3VwcG9ydEByZWRoYXQuY29tIiwibmFtZSI6IlJlZCBIYXQgU3VwcG9ydCJ9XSwibWF0dXJpdHkiOiJhbHBoYSIsIm1pbkt1YmVWZXJzaW9uIjoiMS4xNi4wIiwicHJvdmlkZXIiOnsibmFtZSI6IlJlZCBIYXQifSwidmVyc2lvbiI6IjQuMTkuMCJ9fQ==
data: eyJhcGlWZXJzaW9uIjoib3BlcmF0b3JzLmNvcmVvcy5jb20vdjFhbHBoYTEiLCJraW5kIjoiQ2x1c3RlclNlcnZpY2VWZXJzaW9uIiwibWV0YWRhdGEiOnsiYW5ub3RhdGlvbnMiOnsiYWxtLWV4YW1wbGVzIjoiW10iLCJjcmVhdGVkQXQiOiIyMDI1LTA2LTEyVDA3OjEwOjIwWiIsIm9sbS5wcm9wZXJ0aWVzIjoiW3tcInR5cGVcIjogXCJvbG0ubWF4T3BlblNoaWZ0VmVyc2lvblwiLCBcInZhbHVlXCI6IFwiNC4yMFwifV0iLCJvbG0uc2tpcFJhbmdlIjoiIiwib3BlcmF0b3JmcmFtZXdvcmsuaW8vc3VnZ2VzdGVkLW5hbWVzcGFjZSI6Im9wZW5zaGlmdC1zdG9yYWdlIiwib3BlcmF0b3JzLm9wZXJhdG9yZnJhbWV3b3JrLmlvL2J1aWxkZXIiOiJvcGVyYXRvci1zZGstdjEuMzEuMCIsIm9wZXJhdG9ycy5vcGVyYXRvcmZyYW1ld29yay5pby9vcGVyYXRvci10eXBlIjoibm9uLXN0YW5kYWxvbmUiLCJvcGVyYXRvcnMub3BlcmF0b3JmcmFtZXdvcmsuaW8vcHJvamVjdF9sYXlvdXQiOiJnby5rdWJlYnVpbGRlci5pby92MyJ9LCJsYWJlbHMiOnsib3BlcmF0b3JmcmFtZXdvcmsuaW8vYXJjaC5hbWQ2NCI6InN1cHBvcnRlZCIsIm9wZXJhdG9yZnJhbWV3b3JrLmlvL2FyY2gucHBjNjRsZSI6InN1cHBvcnRlZCIsIm9wZXJhdG9yZnJhbWV3b3JrLmlvL2FyY2guczM5MHgiOiJzdXBwb3J0ZWQifSwibmFtZSI6Im9kZi1kZXBlbmRlbmNpZXMudjQuMTkuMCIsIm5hbWVzcGFjZSI6InBsYWNlaG9sZGVyIn0sInNwZWMiOnsiYXBpc2VydmljZWRlZmluaXRpb25zIjp7fSwiY3VzdG9tcmVzb3VyY2VkZWZpbml0aW9ucyI6e30sImRlc2NyaXB0aW9uIjoiZGVwbG95cyBkZXBlbmRlbmNpZXMuXG4iLCJkaXNwbGF5TmFtZSI6IkRhdGEgRm91bmRhdGlvbiBEZXBlbmRlbmNpZXMiLCJpY29uIjpbeyJiYXNlNjRkYXRhIjoiUEhOMlp5QnBaRDBpVEdGNVpYSmZNU0lnWkdGMFlTMXVZVzFsUFNKTVlYbGxjaUF4SWlCNGJXeHVjejBpYUhSMGNEb3ZMM2QzZHk1M015NXZjbWN2TWpBd01DOXpkbWNpSUhacFpYZENiM2c5SWpBZ01DQXhPVElnTVRRMUlqNDhaR1ZtY3o0OGMzUjViR1UrTG1Oc2N5MHhlMlpwYkd3NkkyVXdNRHQ5UEM5emRIbHNaVDQ4TDJSbFpuTStQSFJwZEd4bFBsSmxaRWhoZEMxTWIyZHZMVWhoZEMxRGIyeHZjand2ZEdsMGJHVStQSEJoZEdnZ1pEMGlUVEUxTnk0M055dzJNaTQyTVdFeE5Dd3hOQ3d3TERBc01Td3VNekVzTXk0ME1tTXdMREUwTGpnNExURTRMakVzTVRjdU5EWXRNekF1TmpFc01UY3VORFpETnpndU9ETXNPRE11TkRrc05ESXVOVE1zTlRNdU1qWXNOREl1TlRNc05EUmhOaTQwTXl3MkxqUXpMREFzTUN3eExDNHlNaTB4TGprMGJDMHpMalkyTERrdU1EWmhNVGd1TkRVc01UZ3VORFVzTUN3d0xEQXRNUzQxTVN3M0xqTXpZekFzTVRndU1URXNOREVzTkRVdU5EZ3NPRGN1TnpRc05EVXVORGdzTWpBdU5qa3NNQ3d6Tmk0ME15MDNMamMyTERNMkxqUXpMVEl4TGpjM0xEQXRNUzR3T0N3d0xURXVPVFF0TVM0M015MHhNQzR4TTFvaUx6NDhjR0YwYUNCamJHRnpjejBpWTJ4ekxURWlJR1E5SWsweE1qY3VORGNzT0RNdU5EbGpNVEl1TlRFc01Dd3pNQzQyTVMweUxqVTRMRE13TGpZeExURTNMalEyWVRFMExERTBMREFzTUN3d0xTNHpNUzB6TGpReWJDMDNMalExTFRNeUxqTTJZeTB4TGpjeUxUY3VNVEl0TXk0eU15MHhNQzR6TlMweE5TNDNNeTB4Tmk0MlF6RXlOQzQ0T1N3NExqWTVMREV3TXk0M05pNDFMRGszTGpVeExqVXNPVEV1TmprdU5TdzVNQ3c0TERnekxqQTJMRGhqTFRZdU5qZ3NNQzB4TVM0Mk5DMDFMall0TVRjdU9Ea3ROUzQyTFRZc01DMDVMamt4TERRdU1Ea3RNVEl1T1RNc01USXVOU3d3TERBdE9DNDBNU3d5TXk0M01pMDVMalE1TERJM0xqRTJRVFl1TkRNc05pNDBNeXd3TERBc01DdzBNaTQxTXl3ME5HTXdMRGt1TWpJc016WXVNeXd6T1M0ME5TdzROQzQ1TkN3ek9TNDBOVTB4TmpBc056SXVNRGRqTVM0M015dzRMakU1TERFdU56TXNPUzR3TlN3eExqY3pMREV3TGpFekxEQXNNVFF0TVRVdU56UXNNakV1TnpjdE16WXVORE1zTWpFdU56ZEROemd1TlRRc01UQTBMRE0zTGpVNExEYzJMallzTXpjdU5UZ3NOVGd1TkRsaE1UZ3VORFVzTVRndU5EVXNNQ3d3TERFc01TNDFNUzAzTGpNelF6SXlMakkzTERVeUxDNDFMRFUxTEM0MUxEYzBMakl5WXpBc016RXVORGdzTnpRdU5Ua3NOekF1TWpnc01UTXpMalkxTERjd0xqSTRMRFExTGpJNExEQXNOVFl1TnkweU1DNDBPQ3cxTmk0M0xUTTJMalkxTERBdE1USXVOekl0TVRFdE1qY3VNVFl0TXpBdU9ETXRNelV1TnpnaUx6NDhMM04yWno0PSIsIm1lZGlhdHlwZSI6ImltYWdlL3N2Zyt4bWwifV0sImluc3RhbGwiOnsic3BlYyI6eyJkZXBsb3ltZW50cyI6W119LCJzdHJhdGVneSI6ImRlcGxveW1lbnQifSwiaW5zdGFsbE1vZGVzIjpbeyJzdXBwb3J0ZWQiOnRydWUsInR5cGUiOiJPd25OYW1lc3BhY2UifSx7InN1cHBvcnRlZCI6dHJ1ZSwidHlwZSI6IlNpbmdsZU5hbWVzcGFjZSJ9LHsic3VwcG9ydGVkIjpmYWxzZSwidHlwZSI6Ik11bHRpTmFtZXNwYWNlIn0seyJzdXBwb3J0ZWQiOmZhbHNlLCJ0eXBlIjoiQWxsTmFtZXNwYWNlcyJ9XSwibGlua3MiOlt7Im5hbWUiOiJTb3VyY2UgQ29kZSIsInVybCI6Imh0dHBzOi8vZ2l0aHViLmNvbS9yZWQtaGF0LXN0b3JhZ2Uvb2RmLW9wZXJhdG9yIn1dLCJtYWludGFpbmVycyI6W3siZW1haWwiOiJvY3Mtc3VwcG9ydEByZWRoYXQuY29tIiwibmFtZSI6IlJlZCBIYXQgU3VwcG9ydCJ9XSwibWF0dXJpdHkiOiJhbHBoYSIsIm1pbkt1YmVWZXJzaW9uIjoiMS4xNi4wIiwicHJvdmlkZXIiOnsibmFtZSI6IlJlZCBIYXQifSwidmVyc2lvbiI6IjQuMTkuMCJ9fQ==
relatedImages:
- image: quay.io/ocs-dev/odf-dependencies-bundle:latest
name: ""
Expand Down
42 changes: 42 additions & 0 deletions catalog/odf-external-snapshotter-operator.yaml

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions config/manager/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ data:
pkg: csi-addons
scaleUpOnInstanceOf:
- cephclusters.ceph.rook.io
SNAPSHOT_CONTROLLER: |
channel: alpha
csv: odf-external-snapshotter-operator.v4.20.0
pkg: odf-external-snapshotter-operator
scaleUpOnInstanceOf:
- cephclusters.ceph.rook.io
IBM_ODF: |
channel: stable-v1.7
csv: ibm-storage-odf-operator.v1.7.1
Expand Down
3 changes: 2 additions & 1 deletion hack/install-odf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,5 @@ oc wait --timeout=5m --for condition=Available -n "$INSTALL_NAMESPACE" deploymen
odf-operator-controller-manager \
prometheus-operator \
rook-ceph-operator \
ux-backend-server
ux-backend-server \
odf-external-snapshotter-operator
8 changes: 8 additions & 0 deletions hack/make-bundle-vars.mk
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,12 @@ CSIADDONS_SUBSCRIPTION_PACKAGE ?= csi-addons
CSIADDONS_SUBSCRIPTION_CHANNEL ?= alpha
CSIADDONS_SUBSCRIPTION_CSVNAME ?= $(CSIADDONS_SUBSCRIPTION_PACKAGE).$(CSIADDONS_BUNDLE_VERSION)

ODF_SNAPSHOT_CONTROLLER_BUNDLE_IMG ?= quay.io/ocs-dev/snapshot-controller-bundle:main-4bd0abb
ODF_SNAPSHOT_CONTROLLER_BUNDLE_VERSION ?= v4.20.0
ODF_SNAPSHOT_CONTROLLER_SUBSCRIPTION_PACKAGE ?= odf-external-snapshotter-operator
ODF_SNAPSHOT_CONTROLLER_SUBSCRIPTION_CHANNEL ?= alpha
ODF_SNAPSHOT_CONTROLLER_SUBSCRIPTION_CSVNAME ?= $(ODF_SNAPSHOT_CONTROLLER_SUBSCRIPTION_PACKAGE).$(ODF_SNAPSHOT_CONTROLLER_BUNDLE_VERSION)

PROMETHEUS_BUNDLE_IMG ?= quay.io/ocs-dev/odf-prometheus-operator-bundle:main-552d231
PROMETHEUS_BUNDLE_VERSION ?= v4.19.0
PROMETHEUS_SUBSCRIPTION_PACKAGE ?= odf-prometheus-operator
Expand Down Expand Up @@ -148,6 +154,7 @@ BUNDLE_IMGS ?= $(BUNDLE_IMG) \
$(NOOBAA_BUNDLE_IMG) \
$(CEPHCSI_BUNDLE_IMG) \
$(CSIADDONS_BUNDLE_IMG) \
$(ODF_SNAPSHOT_CONTROLLER_BUNDLE_IMG) \
$(PROMETHEUS_BUNDLE_IMG) \
$(RECIPE_BUNDLE_IMG_TAG) \
$(IBM_ODF_BUNDLE_IMG)
Expand All @@ -162,5 +169,6 @@ CSV_NAMES ?= odf-operator.v$(VERSION) \
$(NOOBAA_SUBSCRIPTION_CSVNAME) \
$(CEPHCSI_SUBSCRIPTION_CSVNAME) \
$(CSIADDONS_SUBSCRIPTION_CSVNAME) \
$(ODF_SNAPSHOT_CONTROLLER_SUBSCRIPTION_CSVNAME) \
$(PROMETHEUS_SUBSCRIPTION_CSVNAME) \
$(RECIPE_SUBSCRIPTION_CSVNAME)
21 changes: 21 additions & 0 deletions hack/make-files.mk
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ data:
pkg: $(CSIADDONS_SUBSCRIPTION_PACKAGE)
scaleUpOnInstanceOf:
- cephclusters.ceph.rook.io
SNAPSHOT_CONTROLLER: |
channel: $(ODF_SNAPSHOT_CONTROLLER_SUBSCRIPTION_CHANNEL)
csv: $(ODF_SNAPSHOT_CONTROLLER_SUBSCRIPTION_CSVNAME)
pkg: $(ODF_SNAPSHOT_CONTROLLER_SUBSCRIPTION_PACKAGE)
scaleUpOnInstanceOf:
- cephclusters.ceph.rook.io
IBM_ODF: |
channel: $(IBM_ODF_SUBSCRIPTION_CHANNEL)
csv: $(IBM_ODF_SUBSCRIPTION_CSVNAME)
Expand Down Expand Up @@ -107,6 +113,10 @@ dependencies:
value:
packageName: $(CSIADDONS_SUBSCRIPTION_PACKAGE)
version: "$(subst v,,$(CSIADDONS_BUNDLE_VERSION))"
- type: olm.package
value:
packageName: $(ODF_SNAPSHOT_CONTROLLER_SUBSCRIPTION_PACKAGE)
version: "$(subst v,,$(ODF_SNAPSHOT_CONTROLLER_BUNDLE_VERSION))"
- type: olm.package
value:
packageName: $(CEPHCSI_SUBSCRIPTION_PACKAGE)
Expand Down Expand Up @@ -190,6 +200,17 @@ name: $(CSIADDONS_SUBSCRIPTION_CHANNEL)
entries:
- name: $(CSIADDONS_SUBSCRIPTION_CSVNAME)

---
defaultChannel: $(ODF_SNAPSHOT_CONTROLLER_SUBSCRIPTION_CHANNEL)
name: $(ODF_SNAPSHOT_CONTROLLER_SUBSCRIPTION_PACKAGE)
schema: olm.package
---
schema: olm.channel
package: $(ODF_SNAPSHOT_CONTROLLER_SUBSCRIPTION_PACKAGE)
name: $(ODF_SNAPSHOT_CONTROLLER_SUBSCRIPTION_CHANNEL)
entries:
- name: $(ODF_SNAPSHOT_CONTROLLER_SUBSCRIPTION_CSVNAME)

---
defaultChannel: $(CEPHCSI_SUBSCRIPTION_CHANNEL)
name: $(CEPHCSI_SUBSCRIPTION_PACKAGE)
Expand Down
Loading