Merge pull request #16 from gabemontero/mv-deleted-driver-deploy-dir-…

…here

BUILD-256: move driver PR #54, #60 asset changes here

assets/metrics_service.yaml

@@ -0,0 +1,13 @@
+kind: Service
+apiVersion: v1
+metadata:
+  name: shared-resource-csi-driver-node-metrics
+  namespace: openshift-cluster-csi-drivers
+  labels:
+    app: shared-resource-csi-driver-node
+spec:
+  selector:
+    app: shared-resource-csi-driver-node
+  ports:
+    - name: metrics
+      port: 6000

assets/node.yaml

@@ -48,13 +48,11 @@ spec:
           command:
             - csi-driver-shared-resource
           args:
+            - --config=/var/run/configmaps/config/config.yaml
             - "--drivername=csi.sharedresource.openshift.io"
             - "--v=4"
-            - "--endpoint=$(CSI_ENDPOINT)"
             - "--nodeid=$(KUBE_NODE_NAME)"
           env:
-            - name: CSI_ENDPOINT
-              value: unix:///csi/csi.sock
             - name: KUBE_NODE_NAME
               valueFrom:
                 fieldRef:
@@ -66,7 +64,12 @@ spec:
             - containerPort: 9898
               name: healthz
               protocol: TCP
+            - containerPort: 6000
+              name: metrics
+              protocol: TCP
           volumeMounts:
+            - mountPath: /var/run/configmaps/config
+              name: config
             - mountPath: /csi
               name: socket-dir
             - mountPath: /var/lib/kubelet/pods
@@ -83,6 +86,10 @@ spec:
               name: dev-dir
 
       volumes:
+        - configMap:
+            optional: true
+            name: csi-driver-shared-resource-config
+          name: config
         - hostPath:
             path: /var/lib/kubelet/plugins/csi-hostpath
             type: DirectoryOrCreate

assets/servicemonitor.yaml

@@ -0,0 +1,16 @@
+---
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: shared-resource-csi-driver-node
+  namespace: openshift-cluster-csi-drivers
+  annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/self-managed-high-availability: "true"
+    include.release.openshift.io/single-node-developer: "true"
+spec:
+  endpoints:
+    - port: metrics
+  selector:
+    matchLabels:
+      app: shared-resource-csi-driver-node

pkg/operator/starter.go

@@ -119,6 +119,8 @@ func RunOperator(ctx context.Context, controllerConfig *controllercmd.Controller
 			"csidriver.yaml",
 			"node_sa.yaml",
 			"service.yaml",
+			"metrics_service.yaml",
+			"servicemonitor.yaml",
 			"rbac/privileged_role.yaml",
 			"rbac/node_role.yaml",
 			"rbac/node_privileged_binding.yaml",