feat(install): add ndm operator to install files. (openebs#2603)

Updated openebs operator and charts with the following: - ndm operator deployment - grant access to openebs-maya-operator to access bd/bdc Signed-off-by: Akhil Mohan <akhil.mohan@mayadata.io>
vino-cloud7 · Jun 1, 2019 · b4076cc · b4076cc
1 parent d7d1c7c
commit b4076cc
Show file tree

Hide file tree

Showing 6 changed files with 138 additions and 6 deletions.
diff --git a/k8s/charts/openebs/README.md b/k8s/charts/openebs/README.md
@@ -93,13 +93,15 @@ The following table lists the configurable parameters of the OpenEBS chart and t
 | `snapshotOperator.controller.imageTag`  | Image Tag for Snapshot Controller             | `0.9.0`                                   |
 | `snapshotOperator.replicas`             | Number of Snapshot Operator Replicas          | `1`                                       |
 | `ndm.image`                             | Image for Node Disk Manager                   | `quay.io/openebs/node-disk-manager-amd64` |
-| `ndm.imageTag`                          | Image Tag for Node Disk Manager               | `v0.3.5`                                  |
+| `ndm.imageTag`                          | Image Tag for Node Disk Manager               | `ci`                                      |
 | `ndm.sparse.path`                       | Directory where Sparse files are created      | `/var/openebs/sparse`                     |
 | `ndm.sparse.size`                       | Size of the sparse file in bytes              | `10737418240`                             |
 | `ndm.sparse.count`                      | Number of sparse files to be created          | `1`                                       |
 | `ndm.filters.excludeVendors`            | Exclude devices with specified vendor         | `CLOUDBYT,OpenEBS`                        |
 | `ndm.filters.includePaths`              | Include devices with specified path patterns  | `""`                                      |
 | `ndm.filters.excludePaths`              | Exclude devices with specified path patterns  | `loop,fd0,sr0,/dev/ram,/dev/dm-,/dev/md`  |
+| `ndmOperator.image`                     | Image for NDM Operator                        | `quay.io/openebs/node-disk-operator-amd64`|
+| `ndmOperator.imageTag`                  | Image Tag for NDM Operator                    | `ci`                                      |
 | `jiva.image`                            | Image for Jiva                                | `quay.io/openebs/jiva`                    |
 | `jiva.imageTag`                         | Image Tag for Jiva                            | `0.9.0`                                   |
 | `jiva.replicas`                         | Number of Jiva Replicas                       | `3`                                       |

diff --git a/k8s/charts/openebs/templates/clusterrole.yaml b/k8s/charts/openebs/templates/clusterrole.yaml
@@ -25,7 +25,7 @@ rules:
   resources: ["customresourcedefinitions"]
   verbs: [ "get", "list", "create", "update", "delete"]
 - apiGroups: ["*"]
-  resources: [ "disks"]
+  resources: [ "disks", "blockdevices", "blockdeviceclaims"]
   verbs: ["*" ]
 - apiGroups: ["*"]
   resources: [ "storagepoolclaims", "storagepoolclaims/finalizers","storagepools"]

diff --git a/k8s/charts/openebs/templates/daemonset-ndm.yaml b/k8s/charts/openebs/templates/daemonset-ndm.yaml
@@ -34,6 +34,12 @@ spec:
         securityContext:
           privileged: true
         env:
+        # namespace in which NDM is installed will be passed to NDM Daemonset
+        # as environment variable
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
         # pass hostname as env variable using downward API to the NDM container
         - name: NODE_NAME
           valueFrom:

diff --git a/k8s/charts/openebs/templates/deployment-ndm-operator.yaml b/k8s/charts/openebs/templates/deployment-ndm-operator.yaml
@@ -0,0 +1,62 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ template "openebs.fullname" . }}-ndm-operator
+  labels:
+    app: {{ template "openebs.name" . }}
+    chart: {{ template "openebs.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+    component: ndm-operator
+    name: ndm-operator
+spec:
+  replicas: {{ .Values.ndmOperator.replicas }}
+  strategy:
+    type: {{ .Values.ndmOperator.upgradeStrategy }}
+  selector:
+    matchLabels:
+      app: {{ template "openebs.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "openebs.name" . }}
+        release: {{ .Release.Name }}
+        component: ndm-operator
+        name: ndm-operator
+        openebs.io/component-name: ndm-operator
+        openebs.io/version: {{ .Values.release.version }}
+    spec:
+      serviceAccountName: {{ template "openebs.serviceAccountName" . }}
+      containers:
+      - name: {{ template "openebs.fullname" . }}-ndm-operator
+        image: "{{ .Values.ndmOperator.image }}:{{ .Values.ndmOperator.imageTag }}"
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        readinessProbe:
+          exec:
+            command:
+            - stat
+            - /tmp/operator-sdk-ready
+          initialDelaySeconds: {{ .Values.ndmOperator.readinessCheck.initialDelaySeconds }}
+          periodSeconds: {{ .Values.ndmOperator.readinessCheck.periodSeconds }}
+          failureThreshold: {{ .Values.ndmOperator.readinessCheck.failureThreshold }}
+        env:
+        - name: WATCH_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name: OPERATOR_NAME
+          value: "node-disk-operator"
+{{- if .Values.ndmOperator.nodeSelector }}
+     nodeSelector:
+{{ toYaml .Values.ndmOperator.nodeSelector | indent 8 }}
+{{- end }}
+{{- if .Values.ndmOperator.tolerations }}
+     tolerations:
+{{ toYaml .Values.ndmOperator.tolerations | indent 8 }}
+{{- end }}
diff --git a/k8s/charts/openebs/values.yaml b/k8s/charts/openebs/values.yaml
@@ -74,7 +74,7 @@ snapshotOperator:
 
 ndm:
   image: "quay.io/openebs/node-disk-manager-amd64"
-  imageTag: "v0.3.5"
+  imageTag: "ci"
   sparse:
     path: "/var/openebs/sparse"
     size: "10737418240"
@@ -88,6 +88,18 @@ ndm:
     initialDelaySeconds: 30
     periodSeconds: 60
 
+ndmOperator:
+  image: "quay.io/openebs/node-disk-operator-amd64"
+  imageTag: "ci"
+  replicas: 1
+  upgradeStrategy: Recreate
+  nodeSelector: {}
+  tolerations: []
+  readinessCheck:
+    initialDelaySeconds: 4
+    periodSeconds: 10
+    failureThreshold: 1
+
 webhook:
   image: "quay.io/openebs/admission-server"
   imageTag: "0.9.0"

diff --git a/k8s/openebs-operator.yaml b/k8s/openebs-operator.yaml
@@ -36,7 +36,7 @@ rules:
   resources: ["customresourcedefinitions"]
   verbs: [ "get", "list", "create", "update", "delete"]
 - apiGroups: ["*"]
-  resources: [ "disks"]
+  resources: [ "disks", "blockdevices", "blockdeviceclaims"]
   verbs: ["*" ]
 - apiGroups: ["*"]
   resources: [ "cstorpoolclusters", "storagepoolclaims", "storagepoolclaims/finalizers", "storagepools"]
@@ -363,8 +363,8 @@ spec:
       hostNetwork: true
       containers:
       - name: node-disk-manager
-        image: quay.io/openebs/node-disk-manager-amd64:v0.3.5
-        imagePullPolicy: IfNotPresent
+        image: quay.io/openebs/node-disk-manager-amd64:ci
+        imagePullPolicy: Always
         securityContext:
           privileged: true
         volumeMounts:
@@ -380,6 +380,12 @@ spec:
         - name: sparsepath
           mountPath: /var/openebs/sparse
         env:
+        # namespace in which NDM is installed will be passed to NDM Daemonset
+        # as environment variable
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
         # pass hostname as env variable using downward API to the NDM container
         - name: NODE_NAME
           valueFrom:
@@ -420,6 +426,50 @@ spec:
         hostPath:
           path: /var/openebs/sparse
 ---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: openebs-ndm-operator
+  namespace: openebs
+spec:
+  replicas: 1
+  strategy:
+    type: Recreate
+  selector:
+    matchLabels:
+      name: openebs-ndm-operator
+  template:
+    metadata:
+      labels:
+        name: openebs-ndm-operator
+        openebs.io/component-name: ndm-operator
+        openebs.io/version: dev
+    spec:
+      serviceAccountName: openebs-maya-operator
+      containers:
+        - name: node-disk-operator
+          image: quay.io/openebs/node-disk-operator-amd64:ci
+          imagePullPolicy: Always
+          readinessProbe:
+            exec:
+              command:
+                - stat
+                - /tmp/operator-sdk-ready
+            initialDelaySeconds: 4
+            periodSeconds: 10
+            failureThreshold: 1
+          env:
+            - name: WATCH_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: OPERATOR_NAME
+              value: "node-disk-operator"
+---
 apiVersion: v1
 kind: Secret
 metadata: