Merge pull request #171 from sp98/csv

fix: update csv correctly.
openshift · Apr 25, 2022 · dc75c58 · dc75c58
2 parents 7bcb93f + 2ffe7cc
commit dc75c58
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/bundle/manifests/lvm-operator.clusterserviceversion.yaml b/bundle/manifests/lvm-operator.clusterserviceversion.yaml
@@ -27,11 +27,12 @@ metadata:
         }
       ]
     capabilities: Basic Install
-    operators.operatorframework.io/builder: operator-sdk-v1.13.0+git
-    operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     categories: Storage
     operatorframework.io/suggested-namespace: openshift-storage
-    operators.operatorframework.io/internal-objects: '["logicalvolumes.topolvm.cybozu.com", "lvmvolumegroups.lvm.topolvm.io", "lvmvolumegroupnodestatuses.lvm.topolvm.io"]'
+    operators.operatorframework.io/builder: operator-sdk-v1.13.0+git
+    operators.operatorframework.io/internal-objects: '["logicalvolumes.topolvm.cybozu.com",
+      "lvmvolumegroups.lvm.topolvm.io", "lvmvolumegroupnodestatuses.lvm.topolvm.io"]'
+    operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
   name: lvm-operator.v0.0.1
   namespace: placeholder
 spec:

diff --git a/config/manifests/bases/clusterserviceversion.yaml.in b/config/manifests/bases/clusterserviceversion.yaml.in
@@ -4,6 +4,9 @@ metadata:
   annotations:
     alm-examples: '[]'
     capabilities: Basic Install
+    categories: Storage
+    operatorframework.io/suggested-namespace: openshift-storage
+    operators.operatorframework.io/internal-objects: '["logicalvolumes.topolvm.cybozu.com", "lvmvolumegroups.lvm.topolvm.io", "lvmvolumegroupnodestatuses.lvm.topolvm.io"]'
   name: @[email protected]
   namespace: placeholder
 spec:

diff --git a/config/samples/kustomization.yaml b/config/samples/kustomization.yaml
@@ -1,6 +1,4 @@
 ## Append samples you want in your CSV to this file as resources ##
 resources:
 - lvm_v1alpha1_lvmcluster.yaml
-- lvm_v1alpha1_lvmvolumegroup.yaml
-- lvm_v1alpha1_lvmvolumegroupnodestatus.yaml
 #+kubebuilder:scaffold:manifestskustomizesamples