Merge pull request #165 from nbalacha/bundles

fix: updates bundle manifests
openshift · Apr 20, 2022 · b5f4634 · b5f4634
2 parents b346b4f + afd7e45
commit b5f4634
Show file tree

Hide file tree

Showing 21 changed files with 748 additions and 162 deletions.
diff --git a/bundle/manifests/lvm-metrics_rbac.authorization.k8s.io_v1_role.yaml b/bundle/manifests/lvm-metrics_rbac.authorization.k8s.io_v1_role.yaml
@@ -0,0 +1,16 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  creationTimestamp: null
+  name: lvm-metrics
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - services
+  - endpoints
+  - pods
+  verbs:
+  - get
+  - list
+  - watch
diff --git a/bundle/manifests/lvm-metrics_rbac.authorization.k8s.io_v1_rolebinding.yaml b/bundle/manifests/lvm-metrics_rbac.authorization.k8s.io_v1_rolebinding.yaml
@@ -0,0 +1,13 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  creationTimestamp: null
+  name: lvm-metrics
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: lvm-metrics
+subjects:
+- kind: ServiceAccount
+  name: prometheus-k8s
+  namespace: openshift-monitoring
diff --git a/bundle/manifests/lvm-node-metrics_v1_service.yaml b/bundle/manifests/lvm-node-metrics_v1_service.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  creationTimestamp: null
+  labels:
+    app.kubernetes.io/compose: metrics
+  name: lvm-node-metrics
+spec:
+  ports:
+  - name: lvm-metrics
+    port: 23532
+    protocol: TCP
+    targetPort: 23532
+  selector:
+    exporter: lvm-operator
+status:
+  loadBalancer: {}
diff --git a/...-operator-controller-manager-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml b/...-operator-controller-manager-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml
@@ -0,0 +1,23 @@
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  labels:
+    control-plane: controller-manager
+  name: lvm-operator-controller-manager-metrics-monitor
+spec:
+  endpoints:
+  - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
+    path: /metrics
+    port: topolvm-metrics
+    scheme: http
+    tlsConfig:
+      insecureSkipVerify: true
+  - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
+    path: /metrics
+    port: lvm-metrics
+    scheme: http
+    tlsConfig:
+      insecureSkipVerify: true
+  selector:
+    matchLabels:
+      app.kubernetes.io/compose: metrics
diff --git a/bundle/manifests/lvm-operator.clusterserviceversion.yaml b/bundle/manifests/lvm-operator.clusterserviceversion.yaml
@@ -11,12 +11,35 @@ metadata:
             "name": "lvmcluster-sample"
           },
           "spec": {
-            "deviceClasses": [
-              {
-                "name": "vg1"
-              }
-            ]
+            "storage": {
+              "deviceClasses": [
+                {
+                  "name": "vg1",
+                  "thinPoolConfig": {
+                    "name": "thin-pool-1",
+                    "overprovisionRatio": 50,
+                    "sizePercent": 50
+                  }
+                }
+              ]
+            }
           }
+        },
+        {
+          "apiVersion": "lvm.topolvm.io/v1alpha1",
+          "kind": "LVMVolumeGroup",
+          "metadata": {
+            "name": "lvmvolumegroup-sample"
+          },
+          "spec": null
+        },
+        {
+          "apiVersion": "lvm.topolvm.io/v1alpha1",
+          "kind": "LVMVolumeGroupNodeStatus",
+          "metadata": {
+            "name": "lvmvolumegroupnodestatus-sample"
+          },
+          "spec": null
         }
       ]
     capabilities: Basic Install
@@ -36,11 +59,17 @@ spec:
       kind: LVMCluster
       name: lvmclusters.lvm.topolvm.io
       version: v1alpha1
+    - kind: LVMVolumeGroupNodeStatus
+      name: lvmvolumegroupnodestatuses.lvm.topolvm.io
+      version: v1alpha1
+    - kind: LVMVolumeGroup
+      name: lvmvolumegroups.lvm.topolvm.io
+      version: v1alpha1
   description: The ODF LVM Operator manages local storage using LVM.
   displayName: ODF LVM Operator
   icon:
-  - base64data: ""
-    mediatype: ""
+  - base64data: PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxOTIgMTQ1Ij48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6I2UwMDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPlJlZEhhdC1Mb2dvLUhhdC1Db2xvcjwvdGl0bGU+PHBhdGggZD0iTTE1Ny43Nyw2Mi42MWExNCwxNCwwLDAsMSwuMzEsMy40MmMwLDE0Ljg4LTE4LjEsMTcuNDYtMzAuNjEsMTcuNDZDNzguODMsODMuNDksNDIuNTMsNTMuMjYsNDIuNTMsNDRhNi40Myw2LjQzLDAsMCwxLC4yMi0xLjk0bC0zLjY2LDkuMDZhMTguNDUsMTguNDUsMCwwLDAtMS41MSw3LjMzYzAsMTguMTEsNDEsNDUuNDgsODcuNzQsNDUuNDgsMjAuNjksMCwzNi40My03Ljc2LDM2LjQzLTIxLjc3LDAtMS4wOCwwLTEuOTQtMS43My0xMC4xM1oiLz48cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik0xMjcuNDcsODMuNDljMTIuNTEsMCwzMC42MS0yLjU4LDMwLjYxLTE3LjQ2YTE0LDE0LDAsMCwwLS4zMS0zLjQybC03LjQ1LTMyLjM2Yy0xLjcyLTcuMTItMy4yMy0xMC4zNS0xNS43My0xNi42QzEyNC44OSw4LjY5LDEwMy43Ni41LDk3LjUxLjUsOTEuNjkuNSw5MCw4LDgzLjA2LDhjLTYuNjgsMC0xMS42NC01LjYtMTcuODktNS42LTYsMC05LjkxLDQuMDktMTIuOTMsMTIuNSwwLDAtOC40MSwyMy43Mi05LjQ5LDI3LjE2QTYuNDMsNi40MywwLDAsMCw0Mi41Myw0NGMwLDkuMjIsMzYuMywzOS40NSw4NC45NCwzOS40NU0xNjAsNzIuMDdjMS43Myw4LjE5LDEuNzMsOS4wNSwxLjczLDEwLjEzLDAsMTQtMTUuNzQsMjEuNzctMzYuNDMsMjEuNzdDNzguNTQsMTA0LDM3LjU4LDc2LjYsMzcuNTgsNTguNDlhMTguNDUsMTguNDUsMCwwLDEsMS41MS03LjMzQzIyLjI3LDUyLC41LDU1LC41LDc0LjIyYzAsMzEuNDgsNzQuNTksNzAuMjgsMTMzLjY1LDcwLjI4LDQ1LjI4LDAsNTYuNy0yMC40OCw1Ni43LTM2LjY1LDAtMTIuNzItMTEtMjcuMTYtMzAuODMtMzUuNzgiLz48L3N2Zz4=
+    mediatype: image/svg+xml
   install:
     spec:
       clusterPermissions:
@@ -102,6 +131,58 @@ spec:
           - get
           - patch
           - update
+        - apiGroups:
+          - lvm.topolvm.io
+          resources:
+          - lvmvolumegroupnodestatuses
+          verbs:
+          - create
+          - delete
+          - get
+          - list
+          - patch
+          - update
+          - watch
+        - apiGroups:
+          - lvm.topolvm.io
+          resources:
+          - lvmvolumegroupnodestatuses/finalizers
+          verbs:
+          - update
+        - apiGroups:
+          - lvm.topolvm.io
+          resources:
+          - lvmvolumegroupnodestatuses/status
+          verbs:
+          - get
+          - patch
+          - update
+        - apiGroups:
+          - lvm.topolvm.io
+          resources:
+          - lvmvolumegroups
+          verbs:
+          - create
+          - delete
+          - get
+          - list
+          - patch
+          - update
+          - watch
+        - apiGroups:
+          - lvm.topolvm.io
+          resources:
+          - lvmvolumegroups/finalizers
+          verbs:
+          - update
+        - apiGroups:
+          - lvm.topolvm.io
+          resources:
+          - lvmvolumegroups/status
+          verbs:
+          - get
+          - patch
+          - update
         - apiGroups:
           - security.openshift.io
           resources:
@@ -131,6 +212,14 @@ spec:
           - get
           - list
           - watch
+        - apiGroups:
+          - topolvm.cybozu.com
+          resources:
+          - logicalvolumes
+          verbs:
+          - get
+          - list
+          - watch
         - apiGroups:
           - authentication.k8s.io
           resources:
@@ -145,7 +234,7 @@ spec:
           - create
         serviceAccountName: controller-manager
       deployments:
-      - name: controller-manager
+      - name: lvm-operator-controller-manager
         spec:
           replicas: 1
           selector:
@@ -156,6 +245,7 @@ spec:
             metadata:
               labels:
                 control-plane: controller-manager
+                exporter: lvm-operator
             spec:
               containers:
               - args:
@@ -177,6 +267,16 @@ spec:
                 command:
                 - /manager
                 env:
+                - name: TOPOLVM_CSI_IMAGE
+                  value: quay.io/topolvm/topolvm:0.11.0
+                - name: CSI_LIVENESSPROBE_IMAGE
+                  value: k8s.gcr.io/sig-storage/livenessprobe:v2.5.0
+                - name: CSI_PROVISIONER_IMAGE
+                  value: k8s.gcr.io/sig-storage/csi-provisioner:v3.0.0
+                - name: CSI_REGISTRAR_IMAGE
+                  value: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0
+                - name: CSI_RESIZER_IMAGE
+                  value: k8s.gcr.io/sig-storage/csi-resizer:v1.3.0
                 - name: POD_NAMESPACE
                   valueFrom:
                     fieldRef:
@@ -185,10 +285,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.name
-                envFrom:
-                - configMapRef:
-                    name: lvm-operator-manager-config
-                image: quay.io/ocs-dev/lvm-operator:latest
+                image: quay.io/nibalach/lvm-operator:e2e
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -211,6 +308,11 @@ spec:
                     memory: 20Mi
                 securityContext:
                   allowPrivilegeEscalation: false
+              - command:
+                - /metricsexporter
+                image: quay.io/nibalach/lvm-operator:e2e
+                name: metricsexporter
+                resources: {}
               securityContext:
                 runAsNonRoot: true
               serviceAccountName: controller-manager