red-hat-storage · df-build-team · Feb 5, 2024 · Feb 15, 2024 · Mar 12, 2024 · Mar 18, 2024
diff --git a/.github/workflows/codespell.yaml b/.github/workflows/codespell.yaml
@@ -11,7 +11,7 @@ jobs:
   codespell:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 

diff --git a/.github/workflows/commitlint.yaml b/.github/workflows/commitlint.yaml
@@ -11,7 +11,7 @@ jobs:
   commitlint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 

diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
@@ -13,13 +13,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go: ["1.20", "1.21"]
+        go: ["1.21", "1.22"]
     steps:
-    - uses: actions/setup-go@v4
+    - uses: actions/setup-go@v5
       with:
         go-version: ${{ matrix.go }}
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
@@ -31,13 +31,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go: ["1.20", "1.21"]
+        go: ["1.21", "1.22"]
     steps:
-    - uses: actions/setup-go@v4
+    - uses: actions/setup-go@v5
       with:
         go-version: ${{ matrix.go }}
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
@@ -55,13 +55,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go: ["1.20", "1.21"]
+        go: ["1.21", "1.22"]
     steps:
-    - uses: actions/setup-go@v4
+    - uses: actions/setup-go@v5
       with:
         go-version: ${{ matrix.go }}
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 

diff --git a/.github/workflows/docker-push.yaml b/.github/workflows/docker-push.yaml
@@ -14,11 +14,11 @@ jobs:
   docker-push:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
-    - uses: actions/setup-go@v4
+    - uses: actions/setup-go@v5
       with:
         go-version-file: go.mod
 

diff --git a/.github/workflows/golangci-lint.yaml b/.github/workflows/golangci-lint.yaml
@@ -11,15 +11,15 @@ jobs:
   golangci-lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
-    - uses: actions/setup-go@v4
+    - uses: actions/setup-go@v5
       with:
         go-version-file: go.mod
 
-    - uses: golangci/golangci-lint-action@v3
+    - uses: golangci/golangci-lint-action@v4
       with:
-        version: v1.53.1
+        version: v1.57.2
         args: -E gosec --timeout=6m
diff --git a/.github/workflows/mirror-noobaa-upstream-images.yaml b/.github/workflows/mirror-noobaa-upstream-images.yaml
@@ -12,11 +12,11 @@ jobs:
       github.repository == 'red-hat-storage/odf-operator' &&
       github.ref == 'refs/heads/main'
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
-    - uses: docker/login-action@v2
+    - uses: docker/login-action@v3
       with:
         registry: quay.io
         username: ${{ secrets.QUAY_USERNAME }}

diff --git a/.github/workflows/yamllint.yaml b/.github/workflows/yamllint.yaml
@@ -9,7 +9,7 @@ jobs:
   yamllint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 

diff --git a/.gitignore b/.gitignore
@@ -30,3 +30,6 @@ catalog/ibm.yaml
 catalog/noobaa.yaml
 catalog/ocs.yaml
 catalog/odf.yaml
+catalog/rook.yaml
+catalog/prometheus.yaml
+catalog/ocs-client.yaml
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.20 as builder
+FROM golang:1.21 as builder
 
 WORKDIR /workspace
 

diff --git a/Makefile b/Makefile
@@ -82,12 +82,30 @@ OCS_SUBSCRIPTION_CHANNEL=$(OCS_SUBSCRIPTION_CHANNEL)
 OCS_SUBSCRIPTION_STARTINGCSV=$(OCS_SUBSCRIPTION_STARTINGCSV)
 OCS_SUBSCRIPTION_CATALOGSOURCE=$(OCS_SUBSCRIPTION_CATALOGSOURCE)
 OCS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=$(OCS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE)
+OCS_CLIENT_SUBSCRIPTION_NAME=$(OCS_CLIENT_SUBSCRIPTION_NAME)
+OCS_CLIENT_SUBSCRIPTION_PACKAGE=$(OCS_CLIENT_SUBSCRIPTION_PACKAGE)
+OCS_CLIENT_SUBSCRIPTION_CHANNEL=$(OCS_CLIENT_SUBSCRIPTION_CHANNEL)
+OCS_CLIENT_SUBSCRIPTION_STARTINGCSV=$(OCS_CLIENT_SUBSCRIPTION_STARTINGCSV)
+OCS_CLIENT_SUBSCRIPTION_CATALOGSOURCE=$(OCS_CLIENT_SUBSCRIPTION_CATALOGSOURCE)
+OCS_CLIENT_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=$(OCS_CLIENT_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE)
 IBM_SUBSCRIPTION_NAME=$(IBM_SUBSCRIPTION_NAME)
 IBM_SUBSCRIPTION_PACKAGE=$(IBM_SUBSCRIPTION_PACKAGE)
 IBM_SUBSCRIPTION_CHANNEL=$(IBM_SUBSCRIPTION_CHANNEL)
 IBM_SUBSCRIPTION_STARTINGCSV=$(IBM_SUBSCRIPTION_STARTINGCSV)
 IBM_SUBSCRIPTION_CATALOGSOURCE=$(IBM_SUBSCRIPTION_CATALOGSOURCE)
 IBM_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=$(IBM_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE)
+ROOK_SUBSCRIPTION_NAME=$(ROOK_SUBSCRIPTION_NAME)
+ROOK_SUBSCRIPTION_PACKAGE=$(ROOK_SUBSCRIPTION_PACKAGE)
+ROOK_SUBSCRIPTION_CHANNEL=$(ROOK_SUBSCRIPTION_CHANNEL)
+ROOK_SUBSCRIPTION_STARTINGCSV=$(ROOK_SUBSCRIPTION_STARTINGCSV)
+ROOK_SUBSCRIPTION_CATALOGSOURCE=$(ROOK_SUBSCRIPTION_CATALOGSOURCE)
+ROOK_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=$(ROOK_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE)
+PROMETHEUS_SUBSCRIPTION_NAME=$(PROMETHEUS_SUBSCRIPTION_NAME)
+PROMETHEUS_SUBSCRIPTION_PACKAGE=$(PROMETHEUS_SUBSCRIPTION_PACKAGE)
+PROMETHEUS_SUBSCRIPTION_CHANNEL=$(PROMETHEUS_SUBSCRIPTION_CHANNEL)
+PROMETHEUS_SUBSCRIPTION_STARTINGCSV=$(PROMETHEUS_SUBSCRIPTION_STARTINGCSV)
+PROMETHEUS_SUBSCRIPTION_CATALOGSOURCE=$(PROMETHEUS_SUBSCRIPTION_CATALOGSOURCE)
+PROMETHEUS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=$(PROMETHEUS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE)
 endef
 export MANAGER_ENV_VARS
 
@@ -165,9 +183,12 @@ bundle-push: ## Push the bundle image.
 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 $(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
 	$(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 $(ROOK_BUNDLE_IMG) $(OPM_RENDER_OPTS) > catalog/rook.yaml
+	$(OPM) render --output=yaml $(PROMETHEUS_BUNDLE_IMG) $(OPM_RENDER_OPTS) > catalog/prometheus.yaml
 	$(OPM) validate catalog
 
 .PHONY: catalog-build

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/bundle/manifests/odf-operator-manager-config_v1_configmap.yaml b/bundle/manifests/odf-operator-manager-config_v1_configmap.yaml
@@ -5,7 +5,7 @@ data:
   CSIADDONS_SUBSCRIPTION_CHANNEL: alpha
   CSIADDONS_SUBSCRIPTION_NAME: csi-addons
   CSIADDONS_SUBSCRIPTION_PACKAGE: csi-addons
-  CSIADDONS_SUBSCRIPTION_STARTINGCSV: csi-addons.v0.7.0
+  CSIADDONS_SUBSCRIPTION_STARTINGCSV: csi-addons.v0.8.0
   IBM_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource
   IBM_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-marketplace
   IBM_SUBSCRIPTION_CHANNEL: stable-v1.4
@@ -18,12 +18,30 @@ data:
   NOOBAA_SUBSCRIPTION_NAME: noobaa-operator
   NOOBAA_SUBSCRIPTION_PACKAGE: noobaa-operator
   NOOBAA_SUBSCRIPTION_STARTINGCSV: noobaa-operator.v5.14.0
+  OCS_CLIENT_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource
+  OCS_CLIENT_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-marketplace
+  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.16.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.15.0
+  OCS_SUBSCRIPTION_STARTINGCSV: ocs-operator.v4.16.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.16.0
+  ROOK_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource
+  ROOK_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-marketplace
+  ROOK_SUBSCRIPTION_CHANNEL: alpha
+  ROOK_SUBSCRIPTION_NAME: rook-ceph-operator
+  ROOK_SUBSCRIPTION_PACKAGE: rook-ceph-operator
+  ROOK_SUBSCRIPTION_STARTINGCSV: rook-ceph-operator.v4.16.0
   controller_manager_config.yaml: |
     apiVersion: controller-runtime.sigs.k8s.io/v1alpha1
     kind: ControllerManagerConfig

diff --git a/bundle/manifests/odf-operator.clusterserviceversion.yaml b/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-02-09T04:53:49Z"
+    createdAt: "2024-03-22T02:45:54Z"
     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.16"}]'
+    olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.17"}]'
     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.15.0
+  name: odf-operator.v4.16.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -593,4 +593,4 @@ spec:
   maturity: alpha
   provider:
     name: Red Hat
-  version: 4.15.0
+  version: 4.16.0
diff --git a/bundle/manifests/odf.openshift.io_storagesystems.yaml b/bundle/manifests/odf.openshift.io_storagesystems.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.14.0
   creationTimestamp: null
   name: storagesystems.odf.openshift.io
 spec:
@@ -29,14 +29,19 @@ spec:
         description: StorageSystem is the Schema for the storagesystems API
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
             type: string
           metadata:
             type: object
@@ -67,8 +72,9 @@ spec:
               conditions:
                 description: Conditions describes the state of the StorageSystem resource.
                 items:
-                  description: Condition represents the state of the operator's reconciliation
-                    functionality.
+                  description: |-
+                    Condition represents the state of the operator's
+                    reconciliation functionality.
                   properties:
                     lastHeartbeatTime:
                       format: date-time

diff --git a/bundle/metadata/dependencies.yaml b/bundle/metadata/dependencies.yaml
@@ -2,12 +2,24 @@ dependencies:
 - type: olm.package
   value:
     packageName: ocs-operator
-    version: ">=4.14.0 <4.15.0 || 4.15.0"
+    version: ">=4.15.0 <=4.16.0"
+- type: olm.package
+  value:
+    packageName: rook-ceph-operator
+    version: ">=4.15.0 <=4.16.0"
+- type: olm.package
+  value:
+    packageName: ocs-client-operator
+    version: ">=4.15.0 <=4.16.0"
 - type: olm.package
   value:
     packageName: noobaa-operator
     version: "5.14.0"
 - type: olm.package
   value:
     packageName: csi-addons
-    version: "0.7.0"
+    version: ">=0.7.0 <=0.8.0"
+- type: olm.package
+  value:
+    packageName: odf-prometheus-operator
+    version: ">=4.15.0 <=4.16.0"
diff --git a/catalog/index.yaml b/catalog/index.yaml
@@ -7,7 +7,7 @@ schema: olm.channel
 package: odf-operator
 name: alpha
 entries:
-  - name: odf-operator.v4.15.0
+  - name: odf-operator.v4.16.0
 
 ---
 defaultChannel: alpha
@@ -18,7 +18,18 @@ schema: olm.channel
 package: ocs-operator
 name: alpha
 entries:
-  - name: ocs-operator.v4.15.0
+  - name: ocs-operator.v4.16.0
+
+---
+defaultChannel: alpha
+name: ocs-client-operator
+schema: olm.package
+---
+schema: olm.channel
+package: ocs-client-operator
+name: alpha
+entries:
+  - name: ocs-client-operator.v4.16.0
 
 ---
 defaultChannel: alpha
@@ -40,7 +51,7 @@ schema: olm.channel
 package: csi-addons
 name: alpha
 entries:
-  - name: csi-addons.v0.7.0
+  - name: csi-addons.v0.8.0
 
 ---
 defaultChannel: stable-v1.4
@@ -52,3 +63,25 @@ package: ibm-storage-odf-operator
 name: stable-v1.4
 entries:
   - name: ibm-storage-odf-operator.v1.4.1
+
+---
+defaultChannel: alpha
+name: rook-ceph-operator
+schema: olm.package
+---
+schema: olm.channel
+package: rook-ceph-operator
+name: alpha
+entries:
+  - name: rook-ceph-operator.v4.16.0
+
+---
+defaultChannel: beta
+name: odf-prometheus-operator
+schema: olm.package
+---
+schema: olm.channel
+package: odf-prometheus-operator
+name: beta
+entries:
+  - name: odf-prometheus-operator.v4.16.0