Skip to content

Commit

Permalink
Merge pull request #223 from haibinxie/master
Browse files Browse the repository at this point in the history
Release 5.2.0/2.7.0
  • Loading branch information
haibinxie authored Apr 29, 2020
2 parents 3693053 + b333292 commit a97ff94
Show file tree
Hide file tree
Showing 15 changed files with 81 additions and 51 deletions.
104 changes: 67 additions & 37 deletions docs/index.yaml

Large diffs are not rendered by default.

Binary file added docs/pure-csi-1.2.0.tgz
Binary file not shown.
Binary file added docs/pure-k8s-plugin-2.7.0.tgz
Binary file not shown.
2 changes: 1 addition & 1 deletion operator-csi-plugin/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM quay.io/operator-framework/helm-operator:v0.13.0
MAINTAINER Pure Storage, Inc.
LABEL name="pure-csi" vendor="Pure Storage" version="5.1.1" release="1.0" summary="Pure Storage CSI Operator" description="Pure Service Orchestrator CSI Operator"
LABEL name="pure-csi" vendor="Pure Storage" version="5.2.0" release="1.0" summary="Pure Storage CSI Operator" description="Pure Service Orchestrator CSI Operator"
COPY helm-charts/ ${HOME}/helm-charts/
COPY watches.yaml ${HOME}/watches.yaml
COPY licenses /licenses
2 changes: 1 addition & 1 deletion operator-csi-plugin/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:v5.1.1
IMAGE=quay.io/purestorage/pso-operator:v5.2.0
NAMESPACE=pure-csi-operator
KUBECTL=kubectl
ORCHESTRATOR=k8s
Expand Down
2 changes: 1 addition & 1 deletion operator-csi-plugin/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

image:
name: purestorage/k8s
tag: 5.1.1
tag: 5.2.0
pullPolicy: Always

csi:
Expand Down
2 changes: 1 addition & 1 deletion operator-k8s-plugin/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM quay.io/operator-framework/helm-operator:v0.13.0
MAINTAINER Pure Storage, Inc.
LABEL name="pure-flex" vendor="Pure Storage" version="2.6.1" release="1.0" summary="Pure Storage FlexDriver Operator" description="Pure Service Orchestrator FlexDriver Operator"
LABEL name="pure-flex" vendor="Pure Storage" version="2.7.0" release="1.0" summary="Pure Storage FlexDriver Operator" description="Pure Service Orchestrator FlexDriver Operator"
COPY helm-charts/ ${HOME}/helm-charts/
COPY watches.yaml ${HOME}/watches.yaml
COPY licenses /licenses
2 changes: 1 addition & 1 deletion operator-k8s-plugin/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.1.1
IMAGE=quay.io/purestorage/pso-operator:v0.2.0
NAMESPACE=pso-operator
KUBECTL=oc
ORCHESTRATOR=k8s
Expand Down
2 changes: 1 addition & 1 deletion operator-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.6.1
tag: 2.7.0
pullPolicy: Always

# this option is to enable/disable the debug mode of this app
Expand Down
4 changes: 2 additions & 2 deletions pure-csi/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
description: A Helm chart for Pure Service Orchestrator CSI driver
name: pure-csi
version: 1.1.1
appVersion: 1.1.1
version: 1.2.0
appVersion: 1.2.0
icon: https://raw.githubusercontent.com/purestorage/helm-charts/master/pure-csi/pure-storage.png
keywords:
- purestorage
Expand Down
2 changes: 1 addition & 1 deletion pure-csi/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,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 | `5.1.1` |
| `image.tag` | The image tag to pull | `5.2.0` |
| `image.pullPolicy` | Image pull policy | `Always ` |
| `app.debug` | Enable/disable debug mode for app | `false` |
| `storagetopology.enable` | Enable/disable csi topology feature | `false` |
Expand Down
2 changes: 1 addition & 1 deletion pure-csi/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

image:
name: purestorage/k8s
tag: 5.1.1
tag: 5.2.0
pullPolicy: Always

csi:
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.6.1
appVersion: 2.6.1
version: 2.7.0
appVersion: 2.7.0
icon: https://raw.githubusercontent.com/purestorage/helm-charts/master/pure-k8s-plugin/pure-storage.png
keywords:
- purestorage
Expand Down
2 changes: 1 addition & 1 deletion pure-k8s-plugin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,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.6.1` |
| `image.tag` | The image tag to pull | `2.7.0` |
| `image.pullPolicy` | Image pull policy | `Always` |
| `app.debug` | Enable/disable debug mode for app | `false` |
| `storageclass.createBuiltIn`| Control to create the built-in StorageClasses 'pure', 'pure-file' and 'pure-block' | `true` |
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.6.1
tag: 2.7.0
pullPolicy: Always

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

0 comments on commit a97ff94

Please sign in to comment.