Skip to content

Commit

Permalink
2.5.0 Release: Upgrade external storage controller lib and block reta…
Browse files Browse the repository at this point in the history
…in. (purestorage#91)

* 2.5.0 Release: Upgrade external storage controller lib and block retain.

* The role and rolebinding permissions need to include patch for upgrade.
  • Loading branch information
pure-yesmat authored May 6, 2019
1 parent b6c48d8 commit 9c4415f
Show file tree
Hide file tree
Showing 6 changed files with 95 additions and 36 deletions.
41 changes: 28 additions & 13 deletions docs/index.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,24 @@
apiVersion: v1
entries:
pure-k8s-plugin:
- apiVersion: v1
appVersion: 2.5.0
created: 2019-05-03T14:50:52.188432694-07:00
description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/OpenShift
digest: f5cc239df4afef6546660b529cd0ccc37b32677172a7da9954ab49b04be3e296
icon: https://raw.githubusercontent.com/purestorage/helm-charts/master/pure-k8s-plugin/pure-storage.png
keywords:
- purestorage
maintainers:
- email: sales@purestorage.com
name: Pure Storage, Inc.
name: pure-k8s-plugin
urls:
- https://purestorage.github.io/helm-charts/pure-k8s-plugin-2.5.0.tgz
version: 2.5.0
- apiVersion: v1
appVersion: 2.4.1
created: 2019-04-27T21:43:34.06263629-07:00
created: 2019-05-03T14:50:52.180871583-07:00
description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/OpenShift
digest: d9deb32fe38c10946e79a0841a66d14f77af879f9fcec36d24c03d524ffe6cc9
icon: https://raw.githubusercontent.com/purestorage/helm-charts/master/pure-k8s-plugin/pure-storage.png
Expand All @@ -18,7 +33,7 @@ entries:
version: 2.4.1
- apiVersion: v1
appVersion: 2.4.0
created: 2019-04-27T21:43:34.061590578-07:00
created: 2019-05-03T14:50:52.175262218-07:00
description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/OpenShift
digest: b655dc0d0c40ed43ef30c430c3dac12cec3ab4ba85f4622daf4785ccf3b95dc3
icon: https://raw.githubusercontent.com/purestorage/helm-charts/master/pure-k8s-plugin/pure-storage.png
Expand All @@ -33,7 +48,7 @@ entries:
version: 2.4.0
- apiVersion: v1
appVersion: 2.3.0
created: 2019-04-27T21:43:34.059719717-07:00
created: 2019-05-03T14:50:52.168216826-07:00
description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/OpenShift
digest: 09aeb2038d26e03fccefa19793de2213ef498de88b9a73e390220b6a71dd098a
icon: https://github.com/purestorage/helm-charts/tree/master/pure-k8s-plugin/pure-storage.png
Expand All @@ -43,7 +58,7 @@ entries:
version: 2.3.2
- apiVersion: v1
appVersion: 2.3.0
created: 2019-04-27T21:43:34.057923784-07:00
created: 2019-05-03T14:50:52.161895113-07:00
description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/OpenShift
digest: 3b80b7d5da4014178fb71a5a7650d2934a200c1189856fe64a071d5f277ff03e
icon: https://github.com/purestorage/helm-charts/tree/master/pure-k8s-plugin/pure-storage.png
Expand All @@ -52,7 +67,7 @@ entries:
- https://purestorage.github.io/helm-charts/pure-k8s-plugin-2.3.1.tgz
version: 2.3.1
- apiVersion: v1
created: 2019-04-27T21:43:34.056229655-07:00
created: 2019-05-03T14:50:52.154113132-07:00
description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/OpenShift
digest: 30a1498d2c9af4609d05ceb29016b239ee2437a94c94a87eaea604d0c484441e
icon: https://github.com/purestorage/helm-charts/tree/master/pure-k8s-plugin/pure-storage.png
Expand All @@ -61,59 +76,59 @@ entries:
- https://purestorage.github.io/helm-charts/pure-k8s-plugin-2.3.0.tgz
version: 2.3.0
- apiVersion: v1
created: 2019-04-27T21:43:34.054680254-07:00
created: 2019-05-03T14:50:52.14713102-07:00
description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/Openshift
digest: 81673ebfa1a4380f841d6a705b5dd7c2fab300bfae6007983e58393f7407ac9b
name: pure-k8s-plugin
urls:
- https://purestorage.github.io/helm-charts/pure-k8s-plugin-2.2.1.tgz
version: 2.2.1
- apiVersion: v1
created: 2019-04-27T21:43:34.053738351-07:00
created: 2019-05-03T14:50:52.141786051-07:00
description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/Openshift
digest: 23b5296d049f5b2a92b1b2ee9165a0c41178cea88f3bfb6eb560462ae1b5a728
name: pure-k8s-plugin
urls:
- https://purestorage.github.io/helm-charts/pure-k8s-plugin-2.2.0.tgz
version: 2.2.0
- apiVersion: v1
created: 2019-04-27T21:43:34.052703927-07:00
created: 2019-05-03T14:50:52.136563575-07:00
description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/Openshift
digest: 939ae58208c7fbd5794a25ab14a715ecff60c79e98616e0954f7e8c16d0ed7dc
name: pure-k8s-plugin
urls:
- https://purestorage.github.io/helm-charts/pure-k8s-plugin-2.1.2.tgz
version: 2.1.2
- apiVersion: v1
created: 2019-04-27T21:43:34.05174225-07:00
created: 2019-05-03T14:50:52.129283705-07:00
description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/Openshift
digest: cad41a8b5278f57c8d953768d9ad28df461af92183f6404d661e33973017a928
name: pure-k8s-plugin
urls:
- https://purestorage.github.io/helm-charts/pure-k8s-plugin-2.1.1.tgz
version: 2.1.1
- apiVersion: v1
created: 2019-04-27T21:43:34.050799213-07:00
created: 2019-05-03T14:50:52.12241552-07:00
description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/Openshift
digest: bbccdbdb9426e9f801ae743b64ab9393416f9c097d5bf1d461c76484379faddd
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: 2019-04-27T21:43:34.049815411-07:00
created: 2019-05-03T14:50:52.11554949-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: 2019-04-27T21:43:34.048788166-07:00
created: 2019-05-03T14:50:52.106724411-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: 2019-04-27T21:43:34.04743624-07:00
generated: 2019-05-03T14:50:52.093601697-07:00
Binary file added docs/pure-k8s-plugin-2.5.0.tgz
Binary file not shown.
80 changes: 62 additions & 18 deletions operator/install.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
IMAGE=quay.io/purestorage/pso-operator:v0.0.2
IMAGE=quay.io/purestorage/pso-operator:v0.0.3
NAMESPACE=pso-operator
KUBECTL=oc

Expand Down Expand Up @@ -161,54 +161,84 @@ rules:
verbs:
- "create"
- "delete"
# PSO operator needs to create/delete a ClusterRoleBinding with the ClusterRole system:persistent-volume-provisioner for provisioning PVs
# PSO operator needs to create/delete a ClusterRole and ClusterRoleBinding for provisioning PVs
- apiGroups:
- rbac.authorization.k8s.io
resources:
- clusterrolebindings
- clusterroles
verbs:
- "create"
- "delete"
- apiGroups:
- rbac.authorization.k8s.io
resources:
- clusterrolebindings
- clusterroles
resourceNames:
- "pure-provisioner-rights"
- "pure-provisioner-clusterrole"
verbs:
- "get"
# On Openshift ClusterRoleBindings belong to a different apiGroup.
# PSO operator needs to create/delete a ClusterRoleBinding with the ClusterRole system:persistent-volume-provisioner for provisioning PVs
- apiGroups:
- authorization.openshift.io
resources:
- clusterrolebindings
- clusterroles
verbs:
- "create"
- "delete"
# PSO creates the ClusterRoleBinding "pure-provisioner-rights" and should be able to get this by resource name
# PSO creates the "pure-provisioner-clusterrole" and "pure-provisioner-rights" and should be able
# to get this by resource name
- apiGroups:
- authorization.openshift.io
resources:
- clusterrolebindings
- clusterroles
resourceNames:
- "pure-provisioner-rights"
- "pure-provisioner-clusterrole"
verbs:
- "get"
---
# This ClusterRoleBinding is needed to create "pure-provisioner-rights" ClusterRoleBinding with ClusterRole system:persistent-volume-provisioner
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:
name: pso-operator-volume-provisioner
subjects:
- kind: ServiceAccount
name: default
namespace: REPLACE_NAMESPACE
roleRef:
kind: ClusterRole
name: system:persistent-volume-provisioner
apiGroup: rbac.authorization.k8s.io
# Need the same permissions as pure-provisioner-clusterrole to be able to create it
- apiGroups:
- ""
resources:
- persistentvolumes
verbs:
- "create"
- "delete"
- "get"
- "list"
- "watch"
- "update"
- apiGroups:
- ""
resources:
- persistentvolumeclaims
verbs:
- "get"
- "list"
- "update"
- "watch"
- apiGroups:
- storage.k8s.io
resources:
- storageclasses
verbs:
- "get"
- "list"
- "watch"
- apiGroups:
- ""
resources:
- "events"
verbs:
- "create"
- "patch"
- "update"
- "watch"
---
kind: ClusterRoleBinding
Expand Down Expand Up @@ -260,6 +290,20 @@ rules:
- daemonsets
verbs:
- "*"
- apiGroups:
- rbac.authorization.k8s.io
resources:
- roles
- rolebindings
verbs:
- "*"
- apiGroups:
- authorization.openshift.io
resources:
- roles
- rolebindings
verbs:
- "*"
---
Expand Down
4 changes: 2 additions & 2 deletions pure-k8s-plugin/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
description: A Helm chart for Pure Storage persistent storage driver for Kubernetes/OpenShift
name: pure-k8s-plugin
version: 2.4.1
appVersion: 2.4.1
version: 2.5.0
appVersion: 2.5.0
icon: https://raw.githubusercontent.com/purestorage/helm-charts/master/pure-k8s-plugin/pure-storage.png
keywords:
- purestorage
Expand Down
4 changes: 2 additions & 2 deletions pure-k8s-plugin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Version restrictions

Minimum Helm version required is 2.9.1
Minimum version of K8S FlexVol driver required is 2.4.0
Minimum version of K8S FlexVol driver required is 2.5.0

## How to install

Expand All @@ -29,7 +29,7 @@ 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.4.0` |
| `image.tag` | The image tag to pull | `2.5.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` |
Expand Down
2 changes: 1 addition & 1 deletion pure-k8s-plugin/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

image:
name: purestorage/k8s
tag: 2.4.1
tag: 2.5.0
pullPolicy: IfNotPresent

# this option is to enable/disable the debug mode of this app
Expand Down

0 comments on commit 9c4415f

Please sign in to comment.