Merge pull request #812 from pohly/release-0.8-backports

release 0.8 backports
intel · Nov 12, 2020 · b4b8754 · b4b8754
2 parents 61eb4d6 + 69e4a3f
commit b4b8754
Show file tree

Hide file tree

Showing 61 changed files with 227 additions and 114 deletions.
diff --git a/Makefile b/Makefile
@@ -177,6 +177,7 @@ KUSTOMIZE += $(foreach version,$(KUSTOMIZE_KUBERNETES_VERSIONS),$(subst X.XX,$(v
 # use different base.
 KUSTOMIZE += $(subst kubernetes-base,kubernetes-1.19-alpha,$(subst X.XX,1.19-alpha,$(KUSTOMIZE_KUBERNETES_OUTPUT)))
 
+KUSTOMIZE += deploy/common/pmem-storageclass-default.yaml=deploy/kustomize/storageclass
 KUSTOMIZE += deploy/common/pmem-storageclass-ext4.yaml=deploy/kustomize/storageclass-ext4
 KUSTOMIZE += deploy/common/pmem-storageclass-xfs.yaml=deploy/kustomize/storageclass-xfs
 KUSTOMIZE += deploy/common/pmem-storageclass-cache.yaml=deploy/kustomize/storageclass-cache

diff --git a/deploy/bindata_generated.go b/deploy/bindata_generated.go
diff --git a/deploy/common/pmem-storageclass-cache.yaml b/deploy/common/pmem-storageclass-cache.yaml
@@ -8,5 +8,3 @@ parameters:
   cacheSize: "2"
   persistencyModel: cache
 provisioner: pmem-csi.intel.com
-reclaimPolicy: Delete
-volumeBindingMode: Immediate
diff --git a/deploy/common/pmem-storageclass-default.yaml b/deploy/common/pmem-storageclass-default.yaml
@@ -0,0 +1,7 @@
+# Generated with "make kustomize", do not edit!
+
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: pmem-csi-sc
+provisioner: pmem-csi.intel.com
diff --git a/deploy/common/pmem-storageclass-ext4.yaml b/deploy/common/pmem-storageclass-ext4.yaml
@@ -8,5 +8,3 @@ parameters:
   csi.storage.k8s.io/fstype: ext4
   eraseafter: "true"
 provisioner: pmem-csi.intel.com
-reclaimPolicy: Delete
-volumeBindingMode: Immediate
diff --git a/deploy/common/pmem-storageclass-late-binding.yaml b/deploy/common/pmem-storageclass-late-binding.yaml
@@ -5,5 +5,4 @@ kind: StorageClass
 metadata:
   name: pmem-csi-sc-late-binding
 provisioner: pmem-csi.intel.com
-reclaimPolicy: Delete
 volumeBindingMode: WaitForFirstConsumer
diff --git a/deploy/common/pmem-storageclass-xfs.yaml b/deploy/common/pmem-storageclass-xfs.yaml
@@ -8,5 +8,3 @@ parameters:
   csi.storage.k8s.io/fstype: xfs
   eraseafter: "false"
 provisioner: pmem-csi.intel.com
-reclaimPolicy: Delete
-volumeBindingMode: Immediate
diff --git a/deploy/kubernetes-1.17/direct/pmem-csi.yaml b/deploy/kubernetes-1.17/direct/pmem-csi.yaml
@@ -280,6 +280,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2
         imagePullPolicy: IfNotPresent

diff --git a/deploy/kubernetes-1.17/direct/testing/pmem-csi.yaml b/deploy/kubernetes-1.17/direct/testing/pmem-csi.yaml
@@ -300,6 +300,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         - -v=5
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2

diff --git a/deploy/kubernetes-1.17/lvm/pmem-csi.yaml b/deploy/kubernetes-1.17/lvm/pmem-csi.yaml
@@ -280,6 +280,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2
         imagePullPolicy: IfNotPresent

diff --git a/deploy/kubernetes-1.17/lvm/testing/pmem-csi.yaml b/deploy/kubernetes-1.17/lvm/testing/pmem-csi.yaml
@@ -300,6 +300,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         - -v=5
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2

diff --git a/deploy/kubernetes-1.17/pmem-csi-direct-testing.yaml b/deploy/kubernetes-1.17/pmem-csi-direct-testing.yaml
@@ -300,6 +300,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         - -v=5
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2

diff --git a/deploy/kubernetes-1.17/pmem-csi-direct.yaml b/deploy/kubernetes-1.17/pmem-csi-direct.yaml
@@ -280,6 +280,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2
         imagePullPolicy: IfNotPresent

diff --git a/deploy/kubernetes-1.17/pmem-csi-lvm-testing.yaml b/deploy/kubernetes-1.17/pmem-csi-lvm-testing.yaml
@@ -300,6 +300,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         - -v=5
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2

diff --git a/deploy/kubernetes-1.17/pmem-csi-lvm.yaml b/deploy/kubernetes-1.17/pmem-csi-lvm.yaml
@@ -280,6 +280,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2
         imagePullPolicy: IfNotPresent

diff --git a/deploy/kubernetes-1.18/direct/pmem-csi.yaml b/deploy/kubernetes-1.18/direct/pmem-csi.yaml
@@ -280,6 +280,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2
         imagePullPolicy: IfNotPresent

diff --git a/deploy/kubernetes-1.18/direct/testing/pmem-csi.yaml b/deploy/kubernetes-1.18/direct/testing/pmem-csi.yaml
@@ -300,6 +300,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         - -v=5
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2

diff --git a/deploy/kubernetes-1.18/lvm/pmem-csi.yaml b/deploy/kubernetes-1.18/lvm/pmem-csi.yaml
@@ -280,6 +280,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2
         imagePullPolicy: IfNotPresent

diff --git a/deploy/kubernetes-1.18/lvm/testing/pmem-csi.yaml b/deploy/kubernetes-1.18/lvm/testing/pmem-csi.yaml
@@ -300,6 +300,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         - -v=5
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2

diff --git a/deploy/kubernetes-1.18/pmem-csi-direct-testing.yaml b/deploy/kubernetes-1.18/pmem-csi-direct-testing.yaml
@@ -300,6 +300,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         - -v=5
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2

diff --git a/deploy/kubernetes-1.18/pmem-csi-direct.yaml b/deploy/kubernetes-1.18/pmem-csi-direct.yaml
@@ -280,6 +280,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2
         imagePullPolicy: IfNotPresent

diff --git a/deploy/kubernetes-1.18/pmem-csi-lvm-testing.yaml b/deploy/kubernetes-1.18/pmem-csi-lvm-testing.yaml
@@ -300,6 +300,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         - -v=5
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2

diff --git a/deploy/kubernetes-1.18/pmem-csi-lvm.yaml b/deploy/kubernetes-1.18/pmem-csi-lvm.yaml
@@ -280,6 +280,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2
         imagePullPolicy: IfNotPresent

diff --git a/deploy/kubernetes-1.19-alpha/direct/pmem-csi.yaml b/deploy/kubernetes-1.19-alpha/direct/pmem-csi.yaml
@@ -281,6 +281,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         env:
         - name: POD_NAMESPACE

diff --git a/deploy/kubernetes-1.19-alpha/direct/testing/pmem-csi.yaml b/deploy/kubernetes-1.19-alpha/direct/testing/pmem-csi.yaml
@@ -301,6 +301,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         - -v=5
         env:

diff --git a/deploy/kubernetes-1.19-alpha/lvm/pmem-csi.yaml b/deploy/kubernetes-1.19-alpha/lvm/pmem-csi.yaml
@@ -281,6 +281,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         env:
         - name: POD_NAMESPACE

diff --git a/deploy/kubernetes-1.19-alpha/lvm/testing/pmem-csi.yaml b/deploy/kubernetes-1.19-alpha/lvm/testing/pmem-csi.yaml
@@ -301,6 +301,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         - -v=5
         env:

diff --git a/deploy/kubernetes-1.19-alpha/pmem-csi-direct-testing.yaml b/deploy/kubernetes-1.19-alpha/pmem-csi-direct-testing.yaml
@@ -301,6 +301,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         - -v=5
         env:

diff --git a/deploy/kubernetes-1.19-alpha/pmem-csi-direct.yaml b/deploy/kubernetes-1.19-alpha/pmem-csi-direct.yaml
@@ -281,6 +281,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         env:
         - name: POD_NAMESPACE

diff --git a/deploy/kubernetes-1.19-alpha/pmem-csi-lvm-testing.yaml b/deploy/kubernetes-1.19-alpha/pmem-csi-lvm-testing.yaml
@@ -301,6 +301,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         - -v=5
         env:

diff --git a/deploy/kubernetes-1.19-alpha/pmem-csi-lvm.yaml b/deploy/kubernetes-1.19-alpha/pmem-csi-lvm.yaml
@@ -281,6 +281,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         env:
         - name: POD_NAMESPACE

diff --git a/deploy/kubernetes-1.19/direct/pmem-csi.yaml b/deploy/kubernetes-1.19/direct/pmem-csi.yaml
@@ -280,6 +280,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2
         imagePullPolicy: IfNotPresent

diff --git a/deploy/kubernetes-1.19/direct/testing/pmem-csi.yaml b/deploy/kubernetes-1.19/direct/testing/pmem-csi.yaml
@@ -300,6 +300,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         - -v=5
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2

diff --git a/deploy/kubernetes-1.19/lvm/pmem-csi.yaml b/deploy/kubernetes-1.19/lvm/pmem-csi.yaml
@@ -280,6 +280,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2
         imagePullPolicy: IfNotPresent

diff --git a/deploy/kubernetes-1.19/lvm/testing/pmem-csi.yaml b/deploy/kubernetes-1.19/lvm/testing/pmem-csi.yaml
@@ -300,6 +300,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         - -v=5
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2

diff --git a/deploy/kubernetes-1.19/pmem-csi-direct-testing.yaml b/deploy/kubernetes-1.19/pmem-csi-direct-testing.yaml
@@ -300,6 +300,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         - -v=5
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2

diff --git a/deploy/kubernetes-1.19/pmem-csi-direct.yaml b/deploy/kubernetes-1.19/pmem-csi-direct.yaml
@@ -280,6 +280,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2
         imagePullPolicy: IfNotPresent

diff --git a/deploy/kubernetes-1.19/pmem-csi-lvm-testing.yaml b/deploy/kubernetes-1.19/pmem-csi-lvm-testing.yaml
@@ -300,6 +300,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         - -v=5
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2

diff --git a/deploy/kubernetes-1.19/pmem-csi-lvm.yaml b/deploy/kubernetes-1.19/pmem-csi-lvm.yaml
@@ -280,6 +280,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4
         - --metrics-address=:10011
         image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2
         imagePullPolicy: IfNotPresent

diff --git a/deploy/kustomize/driver/pmem-csi.yaml b/deploy/kustomize/driver/pmem-csi.yaml
@@ -123,6 +123,7 @@ spec:
         - --feature-gates=Topology=true
         - --strict-topology=true
         - --timeout=5m
+        - --default-fstype=ext4 # see https://github.com/kubernetes-csi/external-provisioner/issues/328#issuecomment-714801581
         securityContext:
           readOnlyRootFilesystem: true
         volumeMounts:

diff --git a/deploy/kustomize/olm-catalog/bases/pmem-csi-operator.clusterserviceversion.yaml b/deploy/kustomize/olm-catalog/bases/pmem-csi-operator.clusterserviceversion.yaml
@@ -9,20 +9,21 @@ metadata:
     description: An operator for deploying and managing the PMEM-CSI driver
     repository: https://github.com/intel/pmem-csi/tree/release-X.Y
     support: Intel
-    createAt: 2020-06-25 10:50Z
+    createdAt: 2020-06-25 10:50Z
+    certified: "false"
+    capabilities: Seamless Upgrades
 spec:
   displayName: Operator for PMEM-CSI driver
   provider:
     name: Intel® Corporation
-    url: https://intel.com
   installModes:
   - supported: true
     type: OwnNamespace
   - supported: true
     type: SingleNamespace
   - supported: false
     type: MultiNamespace
-  - supported: true
+  - supported: false
     type: AllNamespaces
   links:
   - name: PMEM-CSI
@@ -39,6 +40,7 @@ spec:
     name: Patrick Ohly
   - email: [email protected]
     name: Amarnath Valluri
+  maturity: alpha
   customresourcedefinitions:
     owned:
     - kind: Deployment

diff --git a/deploy/kustomize/storageclass/pmem-storageclass.yaml b/deploy/kustomize/storageclass/pmem-storageclass.yaml
@@ -3,5 +3,3 @@ kind: StorageClass
 metadata:
   name: pmem-csi-sc
 provisioner: pmem-csi.intel.com
-reclaimPolicy: Delete
-volumeBindingMode: Immediate
diff --git a/docs/install.md b/docs/install.md
@@ -32,8 +32,16 @@ Kubernetes](#installation-and-setup).
 
 The administrator must install PMEM-CSI, using [the PMEM-CSI
 operator](#install-using-the-operator) (recommended) or with [scripts
-and YAML files in the source code](#install-from-source). A PMEM-CSI
-installation can only use [direct device
+and YAML files in the source code](#install-from-source). The default
+install settings should work for most clusters. Some clusters don't
+use `/var/lib/kubelet` as the data directory for kubelet and then the
+corresponding PMEM-CSI setting must be changed accordingly because
+otherwise kubelet does not find PMEM-CSI. The operator has an option
+for that in its API (`kubeletDir` in the [`DeploymentSpec`](#deploymentspec)),
+the YAML files can be edited or modified with
+kustomize.
+
+A PMEM-CSI installation can only use [direct device
 mode](/docs/design.md#direct-device-mode) or [LVM
 device mode](/docs/design.md#direct-device-mode). It is possible to install
 PMEM-CSI twice on the same cluster with different modes, with these restrictions:
@@ -1060,8 +1068,8 @@ Available PMEM as percentage:
 pmem_amount_available / pmem_amount_managed
 ```
 
-Result variable | Value | Tags
-----------------|-------|-----
+| Result variable | Value | Tags|
+| ----------------|-------|-----|
 | none | 0.7332986065893997 | instance = 10.42.0.1:10010 |
 |  | | job = pmem-csi-containers |
 |  | | kubernetes_namespace = default |
@@ -1090,8 +1098,8 @@ Number of `CreateVolume` calls in nodes:
 pmem_csi_node_operations_seconds_count{method_name="/csi.v1.Controller/CreateVolume"}
 ```
 
-Result variable | Value | Tags
-----------------|-------|------
+|Result variable | Value | Tags|
+|----------------|-------|------|
 | `pmem_csi_node_operations_seconds_count` | 2 | driver_name = pmem-csi.intel.com |
 | | | grpc_status_code = OK |
 | | | instance = 10.42.0.1:10010 |
@@ -1143,7 +1151,7 @@ The current API for PMEM-CSI `Deployment` resources is:
 |---|---|---|---|
 | image | string | PMEM-CSI docker image name used for the deployment | the same image as the operator<sup>1</sup> |
 | provisionerImage | string | [CSI provisioner](https://kubernetes-csi.github.io/docs/external-provisioner.html) docker image name | latest [external provisioner](https://kubernetes-csi.github.io/docs/external-provisioner.html) stable release image<sup>2</sup> |
-| registrarImage | string | [CSI node driver registrar](https://github.com/kubernetes-csi/node-driver-registrar) docker image name | latest [node driver registrar](https://kubernetes-csi.github.io/docs/node-driver-registrar.html) stable release image<sup>2</sup> |
+| nodeRegistrarImage | string | [CSI node driver registrar](https://github.com/kubernetes-csi/node-driver-registrar) docker image name | latest [node driver registrar](https://kubernetes-csi.github.io/docs/node-driver-registrar.html) stable release image<sup>2</sup> |
 | pullPolicy | string | Docker image pull policy. either one of `Always`, `Never`, `IfNotPresent` | `IfNotPresent` |
 | logLevel | integer | PMEM-CSI driver logging level | 3 |
 | deviceMode | string | Device management mode to use. Supports one of `lvm` or `direct` | `lvm`