Merge pull request #507 from red-hat-storage/sync_ds--main

Syncing latest changes from main for odf-operator

.github/workflows/docker-build.yaml

@@ -45,10 +45,7 @@ jobs:
       run: |
         make bundle-build
         msg='Uncommitted bundle changes. run `make bundle` and commit results.'
-        # We are using `--ignore-matching-lines` flag with the pattern `createdAt`
-        # to exclude lines with the timestamp from being considered, as the CSV file
-        # consistently receives a new timestamp during generation with operator-sdk 1.26 onwards.
-        git diff --exit-code --ignore-matching-lines createdAt bundle || (echo -e '\e[31m'"$msg"; exit 1)
+        git diff --exit-code bundle || (echo -e '\e[31m'"$msg"; exit 1)
 
   catalog-build:
     runs-on: ubuntu-latest

Makefile

@@ -168,6 +168,10 @@ deploy-with-olm: kustomize ## Deploy controller to the K8s cluster via OLM
 undeploy-with-olm: ## Undeploy controller from the K8s cluster
 	$(KUSTOMIZE) build config/install | kubectl delete -f -
 
+# 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
+
 .PHONY: bundle
 bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metadata, then validate generated files.
 	$(OPERATOR_SDK) generate kustomize manifests -q
@@ -182,6 +186,7 @@ bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metada
 		--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
+	@$(MAKE) --no-print-directory checkout-bundle-timestamp
 
 .PHONY: bundle-build
 bundle-build: bundle ## Build the bundle image.

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

@@ -5,7 +5,7 @@ data:
   CEPHCSI_SUBSCRIPTION_CHANNEL: alpha
   CEPHCSI_SUBSCRIPTION_NAME: cephcsi-operator
   CEPHCSI_SUBSCRIPTION_PACKAGE: cephcsi-operator
-  CEPHCSI_SUBSCRIPTION_STARTINGCSV: cephcsi-operator.v4.17.0
+  CEPHCSI_SUBSCRIPTION_STARTINGCSV: cephcsi-operator.v4.18.0
   CSIADDONS_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource
   CSIADDONS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-marketplace
   CSIADDONS_SUBSCRIPTION_CHANNEL: alpha
@@ -29,19 +29,19 @@ data:
   OCS_CLIENT_SUBSCRIPTION_CHANNEL: alpha
   OCS_CLIENT_SUBSCRIPTION_NAME: ocs-client-operator
   OCS_CLIENT_SUBSCRIPTION_PACKAGE: ocs-client-operator
-  OCS_CLIENT_SUBSCRIPTION_STARTINGCSV: ocs-client-operator.v4.17.0
+  OCS_CLIENT_SUBSCRIPTION_STARTINGCSV: ocs-client-operator.v4.18.0
   OCS_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource
   OCS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-marketplace
   OCS_SUBSCRIPTION_CHANNEL: alpha
   OCS_SUBSCRIPTION_NAME: ocs-operator
   OCS_SUBSCRIPTION_PACKAGE: ocs-operator
-  OCS_SUBSCRIPTION_STARTINGCSV: ocs-operator.v4.17.0
+  OCS_SUBSCRIPTION_STARTINGCSV: ocs-operator.v4.18.0
   PROMETHEUS_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource
   PROMETHEUS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-marketplace
   PROMETHEUS_SUBSCRIPTION_CHANNEL: beta
   PROMETHEUS_SUBSCRIPTION_NAME: odf-prometheus-operator
   PROMETHEUS_SUBSCRIPTION_PACKAGE: odf-prometheus-operator
-  PROMETHEUS_SUBSCRIPTION_STARTINGCSV: odf-prometheus-operator.v4.17.0
+  PROMETHEUS_SUBSCRIPTION_STARTINGCSV: odf-prometheus-operator.v4.18.0
   RECIPE_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource
   RECIPE_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-marketplace
   RECIPE_SUBSCRIPTION_CHANNEL: alpha
@@ -53,7 +53,7 @@ data:
   ROOK_SUBSCRIPTION_CHANNEL: alpha
   ROOK_SUBSCRIPTION_NAME: rook-ceph-operator
   ROOK_SUBSCRIPTION_PACKAGE: rook-ceph-operator
-  ROOK_SUBSCRIPTION_STARTINGCSV: rook-ceph-operator.v4.17.0
+  ROOK_SUBSCRIPTION_STARTINGCSV: rook-ceph-operator.v4.18.0
   controller_manager_config.yaml: |
     apiVersion: controller-runtime.sigs.k8s.io/v1alpha1
     kind: ControllerManagerConfig

bundle/manifests/odf-operator.clusterserviceversion.yaml

@@ -35,11 +35,11 @@ metadata:
     categories: Storage
     console.openshift.io/plugins: '["odf-console"]'
     containerImage: quay.io/ocs-dev/odf-operator:latest
-    createdAt: "2024-09-12T08:48:15Z"
+    createdAt: "2024-11-13T13:01:04Z"
     description: OpenShift Data Foundation provides a common control plane for storage
       solutions on OpenShift Container Platform.
     features.operators.openshift.io/token-auth-aws: "true"
-    olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.18"}]'
+    olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.19"}]'
     olm.skipRange: ""
     operatorframework.io/initialization-resource: |-
       {
@@ -69,7 +69,7 @@ metadata:
     operatorframework.io/arch.amd64: supported
     operatorframework.io/arch.ppc64le: supported
     operatorframework.io/arch.s390x: supported
-  name: odf-operator.v4.17.0
+  name: odf-operator.v4.18.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -565,4 +565,4 @@ spec:
   maturity: alpha
   provider:
     name: Red Hat
-  version: 4.17.0
+  version: 4.18.0

bundle/metadata/dependencies.yaml

@@ -2,15 +2,15 @@ dependencies:
 - type: olm.package
   value:
     packageName: ocs-operator
-    version: ">=4.16.0 <=4.17.0"
+    version: ">=4.17.0 <=4.18.0"
 - type: olm.package
   value:
     packageName: rook-ceph-operator
-    version: ">=4.16.0 <=4.17.0"
+    version: ">=4.17.0 <=4.18.0"
 - type: olm.package
   value:
     packageName: ocs-client-operator
-    version: ">=4.16.0 <=4.17.0"
+    version: ">=4.17.0 <=4.18.0"
 - type: olm.package
   value:
     packageName: noobaa-operator
@@ -22,11 +22,11 @@ dependencies:
 - type: olm.package
   value:
     packageName: cephcsi-operator
-    version: ">=4.16.0 <=4.17.0"
+    version: ">=4.17.0 <=4.18.0"
 - type: olm.package
   value:
     packageName: odf-prometheus-operator
-    version: ">=4.16.0 <=4.17.0"
+    version: ">=4.17.0 <=4.18.0"
 - type: olm.package
   value:
     packageName: recipe

catalog/index.yaml

@@ -7,7 +7,7 @@ schema: olm.channel
 package: odf-operator
 name: alpha
 entries:
-  - name: odf-operator.v4.17.0
+  - name: odf-operator.v4.18.0
 
 ---
 defaultChannel: alpha
@@ -18,7 +18,7 @@ schema: olm.channel
 package: ocs-operator
 name: alpha
 entries:
-  - name: ocs-operator.v4.17.0
+  - name: ocs-operator.v4.18.0
 
 ---
 defaultChannel: alpha
@@ -29,7 +29,7 @@ schema: olm.channel
 package: ocs-client-operator
 name: alpha
 entries:
-  - name: ocs-client-operator.v4.17.0
+  - name: ocs-client-operator.v4.18.0
 
 ---
 defaultChannel: alpha
@@ -62,7 +62,7 @@ schema: olm.channel
 package: cephcsi-operator
 name: alpha
 entries:
-  - name: cephcsi-operator.v4.17.0
+  - name: cephcsi-operator.v4.18.0
 
 ---
 defaultChannel: stable-v1.6
@@ -84,7 +84,7 @@ schema: olm.channel
 package: rook-ceph-operator
 name: alpha
 entries:
-  - name: rook-ceph-operator.v4.17.0
+  - name: rook-ceph-operator.v4.18.0
 
 ---
 defaultChannel: beta
@@ -95,7 +95,7 @@ schema: olm.channel
 package: odf-prometheus-operator
 name: beta
 entries:
-  - name: odf-prometheus-operator.v4.17.0
+  - name: odf-prometheus-operator.v4.18.0
 
 ---
 defaultChannel: alpha