Merge pull request #667 from iamniting/bundles

makefile: update bundle versions

Author: openshift-merge-bot[bot]

bundle/odf-dependencies/metadata/dependencies.yaml

@@ -18,7 +18,7 @@ dependencies:
 - type: olm.package
   value:
     packageName: csi-addons
-    version: "0.12.0"
+    version: "0.13.0"
 - type: olm.package
   value:
     packageName: odf-external-snapshotter-operator
@@ -30,7 +30,7 @@ dependencies:
 - type: olm.package
   value:
     packageName: odf-prometheus-operator
-    version: "4.19.0"
+    version: "4.20.0"
 - type: olm.package
   value:
     packageName: recipe

bundle/odf-operator/manifests/odf-operator-pkgs-config-4.20.0_v1_configmap.yaml

@@ -13,7 +13,7 @@ data:
     namespace: ibm-spectrum-scale
   CSIADDONS: |
     channel: alpha
-    csv: csi-addons.v0.12.0
+    csv: csi-addons.v0.13.0
     pkg: csi-addons
     scaleUpOnInstanceOf:
       - cephclusters.ceph.rook.io
@@ -53,7 +53,7 @@ data:
     pkg: odf-dependencies
   PROMETHEUS: |
     channel: beta
-    csv: odf-prometheus-operator.v4.19.0
+    csv: odf-prometheus-operator.v4.20.0
     pkg: odf-prometheus-operator
     scaleUpOnInstanceOf:
       - alertmanagers.monitoring.coreos.com

catalog/csiaddons.yaml

@@ -73,7 +73,7 @@ schema: olm.channel
 package: csi-addons
 name: alpha
 entries:
-  - name: csi-addons.v0.12.0
+  - name: csi-addons.v0.13.0
 
 ---
 defaultChannel: alpha
@@ -117,7 +117,7 @@ schema: olm.channel
 package: odf-prometheus-operator
 name: beta
 entries:
-  - name: odf-prometheus-operator.v4.19.0
+  - name: odf-prometheus-operator.v4.20.0
 
 ---
 defaultChannel: alpha

catalog/index.yaml

@@ -16,7 +16,7 @@ properties:
 - type: olm.package.required
   value:
     packageName: csi-addons
-    versionRange: 0.12.0
+    versionRange: 0.13.0
 - type: olm.package.required
   value:
     packageName: noobaa-operator
@@ -36,7 +36,7 @@ properties:
 - type: olm.package.required
   value:
     packageName: odf-prometheus-operator
-    versionRange: 4.19.0
+    versionRange: 4.20.0
 - type: olm.package.required
   value:
     packageName: recipe

catalog/odf-dependencies.yaml

@@ -11,7 +11,7 @@ data:
       - cephclusters.ceph.rook.io
   CSIADDONS: |
     channel: alpha
-    csv: csi-addons.v0.12.0
+    csv: csi-addons.v0.13.0
     pkg: csi-addons
     scaleUpOnInstanceOf:
       - cephclusters.ceph.rook.io
@@ -62,7 +62,7 @@ data:
     namespace: ibm-spectrum-scale
   PROMETHEUS: |
     channel: beta
-    csv: odf-prometheus-operator.v4.19.0
+    csv: odf-prometheus-operator.v4.20.0
     pkg: odf-prometheus-operator
     scaleUpOnInstanceOf:
       - alertmanagers.monitoring.coreos.com

catalog/prometheus.yaml

@@ -122,8 +122,8 @@ CEPHCSI_SUBSCRIPTION_PACKAGE ?= cephcsi-operator
 CEPHCSI_SUBSCRIPTION_CHANNEL ?= alpha
 CEPHCSI_SUBSCRIPTION_CSVNAME ?= $(CEPHCSI_SUBSCRIPTION_PACKAGE).$(CEPHCSI_BUNDLE_VERSION)
 
-CSIADDONS_BUNDLE_IMG ?= quay.io/csiaddons/k8s-bundle:v0.12.0
-CSIADDONS_BUNDLE_VERSION ?= v0.12.0
+CSIADDONS_BUNDLE_IMG ?= quay.io/csiaddons/k8s-bundle:v0.13.0
+CSIADDONS_BUNDLE_VERSION ?= v0.13.0
 CSIADDONS_SUBSCRIPTION_PACKAGE ?= csi-addons
 CSIADDONS_SUBSCRIPTION_CHANNEL ?= alpha
 CSIADDONS_SUBSCRIPTION_CSVNAME ?= $(CSIADDONS_SUBSCRIPTION_PACKAGE).$(CSIADDONS_BUNDLE_VERSION)
@@ -134,8 +134,8 @@ ODF_SNAPSHOT_CONTROLLER_SUBSCRIPTION_PACKAGE ?= odf-external-snapshotter-operato
 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_BUNDLE_IMG ?= quay.io/ocs-dev/odf-prometheus-operator-bundle:main-c21091f
+PROMETHEUS_BUNDLE_VERSION ?= v4.20.0
 PROMETHEUS_SUBSCRIPTION_PACKAGE ?= odf-prometheus-operator
 PROMETHEUS_SUBSCRIPTION_CHANNEL ?= beta
 PROMETHEUS_SUBSCRIPTION_CSVNAME ?= $(PROMETHEUS_SUBSCRIPTION_PACKAGE).$(PROMETHEUS_BUNDLE_VERSION)