fix name/url/email etc fields in operator bundle (#841)

helm/bundle.Dockerfile

@@ -4,7 +4,7 @@ FROM scratch
 LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
-LABEL operators.operatorframework.io.bundle.package.v1=directpv-operator
+LABEL operators.operatorframework.io.bundle.package.v1=minio-directpv-operator-rhmp
 LABEL operators.operatorframework.io.bundle.channels.v1=alpha
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.31.0
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1

helm/bundle/manifests/charts.quay.io_directpvcharts.yaml

@@ -6,16 +6,16 @@ metadata:
 spec:
   group: charts.quay.io
   names:
-    kind: DirectpvChart
-    listKind: DirectpvChartList
+    kind: DirectPVChart
+    listKind: DirectPVChartList
     plural: directpvcharts
     singular: directpvchart
   scope: Namespaced
   versions:
   - name: v1alpha1
     schema:
       openAPIV3Schema:
-        description: DirectpvChart is the Schema for the directpvcharts API
+        description: DirectPVChart is the Schema for the directpvcharts API
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
@@ -30,11 +30,11 @@ spec:
           metadata:
             type: object
           spec:
-            description: Spec defines the desired state of DirectpvChart
+            description: Spec defines the desired state of DirectPVChart
             type: object
             x-kubernetes-preserve-unknown-fields: true
           status:
-            description: Status defines the observed state of DirectpvChart
+            description: Status defines the observed state of DirectPVChart
             type: object
             x-kubernetes-preserve-unknown-fields: true
         type: object

helm/bundle/manifests/directpv-operator.clusterserviceversion.yaml → helm/bundle/manifests/minio-directpv-operator-rhmp.clusterserviceversion.yaml

@@ -6,7 +6,7 @@ metadata:
       [
         {
           "apiVersion": "charts.quay.io/v1alpha1",
-          "kind": "DirectpvChart",
+          "kind": "DirectPVChart",
           "metadata": {
             "name": "directpvchart-sample"
           },
@@ -66,17 +66,17 @@ metadata:
     createdAt: "2023-08-17T13:36:51Z"
     operators.operatorframework.io/builder: operator-sdk-v1.31.0
     operators.operatorframework.io/project_layout: helm.sdk.operatorframework.io/v1
-  name: directpv-operator.v4.0.7
+  name: minio-directpv-operator-rhmp.v4.0.7
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
   customresourcedefinitions:
     owned:
-    - kind: DirectpvChart
+    - kind: DirectPVChart
       name: directpvcharts.charts.quay.io
       version: v1alpha1
-  description: directpv
-  displayName: directpv
+  description: Minio DirectPV Operator manages DirectPV deployments.
+  displayName: Minio DirectPV Operator
   icon:
   - base64data: ""
     mediatype: ""
@@ -243,7 +243,7 @@ spec:
                 - --metrics-bind-address=127.0.0.1:8080
                 - --leader-elect
                 - --leader-election-id=directpv-operator
-                image: quay.io/cniackz4/directpv-operator:4.0.7
+                image: quay.io/minio/directpv-operator:4.0.7
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -318,14 +318,15 @@ spec:
   - supported: true
     type: AllNamespaces
   keywords:
-  - directpv
+  - minio-directpv-operator-rhmp
   links:
-  - name: Directpv Operator
-    url: https://directpv-operator.domain
+  - name: Minio DirectPV Operator
+    url: https://min.io/directpv
   maintainers:
-  - email: cesar@minio.io
-    name: cesar
+  - email: dev@minio.io
+    name: MinIO, Inc.
   maturity: alpha
   provider:
-    name: directpv
+    name: DirectPV
+    url: https://min.io/directpv
   version: 4.0.7

helm/config/crd/bases/charts.quay.io_directpvcharts.yaml

@@ -6,16 +6,16 @@ metadata:
 spec:
   group: charts.quay.io
   names:
-    kind: DirectpvChart
-    listKind: DirectpvChartList
+    kind: DirectPVChart
+    listKind: DirectPVChartList
     plural: directpvcharts
     singular: directpvchart
   scope: Namespaced
   versions:
   - name: v1alpha1
     schema:
       openAPIV3Schema:
-        description: DirectpvChart is the Schema for the directpvcharts API
+        description: DirectPVChart is the Schema for the directpvcharts API
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
@@ -30,11 +30,11 @@ spec:
           metadata:
             type: object
           spec:
-            description: Spec defines the desired state of DirectpvChart
+            description: Spec defines the desired state of DirectPVChart
             type: object
             x-kubernetes-preserve-unknown-fields: true
           status:
-            description: Status defines the observed state of DirectpvChart
+            description: Status defines the observed state of DirectPVChart
             type: object
             x-kubernetes-preserve-unknown-fields: true
         type: object

helm/config/manifests/bases/minio-directpv-operator-rhmp.clusterserviceversion.yaml

@@ -0,0 +1,51 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: ClusterServiceVersion
+metadata:
+  annotations:
+    alm-examples: '[{"apiVersion": "charts.quay.io/v1alpha1","kind": "DirectPVChart","metadata":
+      {"name": "directpvchart-sample"},"spec":{"affinity": {},"autoscaling": {"enabled":
+      false,"maxReplicas": 100,"minReplicas": 1,"targetCPUUtilizationPercentage":
+      80},"fullnameOverride": "","image": {"pullPolicy": "IfNotPresent","repository":
+      "nginx","tag": ""},"imagePullSecrets": [],"ingress": {"annotations": {},"className":
+      "","enabled": false,"hosts": [{"host": "chart-example.local","paths": [{"path":
+      "/","pathType": "ImplementationSpecific"}]}],"tls": []},"nameOverride": "","nodeSelector":
+      {},"podAnnotations": {},"podSecurityContext": {},"replicaCount": 1,"resources":
+      {},"securityContext": {},"service": {"port": 80,"type": "ClusterIP"},"serviceAccount":
+      {"annotations": {},"create": true,"name": ""},"tolerations": []}}]'
+    capabilities: Basic Install
+  name: minio-directpv-operator-rhmp.v0.0.0
+  namespace: placeholder
+spec:
+  apiservicedefinitions: {}
+  customresourcedefinitions: {}
+  description: Minio DirectPV Operator manages DirectPV deployments.
+  displayName: DirectPV
+  icon:
+  - base64data: ""
+    mediatype: ""
+  install:
+    spec:
+      deployments: null
+    strategy: ""
+  installModes:
+  - supported: false
+    type: OwnNamespace
+  - supported: false
+    type: SingleNamespace
+  - supported: false
+    type: MultiNamespace
+  - supported: true
+    type: AllNamespaces
+  keywords:
+  - DirectPV
+  links:
+  - name: Minio DirectPV Operator
+    url: https://min.io/directpv
+  maintainers:
+  - email: dev@minio.io
+    name: DirectPV
+  maturity: alpha
+  provider:
+    name: DirectPV
+    url: https://min.io/directpv
+  version: 0.0.0

helm/config/manifests/kustomization.yaml

@@ -1,7 +1,7 @@
 # These resources constitute the fully configured set of manifests
 # used to generate the 'manifests/' directory in a bundle.
 resources:
-- bases/directpv-operator.clusterserviceversion.yaml
+- bases/minio-directpv-operator-rhmp.clusterserviceversion.yaml
 - ../default
 - ../samples
 - ../scorecard

helm/generate.sh

@@ -54,7 +54,7 @@ function main() {
     # docker push "${IMG}"
 
     # bundle: Generate bundle manifests and metadata, then validate generated files.
-    operator-sdk generate kustomize manifests -q
+    operator-sdk generate kustomize manifests -q --package minio-directpv-operator-rhmp
     (cd config/manager && kustomize edit set image controller="$IMG")
     kustomize build config/manifests | operator-sdk generate bundle "$BUNDLE_GEN_FLAGS"
     operator-sdk bundle validate ./bundle