Feature/node agent as config

deploy/crds/csi_v1_config_cr.yaml

@@ -0,0 +1,11 @@
+apiVersion: csi.ibm.com/v1
+kind: Config
+metadata:
+  name: example-config
+spec:
+  defineHost: true
+  nodeAgent:
+    repository: stg-artifactory.haifa.ibm.com:5030/ibm-node-agent
+    tag: "0.0.1"
+    port: "10086"
+

deploy/crds/csi_v1_config_crd.yaml

@@ -0,0 +1,72 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: configs.csi.ibm.com
+spec:
+  group: csi.ibm.com
+  names:
+    kind: Config
+    listKind: ConfigList
+    plural: configs
+    singular: config
+  scope: Namespaced
+  subresources:
+    status: {}
+  validation:
+    openAPIV3Schema:
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
+          type: string
+        kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          properties:
+            defineHost:
+              type: boolean
+            nodeAgent:
+              properties:
+                port:
+                  description: The port of the node agent server
+                  type: string
+                repository:
+                  description: The repository of the node agent image
+                  type: string
+                tag:
+                  description: The tag of the node agent image
+                  type: string
+              required:
+              - repository
+              - tag
+              - port
+              type: object
+          required:
+          - defineHost
+          - nodeAgent
+          type: object
+        status:
+          properties:
+            nodeAgent:
+              description: Phase is the driver running phase
+              properties:
+                phase:
+                  description: Phase is the NodeAgent running phase
+                  type: string
+              required:
+              - phase
+              type: object
+          required:
+          - nodeAgent
+          type: object
+  version: v1
+  versions:
+  - name: v1
+    served: true
+    storage: true

deploy/crds/csi_v1_ibmblockcsi_crd.yaml

@@ -69,15 +69,17 @@ spec:
               type: boolean
             nodeReady:
               type: boolean
-            ready:
-              description: 'INSERT ADDITIONAL STATUS FIELD - define observed state
-                of cluster Important: Run "operator-sdk generate k8s" to regenerate
-                code after modifying this file Add custom validation using kubebuilder
-                tags: https://book.kubebuilder.io/beyond_basics/generating_crd.html'
-              type: boolean
+            phase:
+              description: Phase is the driver running phase
+              type: string
+            version:
+              description: Version is the current driver version
+              type: string
           required:
+          - phase
           - controllerReady
           - nodeReady
+          - version
           type: object
   version: v1
   versions:

deploy/crds/csi_v1_nodeinfo_crd.yaml

@@ -31,22 +31,21 @@ spec:
           type: object
         status:
           properties:
-            iqns:
+            definedOnStorages:
               items:
                 type: string
               type: array
-            wwpns:
+            iqns:
               items:
                 type: string
               type: array
-            definedOnStorages:
+            wwpns:
               items:
                 type: string
               type: array
           required:
           - iqns
           - wwpns
-          # - definedOnStorages
           type: object
   version: v1
   versions:

deploy/ibm-block-csi-operator.yaml

@@ -1,4 +1,66 @@
 
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: configs.csi.ibm.com
+spec:
+  group: csi.ibm.com
+  names:
+    kind: Config
+    listKind: ConfigList
+    plural: configs
+    singular: config
+  scope: Namespaced
+  subresources:
+    status: {}
+  validation:
+    openAPIV3Schema:
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
+          type: string
+        kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          properties:
+            defineHost:
+              type: boolean
+            nodeAgent:
+              properties:
+                port:
+                  description: The port of the node agent server
+                  type: string
+                repository:
+                  description: The repository of the node agent image
+                  type: string
+                tag:
+                  description: The tag of the node agent image
+                  type: string
+              required:
+              - repository
+              - tag
+              - port
+              type: object
+          required:
+          - defineHost
+          - nodeAgent
+          type: object
+        status:
+          type: object
+  version: v1
+  versions:
+  - name: v1
+    served: true
+    storage: true
+
+---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
@@ -70,15 +132,17 @@ spec:
               type: boolean
             nodeReady:
               type: boolean
-            ready:
-              description: 'INSERT ADDITIONAL STATUS FIELD - define observed state
-                of cluster Important: Run "operator-sdk generate k8s" to regenerate
-                code after modifying this file Add custom validation using kubebuilder
-                tags: https://book.kubebuilder.io/beyond_basics/generating_crd.html'
-              type: boolean
+            phase:
+              description: Phase is the driver running phase
+              type: string
+            version:
+              description: Version is the current driver version
+              type: string
           required:
+          - phase
           - controllerReady
           - nodeReady
+          - version
           type: object
   version: v1
   versions:
@@ -120,91 +184,28 @@ spec:
           type: object
         status:
           properties:
-            iqns:
+            definedOnStorages:
               items:
                 type: string
               type: array
-            wwpns:
+            iqns:
               items:
                 type: string
               type: array
-            definedOnStorages:
+            wwpns:
               items:
                 type: string
               type: array
           required:
           - iqns
           - wwpns
-          # - definedOnStorages
           type: object
   version: v1
   versions:
   - name: v1
     served: true
     storage: true
 
----
-kind: DaemonSet
-apiVersion: apps/v1
-metadata:
-  name: ibm-node-agent
-  namespace: kube-system
-spec:
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: ibm-node-agent
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: ibm-node-agent
-    spec:
-      hostNetwork: true
-      containers:
-      - name: node-agent
-        securityContext:
-          privileged: true
-          capabilities:
-            add: ["SYS_ADMIN"]
-          allowPrivilegeEscalation: true
-        image: stg-artifactory.haifa.ibm.com:5030/ibm-node-agent:0.0.1
-        imagePullPolicy: IfNotPresent
-        env:
-        - name: ADDRESS
-          value: :10086
-        - name: NODE_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: spec.nodeName
-        ports:
-        - name: grpc
-          containerPort: 10086
-        volumeMounts:
-        - mountPath: /lib/modules
-          name: lib-modules
-        - mountPath: /sys
-          name: sysfs
-        - mountPath: /dev
-          name: dev
-        - name: iscsi
-          mountPath: /etc/iscsi
-      volumes:
-      - name: lib-modules
-        hostPath:
-          path: /lib/modules
-          type: Directory
-      - name: sysfs
-        hostPath:
-          path: /sys
-          type: Directory
-      - name: dev
-        hostPath:
-          path: /dev
-          type: Directory
-      - name: iscsi
-        hostPath:
-          path: /etc/iscsi
-          type: DirectoryOrCreate
-
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -231,8 +232,6 @@ spec:
         env:
         - name: WATCH_NAMESPACE
           value: ""
-        - name: ENABLE_HOST_DEFINE
-          value: ""
         - name: POD_NAME
           valueFrom:
             fieldRef: