Tracking v2.2.0 (#32)

Signed-off-by: Michael Mattsson <[email protected]>

INSTALL.md

@@ -4,7 +4,7 @@ These procedures assumes a running Kubernetes cluster [supported by the HPE CSI
 
 ## Prerequisites
 
-- HPE CSI Driver for Kubernetes version 2.1.0 or later
+- HPE CSI Driver for Kubernetes version 2.2.0 or later
 - TrueNAS 12.0 BETA or later
 - TrueNAS SCALE 22.02 RC1 or later
 - FreeNAS 11.2-U3 or later
@@ -26,15 +26,15 @@ The HPE CSI Driver may be installed using either a Helm Chart, Operator or direc
 Install HPE CSI Driver using manifests:
 
 ```
-kubectl create -f https://raw.githubusercontent.com/hpe-storage/co-deployments/master/yaml/csi-driver/v2.1.0/hpe-linux-config.yaml
-kubectl create -f https://raw.githubusercontent.com/hpe-storage/co-deployments/master/yaml/csi-driver/v2.1.0/hpe-csi-k8s-1.22.yaml
+kubectl create -f https://raw.githubusercontent.com/hpe-storage/co-deployments/master/yaml/csi-driver/v2.2.0/hpe-linux-config.yaml
+kubectl create -f https://raw.githubusercontent.com/hpe-storage/co-deployments/master/yaml/csi-driver/v2.2.0/hpe-csi-k8s-1.22.yaml
 ```
 
 Install the TrueNAS CSP using manifests:
 
 ```
 kubectl create ns hpe-storage
-kubectl create -f https://raw.githubusercontent.com/hpe-storage/truenas-csp/master/K8s/v2.1.0/truenas-csp.yaml
+kubectl create -f https://raw.githubusercontent.com/hpe-storage/truenas-csp/master/K8s/v2.2.0/truenas-csp.yaml
 ```
 
 **Note:** Replace `hpe-csi-k8s-<version>.yaml` with your version of Kubernetes. Also change the version of the HPE CSI Driver manifests where applicable. Using mismatching versions of the TrueNAS CSP and the HPE CSI Driver will most likely **NOT** work.

K8s/v2.2.0/hpe-storageclass-nfs.yaml

@@ -0,0 +1,25 @@
+---
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  annotations:
+    storageclass.kubernetes.io/is-default-class: "false"
+  name: hpe-standard-nfs
+provisioner: csi.hpe.com
+parameters:
+  csi.storage.k8s.io/controller-expand-secret-name: truenas-secret
+  csi.storage.k8s.io/controller-expand-secret-namespace: hpe-storage
+  csi.storage.k8s.io/controller-publish-secret-name: truenas-secret
+  csi.storage.k8s.io/controller-publish-secret-namespace: hpe-storage
+  csi.storage.k8s.io/node-publish-secret-name: truenas-secret
+  csi.storage.k8s.io/node-publish-secret-namespace: hpe-storage
+  csi.storage.k8s.io/node-stage-secret-name: truenas-secret
+  csi.storage.k8s.io/node-stage-secret-namespace: hpe-storage
+  csi.storage.k8s.io/provisioner-secret-name: truenas-secret
+  csi.storage.k8s.io/provisioner-secret-namespace: hpe-storage
+  csi.storage.k8s.io/fstype: xfs
+  nfsResources: "true"
+  allowOverrides: sparse,compression,deduplication,volblocksize,sync,description  
+  root: zwimming/csi-volumes
+reclaimPolicy: Delete
+allowVolumeExpansion: true

K8s/v2.2.0/hpe-storageclass.yaml

@@ -0,0 +1,24 @@
+---
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  annotations:
+    storageclass.kubernetes.io/is-default-class: "true"
+  name: hpe-standard
+provisioner: csi.hpe.com
+parameters:
+  csi.storage.k8s.io/controller-expand-secret-name: truenas-secret
+  csi.storage.k8s.io/controller-expand-secret-namespace: hpe-storage
+  csi.storage.k8s.io/controller-publish-secret-name: truenas-secret
+  csi.storage.k8s.io/controller-publish-secret-namespace: hpe-storage
+  csi.storage.k8s.io/node-publish-secret-name: truenas-secret
+  csi.storage.k8s.io/node-publish-secret-namespace: hpe-storage
+  csi.storage.k8s.io/node-stage-secret-name: truenas-secret
+  csi.storage.k8s.io/node-stage-secret-namespace: hpe-storage
+  csi.storage.k8s.io/provisioner-secret-name: truenas-secret
+  csi.storage.k8s.io/provisioner-secret-namespace: hpe-storage
+  csi.storage.k8s.io/fstype: xfs
+  allowOverrides: sparse,compression,deduplication,volblocksize,sync,description  
+  root: zwimming/csi-volumes
+reclaimPolicy: Delete
+allowVolumeExpansion: true

K8s/v2.2.0/truenas-csp.yaml

@@ -0,0 +1,38 @@
+---
+kind: Service
+apiVersion: v1
+metadata:
+  name: truenas-csp-svc
+  namespace: hpe-storage
+  labels:
+    app: truenas-csp-svc
+spec:
+  ports:
+  - port: 8080
+    protocol: TCP
+  selector:
+    app: truenas-csp
+
+---
+kind: Deployment
+apiVersion: apps/v1
+metadata:
+  name: truenas-csp
+  namespace: hpe-storage
+spec:
+  selector:
+    matchLabels:
+      app: truenas-csp
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: truenas-csp
+    spec:
+      priorityClassName: system-cluster-critical
+      containers:
+        - name: truenas-csp
+          image: quay.io/datamattsson/truenas-csp:v2.2.0
+          imagePullPolicy: IfNotPresent
+          ports:
+          - containerPort: 8080

K8s/v2.2.0/truenas-secret.yaml

@@ -0,0 +1,12 @@
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: truenas-secret
+  namespace: hpe-storage
+stringData:
+  serviceName: truenas-csp-svc
+  servicePort: "8080"
+  username: hpe-csi (username is a no-op)
+  password: API key or root password of TrueNAS/FreeNAS appliance
+  backend: Management IP address of TrueNAS/FreeNAS appliance

README.md

@@ -13,7 +13,7 @@ CSP API endpoints:
 
 The [CSP specification](https://github.com/hpe-storage/container-storage-provider) in an open specification that supports iSCSI and Fibre Channel protocols.
 
-As of version 2.1.1 of the HPE CSI Driver, these parts of the CSI spec are currently implemented:
+As of version 2.2.0 of the HPE CSI Driver, these parts of the CSI spec are currently implemented:
 
 - Dynamic Provisioning
 - Raw Block Volume
@@ -29,6 +29,7 @@ Topology is currently not supported by the HPE CSI Driver.
 
 Releases will track the upstream versioning of the HPE CSI Driver for Kubernetes and potential bugfixes in the TrueNAS CSP will be pushed to the same image tag matching the HPE CSI Driver version.
 
+* [TrueNAS CSP v2.2.0](https://github.com/hpe-storage/truenas-csp/releases/tag/v2.2.0) for HPE CSI Driver v2.2.0
 * [TrueNAS CSP v2.1.1](https://github.com/hpe-storage/truenas-csp/releases/tag/v2.1.1) for HPE CSI Driver v2.1.1
 * [TrueNAS CSP v2.1.0](https://github.com/hpe-storage/truenas-csp/releases/tag/v2.1.0) for HPE CSI Driver v2.1.0
 * [TrueNAS CORE CSP v2.0.0](https://github.com/hpe-storage/truenas-csp/releases/tag/v2.0.0) for HPE CSI Driver v2.0.0

docs/index.yaml

@@ -1,6 +1,39 @@
 apiVersion: v1
 entries:
   truenas-csp:
+  - annotations:
+      artifacthub.io/license: MIT
+      artifacthub.io/links: |
+        - name: HPE CSI Driver for Kubernetes
+          url: https://scod.hpedev.io
+        - name: Install
+          url: https://github.com/hpe-storage/truenas-csp/blob/master/INSTALL.md
+      artifacthub.io/prerelease: "false"
+    apiVersion: v2
+    appVersion: 2.2.0
+    created: "2022-09-19T15:42:52.410633239-07:00"
+    dependencies:
+    - name: hpe-csi-driver
+      repository: https://hpe-storage.github.io/co-deployments
+      version: 2.2.0
+    description: TrueNAS Container Storage Provider Helm chart for Kubernetes
+    digest: 529ae150e6bee241be7a06f653a6c777e311e18cb3011bf141750cf70aae9122
+    home: https://github.com/hpe-storage/truenas-csp
+    icon: https://hpe-storage.github.io/truenas-csp/assets/icon.svg
+    keywords:
+    - HPE
+    - Storage
+    - CSI
+    maintainers:
+    - email: [email protected]
+      name: Michael Mattsson
+    name: truenas-csp
+    sources:
+    - https://github.com/hpe-storage/truenas-csp
+    type: application
+    urls:
+    - truenas-csp-1.1.2.tgz
+    version: 1.1.2
   - annotations:
       artifacthub.io/license: MIT
       artifacthub.io/links: |
@@ -100,4 +133,4 @@ entries:
     urls:
     - truenas-csp-1.0.0.tgz
     version: 1.0.0
-generated: "2022-04-15T09:44:41.573954505-07:00"
+generated: "2022-09-19T15:42:52.409205899-07:00"

e2e/Makefile

@@ -1,4 +1,6 @@
 E2E=./e2e.test
+TEST_PREFIX=External.Storage.\[Driver:.csi.hpe.com\].*
+FOCUS=
 
 ifndef KUBECONFIG
  $(error KUBECONFIG is not set)
@@ -13,24 +15,24 @@ ifeq ("$(wildcard $(E2E))","")
 endif
 
 all: rwo rwx
-rwo: mkreports
-	$(E2E) -ginkgo.v \
-             -ginkgo.focus='External.Storage' \
-	     -ginkgo.skip='\[Feature:|\[Disruptive\]|\[Serial\]' \
-             -storage.testdriver=test-driver-rwo.yaml \
-             --non-blocking-taints=node-role.kubernetes.io/controlplane,node-role.kubernetes.io/etcd,node-role.kubernetes.io/master \
-	     -report-dir reports
-
-rwx: mkreports
-	$(E2E) -ginkgo.v \
-             -ginkgo.focus='External.Storage' \
-	     -ginkgo.skip='\[Feature:|\[Disruptive\]|\[Serial\]' \
-             -storage.testdriver=test-driver-rwx.yaml \
-             --non-blocking-taints=node-role.kubernetes.io/controlplane,node-role.kubernetes.io/etcd,node-role.kubernetes.io/master \
-	     -report-dir reports
-
-mkreports: 
-	mkdir -p reports
-
+rwo:
+	mkdir -p reports-rw0
+	$(E2E) --ginkgo.v \
+               --ginkgo.focus='$(TEST_PREFIX)$(FOCUS)' \
+	       --ginkgo.skip='\[Feature:|\[Disruptive\]|\[Serial\]' \
+               --non-blocking-taints=node-role.kubernetes.io/control-plane,node-role.kubernetes.io/etcd,node-role.kubernetes.io/master \
+               --ginkgo.timeout=8h \
+               -storage.testdriver=test-driver-rwo.yaml \
+	       -report-dir=reports-rwo
+rwx:
+	mkdir -p reports-rwx
+	$(E2E) --ginkgo.v \
+               --ginkgo.focus='$(TEST_PREFIX)$(FOCUS)' \
+	       --ginkgo.skip='\[Feature:|\[Disruptive\]|\[Serial\]' \
+	       --ginkgo.skip='.phemeral' \
+               --non-blocking-taints=node-role.kubernetes.io/control-plane,node-role.kubernetes.io/etcd,node-role.kubernetes.io/master \
+               --ginkgo.timeout=8h \
+               -storage.testdriver=test-driver-rwx.yaml \
+	       -report-dir=reports-rwx
 clean:
-	rm -rf e2e.test ginkgo reports
+	rm -rf e2e.test ginkgo reports-rwo reports-rwx

helm/charts/Makefile

@@ -2,6 +2,7 @@ CHART_TARGET:=../../docs
 
 all: truenas-csp
 truenas-csp:
+	helm dependency update $@
 	helm dependency build $@
 	helm lint $@
 	helm package $@ -d .

helm/charts/truenas-csp/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: hpe-csi-driver
   repository: https://hpe-storage.github.io/co-deployments
-  version: 2.1.1-0
-digest: sha256:6ac5420c5e730341cf06bdcb18890be96dbdd7d05e5dc0c47b14b44e777037e1
-generated: "2022-04-15T08:45:39.807598672-07:00"
+  version: 2.2.0
+digest: sha256:3a0b91d7bf756b55077e024e75f1eb881cff0bc232bc4aaaae28a0d9688eead7
+generated: "2022-09-19T15:42:51.707669049-07:00"

helm/charts/truenas-csp/Chart.yaml

@@ -12,8 +12,8 @@ annotations:
     - name: Install
       url: https://github.com/hpe-storage/truenas-csp/blob/master/INSTALL.md
   artifacthub.io/prerelease: "false"
-version: "1.1.1"
-appVersion: "2.1.1"
+version: "1.1.2"
+appVersion: "2.2.0"
 maintainers:
   - name: Michael Mattsson
     email: [email protected]
@@ -22,7 +22,7 @@ sources:
 home: https://github.com/hpe-storage/truenas-csp
 dependencies:
   - name: hpe-csi-driver
-    version: 2.1.1-0
+    version: 2.2.0
     repository: "https://hpe-storage.github.io/co-deployments"
 keywords:
   - HPE

helm/charts/truenas-csp/values.yaml

@@ -8,7 +8,7 @@ image:
   repository: quay.io/datamattsson/truenas-csp
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "v2.1.1"
+  tag: "v2.2.0"
 
 imagePullSecrets: []
 nameOverride: ""