Merge pull request #38 from sun7927/release

2.1.0 new release: add fs/mount options and namespace env into flexvol daemon
purestorage · Jul 31, 2018 · 95d5dee · 95d5dee
2 parents c98034a + bbc071f
commit 95d5dee
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ We serve charts using a github page with its root at [./docs](./docs) when the h
 we need to do something like:
 
 ```bash
-helm package ./$CHART_NAME>
+helm package ./$CHART_NAME
 cp $CHART_NAME.tgz ./docs
 helm repo index docs --url https://purestorage.github.io/helm-charts
 ```

diff --git a/docs/index.yaml b/docs/index.yaml
@@ -2,19 +2,27 @@ apiVersion: v1
 entries:
   pure-k8s-plugin:
   - apiVersion: v1
-    created: 2018-06-29T11:28:12.380333988-07:00
+    created: 2018-07-31T13:05:31.625385564-07:00
+    description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/Openshift
+    digest: 0af34b08f80ffcd17a75f5947ca773437f57e2f70a63429bf3c9fc570e4ddaf2
+    name: pure-k8s-plugin
+    urls:
+    - https://purestorage.github.io/helm-charts/pure-k8s-plugin-2.1.0.tgz
+    version: 2.1.0
+  - apiVersion: v1
+    created: 2018-07-31T13:05:31.624778806-07:00
     description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/Openshift
     digest: 05eed477a922dfcd35b3905fc0dcd50aa448fe7123bb6a5517dd9ab709dc906e
     name: pure-k8s-plugin
     urls:
     - https://purestorage.github.io/helm-charts/pure-k8s-plugin-2.0.1.tgz
     version: 2.0.1
   - apiVersion: v1
-    created: 2018-06-29T11:28:12.379725515-07:00
+    created: 2018-07-31T13:05:31.624137368-07:00
     description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/Openshift
     digest: 1cd0d82bf6e38183f70bd4160ddb74be76be355935ad6c41fdc1ef2403686f72
     name: pure-k8s-plugin
     urls:
     - https://purestorage.github.io/helm-charts/pure-k8s-plugin-2.0.0.tgz
     version: 2.0.0
-generated: 2018-06-29T11:28:12.378918679-07:00
+generated: 2018-07-31T13:05:31.623258458-07:00
diff --git a/docs/pure-k8s-plugin-2.1.0.tgz b/docs/pure-k8s-plugin-2.1.0.tgz
diff --git a/pure-k8s-plugin/Chart.yaml b/pure-k8s-plugin/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v1
 description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/Openshift
 name: pure-k8s-plugin
-version: 2.0.1
+version: 2.1.0
diff --git a/pure-k8s-plugin/README.md b/pure-k8s-plugin/README.md
@@ -28,13 +28,16 @@ The following table lists the configurable parameters and their default values.
 
 |             Parameter       |            Description             |                    Default                |
 |-----------------------------|------------------------------------|-------------------------------------------|
-| `image.name`                | The image name       to pull from  | `purestorage/k8s`                 |
-| `image.tag`                 | The image tag to pull              | `2.0.1`                                  |
+| `image.name`                | The image name       to pull from  | `purestorage/k8s`                         |
+| `image.tag`                 | The image tag to pull              | `2.1.0`                                   |
 | `image.pullPolicy`          | Image pull policy                  | `IfNotPresent`                            |
-| `app.debug`                 | Enable/disable debug mode for app  | `false`                                  |
-| `storageclass.isPureDefault`| Set `pure` storageclass to the default | `false`       |
+| `app.debug`                 | Enable/disable debug mode for app  | `false`                                   |
+| `storageclass.isPureDefault`| Set `pure` storageclass to the default | `false`                               |
 | `clusterrolebinding.serviceAccount.name`| Name of K8s service account for app | `default`                    |
-| `flasharray.sanType`        | Block volume access protocol, either ISCSI or FC | `ISCSI`                      |
+| `flasharray.sanType`        | Block volume access protocol, either ISCSI or FC | `ISCSI`                     |
+| `flasharray.defaultFSType`  | Block volume default filesystem type. *Not recommended to change!* | `xfs`     |
+| `flasharray.defaultFSOpt`  | Block volume default mkfs options. *Not recommended to change!* | `-q`          |
+| `flasharray.defaultMountOpt`  | Block volume default filesystem mount options. *Not recommended to change!* |     ""    |
 | `namespace.pure`            | Namespace for the backend storage  | `k8s`                                     |
 | `orchestrator.name`         | Orchestrator type, such as openshift, k8s | `k8s`                              |
 | `orchestrator.k8s.flexBaseDir` | Base path of directory to install flex plugin, works with orchestrator.name=k8s and image.tag < 2.0. Sub-dir of "volume/exec/pure~flex" will be automatically created under it | `/usr/libexec/kubernetes/kubelet-plugins` |
@@ -127,6 +130,26 @@ This upgrade will not impact the in-use volumes/filesystems from data path persp
     /etc/origin/node/kubelet-plugins/volume/exec/pure~flex
     ```
 
+## Platform and Software Dependencies
+- #### Operating Systems Supported*:
+  - CentOS 7
+  - CoreOS (Ladybug 1298.6.0 and above)
+  - RHEL 7
+  - Ubuntu 16.04
+- #### Environments Supported*:
+  - Kubernetes 1.6+
+  - OpenShift 3.6+
+- #### Other software dependencies:
+  - Latest linux multipath software package for your operating system (Required)
+  - Latest Filesystem utilities/drivers (XFS by default, Required)
+  - Latest iSCSI initiator software for your operating system (Optional, required for iSCSI connectivity)
+  - Latest NFS software package for your operating system (Optional, required for NFS connectivity)
+  - Latest FC initiator software for your operating system (Optional, requied for FC connectivity)
+- #### FlashArray and FlashBlade:
+  - The FlashArray and/or FlashBlade should be connected to the compute nodes using Pure's best practices
+
+_* Please see release notes for details_
+
 ## Containerized Kubelet
 
 If Kubernetes is deployed using containerized kubelet services then there

diff --git a/pure-k8s-plugin/templates/pure-flex-daemon.yaml b/pure-k8s-plugin/templates/pure-flex-daemon.yaml
@@ -50,6 +50,14 @@ spec:
             value: /etc/pure/pure.json
           - name: PURE_FLASHARRAY_SAN_TYPE
             value: {{ .Values.flasharray.sanType | upper }}
+          - name: PURE_K8S_NAMESPACE
+            value: {{ .Values.namespace.pure }}
+          - name: PURE_DEFAULT_BLOCK_FS_TYPE
+            value: {{ .Values.flasharray.defaultFSType }}
+          - name: PURE_DEFAULT_BLOCK_FS_OPT
+            value: "{{ .Values.flasharray.defaultFSOpt }}"
+          - name: PURE_DEFAULT_BLOCK_MNT_OPT
+            value: "{{ .Values.flasharray.defaultMountOpt }}"
       volumes:
         - name: config
           configMap:

diff --git a/pure-k8s-plugin/values.yaml b/pure-k8s-plugin/values.yaml
@@ -4,7 +4,7 @@
 
 image:
   name: purestorage/k8s
-  tag: 2.0.1
+  tag: 2.1.0
   pullPolicy: IfNotPresent
 
 # this option is to enable/disable the debug mode of this app
@@ -24,6 +24,9 @@ clusterrolebinding:
 # support ISCSI or FC, not case sensitive
 flasharray:
   sanType: ISCSI
+  defaultFSType: xfs
+  defaultFSOpt: "-q"
+  defaultMountOpt: ""
 
 # there are two namespaces for this app
 # 1. namespace.pure is the backend storage namespace where volumes/shares/etc