From 05f90318d725d22ffc34381084987b7a1a944040 Mon Sep 17 00:00:00 2001 From: Nitin Goyal Date: Wed, 20 Sep 2023 18:47:48 +0530 Subject: [PATCH 1/2] update PROJECT file Signed-off-by: Nitin Goyal --- PROJECT | 49 +++++++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/PROJECT b/PROJECT index ab40f52a74..bf0a493588 100644 --- a/PROJECT +++ b/PROJECT @@ -1,42 +1,51 @@ domain: openshift.io -layout: go.kubebuilder.io/v2 +layout: +- go.kubebuilder.io/v3 +plugins: + manifests.sdk.operatorframework.io/v2: {} + scorecard.sdk.operatorframework.io/v2: {} projectName: ocs-operator -repo: github.com/red-hat-storage/ocs-operator +repo: github.com/red-hat-storage/ocs-operator/v4 resources: -- - controller: true - group: core - kind: Namespace - path: k8s.io/api/core/v1 - version: v1 -- +- api: + crdVersion: v1 + namespaced: true controller: true domain: openshift.io group: ocs - kind: OCSInitialization - path: github.com/red-hat-storage/ocs-operator/api/v1 + kind: StorageCluster + path: github.com/red-hat-storage/ocs-operator/v4/api/v1 version: v1 -- +- api: + crdVersion: v1 + namespaced: true controller: true domain: openshift.io group: ocs - kind: StorageCluster - path: github.com/red-hat-storage/ocs-operator/api/v1 + kind: OCSInitialization + path: github.com/red-hat-storage/ocs-operator/v4/api/v1 version: v1 -- +- api: + crdVersion: v1 + namespaced: true controller: true domain: openshift.io group: ocs kind: StorageConsumer - path: github.com/red-hat-storage/ocs-operator/api/v1alpha1 + path: github.com/red-hat-storage/ocs-operator/v4/api/v1alpha1 version: v1alpha1 -- +- api: + crdVersion: v1 + namespaced: true controller: true domain: openshift.io group: ocs kind: StorageClassRequest - path: github.com/red-hat-storage/ocs-operator/api/v1alpha1 + path: github.com/red-hat-storage/ocs-operator/v4/api/v1alpha1 version: v1alpha1 +- controller: true + group: core + kind: Namespace + path: k8s.io/api/core/v1 + version: v1 version: "3" -plugins: - go.sdk.operatorframework.io/v2-alpha: {} From ef7d036f96654a621e1ea767c7675d8639fff46f Mon Sep 17 00:00:00 2001 From: Nitin Goyal Date: Wed, 20 Sep 2023 20:25:12 +0530 Subject: [PATCH 2/2] update genrated changes Signed-off-by: Nitin Goyal --- Dockerfile.bundle | 2 +- deploy/csv-templates/ocs-operator.csv.yaml.in | 2 +- .../manifests/ocs-operator.clusterserviceversion.yaml | 2 +- deploy/ocs-operator/metadata/annotations.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile.bundle b/Dockerfile.bundle index 12d993c236..17dcc49952 100644 --- a/Dockerfile.bundle +++ b/Dockerfile.bundle @@ -8,7 +8,7 @@ LABEL operators.operatorframework.io.bundle.package.v1=ocs-operator LABEL operators.operatorframework.io.bundle.channels.v1=alpha LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.25.4 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 -LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v2 +LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3 # Copy files to locations specified by labels. COPY deploy/ocs-operator/manifests /manifests/ diff --git a/deploy/csv-templates/ocs-operator.csv.yaml.in b/deploy/csv-templates/ocs-operator.csv.yaml.in index e9803a7040..de8954550b 100644 --- a/deploy/csv-templates/ocs-operator.csv.yaml.in +++ b/deploy/csv-templates/ocs-operator.csv.yaml.in @@ -71,7 +71,7 @@ metadata: description: Red Hat OpenShift Container Storage provides hyperconverged storage for applications within an OpenShift cluster. operators.operatorframework.io/builder: operator-sdk-v1.25.4 - operators.operatorframework.io/project_layout: go.kubebuilder.io/v2 + operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/red-hat-storage/ocs-operator support: Red Hat name: ocs-operator.v4.14.0 diff --git a/deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml b/deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml index f315e9ea3f..82ca672b76 100644 --- a/deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml +++ b/deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml @@ -1565,7 +1565,7 @@ metadata: operators.operatorframework.io/builder: operator-sdk-v1.25.4 operators.operatorframework.io/internal-objects: '["ocsinitializations.ocs.openshift.io","storageclassrequests.ocs.openshift.io","storageconsumers.ocs.openshift.io","cephclusters.ceph.rook.io","cephobjectstores.ceph.rook.io","cephobjectstoreusers.ceph.rook.io","cephnfses.ceph.rook.io","cephclients.ceph.rook.io","cephfilesystems.ceph.rook.io","cephfilesystemmirrors.ceph.rook.io","cephrbdmirrors.ceph.rook.io","cephobjectrealms.ceph.rook.io","cephobjectzonegroups.ceph.rook.io","cephobjectzones.ceph.rook.io","cephbucketnotifications.ceph.rook.io","cephbuckettopics.ceph.rook.io","cephfilesystemsubvolumegroups.ceph.rook.io","cephblockpoolradosnamespaces.ceph.rook.io","cephcosidrivers.ceph.rook.io"]' operators.operatorframework.io/operator-type: non-standalone - operators.operatorframework.io/project_layout: go.kubebuilder.io/v2 + operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/red-hat-storage/ocs-operator support: Red Hat labels: diff --git a/deploy/ocs-operator/metadata/annotations.yaml b/deploy/ocs-operator/metadata/annotations.yaml index 2201c7730b..9b941aa804 100644 --- a/deploy/ocs-operator/metadata/annotations.yaml +++ b/deploy/ocs-operator/metadata/annotations.yaml @@ -7,4 +7,4 @@ annotations: operators.operatorframework.io.bundle.channels.v1: alpha operators.operatorframework.io.metrics.builder: operator-sdk-v1.25.4 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 - operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v2 + operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3