Merge pull request #204 from pure-jliao/nstk-303-ga

[NEWSTACK-303] PSO v6.2.2 release
purestorage · Feb 1, 2022 · 9018a57 · 9018a57
2 parents c47541c + 29ccc86
commit 9018a57
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 48 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## v6.2.2 (02/01/2022)
+
+#### Bug fixes and enhancements:
+
+* Bug fix for using FlashArray NVMeoF-RDMA when other local NVMe controllers exist on hosts
+* Bug fix for FlashArray with both NVMeoF-FC and NVMeoF-RDMA configured
+
 ## v6.2.2-rc1 (01/28/2022)
 
 #### Bug fixes and enhancements:

diff --git a/docs/index.yaml b/docs/index.yaml
@@ -1,9 +1,24 @@
 apiVersion: v1
 entries:
   pure-pso:
+  - apiVersion: v1
+    appVersion: 6.2.2
+    created: "2022-02-01T12:26:57.71943-08:00"
+    description: A Helm chart for Pure Service Orchestrator CSI driver
+    digest: 8fee617dd3d5b3a9b44d0dbd0a72d2e6f4ad38f3ed27f6851baeeb7232d07b43
+    icon: https://raw.githubusercontent.com/purestorage/pso-csi/master/pure-pso/pure-storage.png
+    keywords:
+    - purestorage
+    maintainers:
+    - email: [email protected]
+      name: Pure Storage, Inc.
+    name: pure-pso
+    urls:
+    - https://purestorage.github.io/pso-csi/pure-pso-6.2.2.tgz
+    version: 6.2.2
   - apiVersion: v1
     appVersion: 6.2.2-rc1
-    created: "2022-01-28T18:03:50.921372-08:00"
+    created: "2022-02-01T12:26:57.717476-08:00"
     description: A Helm chart for Pure Service Orchestrator CSI driver
     digest: 48a5b386726eed42da319232bd2c61b5c9d20ee68124c909c3094a72d6fae800
     icon: https://raw.githubusercontent.com/purestorage/pso-csi/master/pure-pso/pure-storage.png
@@ -18,7 +33,7 @@ entries:
     version: 6.2.2-rc1
   - apiVersion: v1
     appVersion: 6.2.1
-    created: "2022-01-28T18:03:50.918776-08:00"
+    created: "2022-02-01T12:26:57.714132-08:00"
     description: A Helm chart for Pure Service Orchestrator CSI driver
     digest: fa5230d58147456d827af258e34bf472e0248616e12545b461b34a670be66522
     icon: https://raw.githubusercontent.com/purestorage/pso-csi/master/pure-pso/pure-storage.png
@@ -33,7 +48,7 @@ entries:
     version: 6.2.1
   - apiVersion: v1
     appVersion: 6.2.0
-    created: "2022-01-28T18:03:50.915678-08:00"
+    created: "2022-02-01T12:26:57.711223-08:00"
     description: A Helm chart for Pure Service Orchestrator CSI driver
     digest: a9c96e6e173db49bc4c5f05e5a30a047eca39a1012ccd935d7cb53327f0da3d4
     icon: https://raw.githubusercontent.com/purestorage/pso-csi/master/pure-pso/pure-storage.png
@@ -48,7 +63,7 @@ entries:
     version: 6.2.0
   - apiVersion: v1
     appVersion: 6.2.0-rc1
-    created: "2022-01-28T18:03:50.912946-08:00"
+    created: "2022-02-01T12:26:57.70791-08:00"
     description: A Helm chart for Pure Service Orchestrator CSI driver
     digest: f29fe09901dc6ed223ff4d0e587cae6f7b99940b3ddb9ed2f2e33b3651e27633
     icon: https://raw.githubusercontent.com/purestorage/pso-csi/master/pure-pso/pure-storage.png
@@ -63,7 +78,7 @@ entries:
     version: 6.2.0-rc1
   - apiVersion: v1
     appVersion: 6.1.1
-    created: "2022-01-28T18:03:50.910377-08:00"
+    created: "2022-02-01T12:26:57.704425-08:00"
     description: A Helm chart for Pure Service Orchestrator CSI driver
     digest: fc7be6616131f8df54064095c5660fda06295fb5fbe4239843019afe23e5ead2
     icon: https://raw.githubusercontent.com/purestorage/pso-csi/master/pure-pso/pure-storage.png
@@ -78,7 +93,7 @@ entries:
     version: 6.1.1
   - apiVersion: v1
     appVersion: 6.1.0
-    created: "2022-01-28T18:03:50.907795-08:00"
+    created: "2022-02-01T12:26:57.70176-08:00"
     description: A Helm chart for Pure Service Orchestrator CSI driver
     digest: fabb4b4afcffc7866492246806d70a6d86ce0b0ab815591f937f2325c14714a4
     icon: https://raw.githubusercontent.com/purestorage/pso-csi/master/pure-pso/pure-storage.png
@@ -93,7 +108,7 @@ entries:
     version: 6.1.0
   - apiVersion: v1
     appVersion: 6.0.5
-    created: "2022-01-28T18:03:50.904283-08:00"
+    created: "2022-02-01T12:26:57.699112-08:00"
     description: A Helm chart for Pure Service Orchestrator CSI driver
     digest: 804f5467ba2f64679f38019609d820261b7c86fcd104eec66a388fbd55c98e41
     icon: https://raw.githubusercontent.com/purestorage/pso-csi/master/pure-pso/pure-storage.png
@@ -108,7 +123,7 @@ entries:
     version: 6.0.5
   - apiVersion: v1
     appVersion: 6.0.4
-    created: "2022-01-28T18:03:50.901548-08:00"
+    created: "2022-02-01T12:26:57.695855-08:00"
     description: A Helm chart for Pure Service Orchestrator CSI driver
     digest: 8a5fc98b6227b76b6a001df42f2530483a76876c1d207724837c28a92ab5c7d6
     icon: https://raw.githubusercontent.com/purestorage/pso-csi/master/pure-pso/pure-storage.png
@@ -123,7 +138,7 @@ entries:
     version: 6.0.4
   - apiVersion: v1
     appVersion: 6.0.3
-    created: "2022-01-28T18:03:50.898545-08:00"
+    created: "2022-02-01T12:26:57.691076-08:00"
     description: A Helm chart for Pure Service Orchestrator CSI driver
     digest: 08687d6b18864ea67681e233c4e02ac779d14b484f792199d869a15838ed9ec5
     icon: https://raw.githubusercontent.com/purestorage/pso-csi/master/pure-pso/pure-storage.png
@@ -138,7 +153,7 @@ entries:
     version: 6.0.3
   - apiVersion: v1
     appVersion: 6.0.2
-    created: "2022-01-28T18:03:50.895744-08:00"
+    created: "2022-02-01T12:26:57.688351-08:00"
     description: A Helm chart for Pure Service Orchestrator CSI driver
     digest: da1a907ea323f5a789f1249be34d479f88190e8d4319cc77d5e4a10ca3c88e5f
     icon: https://raw.githubusercontent.com/purestorage/pso-csi/master/pure-pso/pure-storage.png
@@ -153,7 +168,7 @@ entries:
     version: 6.0.2
   - apiVersion: v1
     appVersion: 6.0.1
-    created: "2022-01-28T18:03:50.891781-08:00"
+    created: "2022-02-01T12:26:57.684606-08:00"
     description: A Helm chart for Pure Service Orchestrator CSI driver
     digest: 19a3e9ab423c7cee09559ec6f2002d0b722d59e49333a4412d22b4163baad5df
     icon: https://raw.githubusercontent.com/purestorage/pso-csi/master/pure-pso/pure-storage.png
@@ -169,7 +184,7 @@ entries:
   pureStorageDriver:
   - apiVersion: v1
     appVersion: 6.0.0
-    created: "2022-01-28T18:03:50.945332-08:00"
+    created: "2022-02-01T12:26:57.743344-08:00"
     description: A Helm chart for Pure Service Orchestrator CSI driver
     digest: 698a4743068697d6d73b85a0a027fec48f8f05a4ccc795b0f2f27c929a37902c
     icon: https://raw.githubusercontent.com/purestorage/pso-csi/master/pureStorageDriver/pure-storage.png
@@ -184,7 +199,7 @@ entries:
     version: 6.0.0
   - apiVersion: v1
     appVersion: 6.0.0-rc8
-    created: "2022-01-28T18:03:50.942745-08:00"
+    created: "2022-02-01T12:26:57.740843-08:00"
     description: A Helm chart for Pure Service Orchestrator CSI driver
     digest: 22590a3eb6510c22c550ff104eba06d687cca784aa9afd6c16204c56a99fc7e7
     icon: https://raw.githubusercontent.com/purestorage/pso-csi/master/pureStorageDriver/pure-storage.png
@@ -199,7 +214,7 @@ entries:
     version: 6.0.0-rc8
   - apiVersion: v1
     appVersion: 6.0.0-rc7
-    created: "2022-01-28T18:03:50.940372-08:00"
+    created: "2022-02-01T12:26:57.738387-08:00"
     description: A Helm chart for Pure Service Orchestrator CSI driver
     digest: a1bf7a582d0fdaf712246bae4d64ea10b6006b63df40eac1e91691422f1125c4
     icon: https://raw.githubusercontent.com/purestorage/pso-csi/master/pureStorageDriver/pure-storage.png
@@ -214,7 +229,7 @@ entries:
     version: 6.0.0-rc7
   - apiVersion: v1
     appVersion: 6.0.0-rc6
-    created: "2022-01-28T18:03:50.937286-08:00"
+    created: "2022-02-01T12:26:57.735859-08:00"
     description: A Helm chart for Pure Service Orchestrator CSI driver
     digest: 42c2a0e429fdaa65f24a9eb0ea0993137352f43b5a74ed8584985308251caa9a
     icon: https://raw.githubusercontent.com/purestorage/pso-csi/master/pureStorageDriver/pure-storage.png
@@ -229,7 +244,7 @@ entries:
     version: 6.0.0-rc6
   - apiVersion: v1
     appVersion: 6.0.0-rc5
-    created: "2022-01-28T18:03:50.93462-08:00"
+    created: "2022-02-01T12:26:57.733527-08:00"
     description: A Helm chart for Pure Service Orchestrator CSI driver
     digest: 45e05016171f57b8d67d2b299d0a9c088bb496f1ee67d0d5fed72c9f132f04c3
     icon: https://raw.githubusercontent.com/purestorage/pso-csi/master/pureStorageDriver/pure-storage.png
@@ -244,7 +259,7 @@ entries:
     version: 6.0.0-rc5
   - apiVersion: v1
     appVersion: 6.0.0-rc4
-    created: "2022-01-28T18:03:50.932231-08:00"
+    created: "2022-02-01T12:26:57.731235-08:00"
     description: A Helm chart for Pure Service Orchestrator CSI driver
     digest: 3c35282f9fa2f4248680823b171237c0ce090861399133cdb33c4e39b1b1599f
     icon: https://raw.githubusercontent.com/purestorage/pso-csi/master/pureStorageDriver/pure-storage.png
@@ -259,7 +274,7 @@ entries:
     version: 6.0.0-rc4
   - apiVersion: v1
     appVersion: 6.0.0-rc3
-    created: "2022-01-28T18:03:50.929721-08:00"
+    created: "2022-02-01T12:26:57.72799-08:00"
     description: A Helm chart for Pure Service Orchestrator CSI driver
     digest: 747ee465faba14b4e7e75b2cc5760966181db95002a8f404d1ef09f19d2c4005
     icon: https://raw.githubusercontent.com/purestorage/pso-csi/master/pureStorageDriver/pure-storage.png
@@ -274,7 +289,7 @@ entries:
     version: 6.0.0-rc3
   - apiVersion: v1
     appVersion: 6.0.0-rc2
-    created: "2022-01-28T18:03:50.927042-08:00"
+    created: "2022-02-01T12:26:57.725388-08:00"
     description: A Helm chart for Pure Service Orchestrator CSI driver
     digest: afc28d4b4ca9f3d4757dbaf682e3aa62adfe120918fa163e496cab8559b81d97
     icon: https://raw.githubusercontent.com/purestorage/pso-csi/master/pureStorageDriver/pure-storage.png
@@ -289,7 +304,7 @@ entries:
     version: 6.0.0-rc2
   - apiVersion: v1
     appVersion: 6.0.0-rc1
-    created: "2022-01-28T18:03:50.924163-08:00"
+    created: "2022-02-01T12:26:57.72272-08:00"
     description: A Helm chart for Pure Service Orchestrator CSI driver
     digest: ce49de6b4a03c35c9838eda5a255f6177f8027574b7be90f20e74eda25b3e8db
     icon: https://raw.githubusercontent.com/purestorage/pso-csi/master/pureStorageDriver/pure-storage.png
@@ -302,4 +317,4 @@ entries:
     urls:
     - https://purestorage.github.io/pso-csi/pureStorageDriver-6.0.0-rc1.tgz
     version: 6.0.0-rc1
-generated: "2022-01-28T18:03:50.886338-08:00"
+generated: "2022-02-01T12:26:57.677004-08:00"
diff --git a/docs/pure-pso-6.2.2.tgz b/docs/pure-pso-6.2.2.tgz
diff --git a/mirror_pso_containers.sh b/mirror_pso_containers.sh
@@ -15,10 +15,10 @@ quay.io/k8scsi/csi-attacher:v2.2.0
 quay.io/k8scsi/csi-resizer:v0.5.0
 quay.io/k8scsi/livenessprobe:v2.0.0
 quay.io/k8scsi/csi-node-driver-registrar:v1.3.0
-purestorage/cockroach-operator:v1.2.2-rc1
-purestorage/dbdeployer:v1.2.2-rc1
-purestorage/psctl:v1.1.1-rc1
-purestorage/k8s:v6.2.2-rc1
+purestorage/cockroach-operator:v1.2.2
+purestorage/dbdeployer:v1.2.2
+purestorage/psctl:v1.1.1
+purestorage/k8s:v6.2.2
 cockroachdb/cockroach:v20.2.6
 )
 

diff --git a/pure-pso/Chart.yaml b/pure-pso/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 description: A Helm chart for Pure Service Orchestrator CSI driver
 name: pure-pso
-version: 6.2.2-rc1
-appVersion: 6.2.2-rc1
+version: 6.2.2
+appVersion: 6.2.2
 icon: https://raw.githubusercontent.com/purestorage/pso-csi/master/pure-pso/pure-storage.png
 keywords:
 - purestorage

diff --git a/pure-pso/README.md b/pure-pso/README.md
@@ -219,7 +219,7 @@ The following table lists the configurable parameters and their default values.
 | `database.resources`                           | [Resources](https://kubernetes.io/docs/tasks/configure-pod-container/)                                                                                     | `{}`                                          |
 | `DBTopology.enforce`                           | Enforce DB topology, more details [here](../docs/db-topology.md)                                                                                           | `false`                                       |
 | `images.plugin.name`                           | The image name to pull from                                                                                                                                | `purestorage/k8s`                             |
-| `images.plugin.tag`                            | The image tag to pull                                                                                                                                      | `v6.2.2-rc1`                                  |
+| `images.plugin.tag`                            | The image tag to pull                                                                                                                                      | `v6.2.2`                                      |
 | `images.plugin.pullPolicy`                     | Image pull policy                                                                                                                                          | `Always`                                      |
 | `images.csi.provisioner.name`                  | The image name of the csi-provisioner                                                                                                                      | `quay.io/k8scsi/csi-provisioner`              |
 | `images.csi.provisioner.pullPolicy`            | Image pull policy                                                                                                                                          | `Always`                                      |
@@ -235,12 +235,12 @@ The following table lists the configurable parameters and their default values.
 | `images.csi.livenessProbe.pullPolicy`          | Image pull policy                                                                                                                                          | `Always`                                      |
 | `images.database.cockroachOperator.name`       | The image name of the cockroach operator                                                                                                                   | `purestorage/cockroach-operator`              |
 | `images.database.cockroachOperator.pullPolicy` | Image pull policy                                                                                                                                          | `Always`                                      |
-| `images.database.cockroachOperator.tag`        | The image tag to pull                                                                                                                                      | `v1.2.2-rc1`                                  |
+| `images.database.cockroachOperator.tag`        | The image tag to pull                                                                                                                                      | `v1.2.2`                                      |
 | `images.database.deployer.name`                | The image name of the cockroach db deployer                                                                                                                | `purestorage/dbdeployer`                      |
 | `images.database.deployer.pullPolicy`          | Image pull policy                                                                                                                                          | `Always`                                      |
-| `images.database.deployer.tag`                 | The image tag to pull                                                                                                                                      | `v1.2.2-rc1`                                  |
+| `images.database.deployer.tag`                 | The image tag to pull                                                                                                                                      | `v1.2.2`                                      |
 | `images.database.psctl.name`                   | The image name of PSCTL                                                                                                                                    | `purestorage/psctl`                           |
-| `images.database.psctl.tag`                    | The image tag to pull                                                                                                                                      | `v1.1.1-rc1`                                  |
+| `images.database.psctl.tag`                    | The image tag to pull                                                                                                                                      | `v1.1.1`                                      |
 | `images.database.cockroachdb.name`             | The image name of cockroachdb                                                                                                                              | `cockroachdb/cockroach`                       |
 | `images.database.cockroachdb.tag`              | The image tag to pull                                                                                                                                      | `v20.2.6`                                     |
 
@@ -271,19 +271,19 @@ Strict attention must be paid to the versions of image you provide locally as PS
 
 **Required images:**
 
-| Image                                    | Tag         |
-|------------------------------------------|-------------|
-| quay.io/k8scsi/csi-provisioner           | v1.6.0      |
-| quay.io/k8scsi/csi-snapshotter           | v2.1.1      |
-| quay.io/k8scsi/csi-attacher              | v2.2.0      |
-| quay.io/k8scsi/csi-resizer               | v0.5.0      |
-| quay.io/k8scsi/livenessprobe             | v2.0.0      |
-| quay.io/k8scsi/csi-node-driver-registrar | v1.3.0      |
-| purestorage/cockroach-operator           | v1.2.2-rc1  |
-| purestorage/dbdeployer                   | v1.2.2-rc1  |
-| purestorage/psctl                        | v1.1.1-rc1  |
-| purestorage/k8s                          | v6.2.2-rc1  |
-| cockroachdb/cockroach                    | v20.2.6     |
+| Image                                    | Tag     |
+|------------------------------------------|---------|
+| quay.io/k8scsi/csi-provisioner           | v1.6.0  |
+| quay.io/k8scsi/csi-snapshotter           | v2.1.1  |
+| quay.io/k8scsi/csi-attacher              | v2.2.0  |
+| quay.io/k8scsi/csi-resizer               | v0.5.0  |
+| quay.io/k8scsi/livenessprobe             | v2.0.0  |
+| quay.io/k8scsi/csi-node-driver-registrar | v1.3.0  |
+| purestorage/cockroach-operator           | v1.2.2  |
+| purestorage/dbdeployer                   | v1.2.2  |
+| purestorage/psctl                        | v1.1.1  |
+| purestorage/k8s                          | v6.2.2  |
+| cockroachdb/cockroach                    | v20.2.6 |
 
 A [helper script](https://raw.githubusercontent.com/purestorage/pso-csi/master/mirror_pso_containers.sh) has been provided to assist with populating your local registry with the correct images.
 

diff --git a/pure-pso/values.yaml b/pure-pso/values.yaml
@@ -81,7 +81,7 @@ flashblade:
 images:
   plugin:
     name: purestorage/k8s
-    tag: v6.2.2-rc1
+    tag: v6.2.2
     pullPolicy: IfNotPresent
   csi:
     provisioner:
@@ -105,15 +105,15 @@ images:
   database:
     deployer:
       name: purestorage/dbdeployer
-      tag: v1.2.2-rc1
+      tag: v1.2.2
       pullPolicy: IfNotPresent
     cockroachOperator:
       name: purestorage/cockroach-operator
-      tag: v1.2.2-rc1
+      tag: v1.2.2
       pullPolicy: IfNotPresent
     psctl:
       name: purestorage/psctl
-      tag: v1.1.1-rc1
+      tag: v1.1.1
     cockroachdb:
       name: cockroachdb/cockroach
       tag: v20.2.6