Skip to content

Commit 2886d0b

Browse files
authored
Merge pull request #748 from openebs/create-pull-request/patch-release/2.11
Prepare release/2.11 branch
2 parents a4f64fe + 4552719 commit 2886d0b

4 files changed

Lines changed: 25 additions & 30 deletions

File tree

deploy/helm/charts/Chart.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v2
22
name: zfs-localpv
33
description: Helm chart for CSI Driver for dynamic provisioning of ZFS Persistent Local Volumes. For instructions on how to use this helm chart, see - https://openebs.github.io/zfs-localpv/
4-
version: 2.11.0-develop
5-
appVersion: 2.11.0-develop
4+
version: 2.11.0-prerelease
5+
appVersion: 2.11.0-prerelease
66
icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/openebs/icon/color/openebs-icon-color.png
77
home: https://openebs.io/
88
keywords:
@@ -16,5 +16,5 @@ sources:
1616
- https://github.com/openebs/zfs-localpv
1717
dependencies:
1818
- name: crds
19-
version: 2.11.0-develop
19+
version: 2.11.0-prerelease
2020
condition: crds.enabled
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
apiVersion: v2
22
name: crds
3-
version: 2.11.0-develop
3+
version: 2.11.0-prerelease
44
description: A Helm chart that collects CustomResourceDefinitions (CRDs) from zfs-localpv.

deploy/helm/charts/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ zfsPlugin:
165165
repository: openebs/zfs-driver
166166
pullPolicy: IfNotPresent
167167
# Overrides the image tag whose default is the chart appVersion.
168-
tag: 2.11.0-develop
168+
tag: 2.11.0-prerelease
169169
role: openebs-zfs
170170

171171
serviceAccount:

deploy/zfs-operator.yaml

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ metadata:
1616
value: 900001000
1717
globalDefault: false
1818
description: "This priority class should be used for the CStor CSI driver node deployment only."
19-
2019
---
2120
# Source: zfs-localpv/templates/rbac.yaml
2221
kind: ServiceAccount
@@ -25,7 +24,7 @@ metadata:
2524
name: openebs-zfs-controller-sa
2625
namespace: kube-system
2726
labels:
28-
openebs.io/version: "2.11.0-develop"
27+
openebs.io/version: "2.11.0-prerelease"
2928
role: "openebs-zfs"
3029
app: "openebs-zfs-controller"
3130
component: "openebs-zfs-controller"
@@ -38,7 +37,7 @@ metadata:
3837
name: openebs-zfs-node-sa
3938
namespace: kube-system
4039
labels:
41-
openebs.io/version: "2.11.0-develop"
40+
openebs.io/version: "2.11.0-prerelease"
4241
role: "openebs-zfs"
4342
name: "openebs-zfs-node"
4443
app: "openebs-zfs-node"
@@ -51,7 +50,7 @@ metadata:
5150
name: openebs-zfspv-bin
5251
namespace: kube-system # should be the same namespace where it is getting mounted
5352
labels:
54-
openebs.io/version: "2.11.0-develop"
53+
openebs.io/version: "2.11.0-prerelease"
5554
role: "openebs-zfs"
5655
name: "openebs-zfs-node"
5756
app: "openebs-zfs-node"
@@ -66,7 +65,6 @@ data:
6665
else
6766
chroot /host "zfs" "$@"
6867
fi
69-
7068
---
7169
# Source: zfs-localpv/charts/crds/templates/csi-volume-snapshot-class.yaml
7270
apiVersion: apiextensions.k8s.io/v1
@@ -2490,7 +2488,7 @@ apiVersion: rbac.authorization.k8s.io/v1
24902488
metadata:
24912489
name: openebs-zfs-provisioner-role
24922490
labels:
2493-
openebs.io/version: "2.11.0-develop"
2491+
openebs.io/version: "2.11.0-prerelease"
24942492
role: "openebs-zfs"
24952493
app: "openebs-zfs-controller"
24962494
component: "openebs-zfs-controller"
@@ -2542,7 +2540,7 @@ apiVersion: rbac.authorization.k8s.io/v1
25422540
metadata:
25432541
name: openebs-zfs-snapshotter-role
25442542
labels:
2545-
openebs.io/version: "2.11.0-develop"
2543+
openebs.io/version: "2.11.0-prerelease"
25462544
role: "openebs-zfs"
25472545
app: "openebs-zfs-controller"
25482546
component: "openebs-zfs-controller"
@@ -2588,7 +2586,7 @@ apiVersion: rbac.authorization.k8s.io/v1
25882586
metadata:
25892587
name: openebs-zfs-driver-registrar-role
25902588
labels:
2591-
openebs.io/version: "2.11.0-develop"
2589+
openebs.io/version: "2.11.0-prerelease"
25922590
role: "openebs-zfs"
25932591
name: "openebs-zfs-node"
25942592
app: "openebs-zfs-node"
@@ -2610,7 +2608,7 @@ apiVersion: rbac.authorization.k8s.io/v1
26102608
metadata:
26112609
name: openebs-zfs-provisioner-binding
26122610
labels:
2613-
openebs.io/version: "2.11.0-develop"
2611+
openebs.io/version: "2.11.0-prerelease"
26142612
role: "openebs-zfs"
26152613
app: "openebs-zfs-controller"
26162614
component: "openebs-zfs-controller"
@@ -2630,7 +2628,7 @@ apiVersion: rbac.authorization.k8s.io/v1
26302628
metadata:
26312629
name: openebs-zfs-snapshotter-binding
26322630
labels:
2633-
openebs.io/version: "2.11.0-develop"
2631+
openebs.io/version: "2.11.0-prerelease"
26342632
role: "openebs-zfs"
26352633
app: "openebs-zfs-controller"
26362634
component: "openebs-zfs-controller"
@@ -2650,7 +2648,7 @@ apiVersion: rbac.authorization.k8s.io/v1
26502648
metadata:
26512649
name: openebs-zfs-driver-registrar-binding
26522650
labels:
2653-
openebs.io/version: "2.11.0-develop"
2651+
openebs.io/version: "2.11.0-prerelease"
26542652
role: "openebs-zfs"
26552653
name: "openebs-zfs-node"
26562654
app: "openebs-zfs-node"
@@ -2663,7 +2661,6 @@ roleRef:
26632661
kind: ClusterRole
26642662
name: openebs-zfs-driver-registrar-role
26652663
apiGroup: rbac.authorization.k8s.io
2666-
26672664
---
26682665
# Source: zfs-localpv/templates/zfs-node.yaml
26692666
kind: DaemonSet
@@ -2672,7 +2669,7 @@ metadata:
26722669
name: openebs-zfs-localpv-node
26732670
namespace: kube-system
26742671
labels:
2675-
openebs.io/version: "2.11.0-develop"
2672+
openebs.io/version: "2.11.0-prerelease"
26762673
role: "openebs-zfs"
26772674
name: "openebs-zfs-node"
26782675
app: "openebs-zfs-node"
@@ -2688,7 +2685,7 @@ spec:
26882685
template:
26892686
metadata:
26902687
labels:
2691-
openebs.io/version: "2.11.0-develop"
2688+
openebs.io/version: "2.11.0-prerelease"
26922689
role: "openebs-zfs"
26932690
name: "openebs-zfs-node"
26942691
app: "openebs-zfs-node"
@@ -2701,7 +2698,7 @@ spec:
27012698
hostNetwork: true
27022699
containers:
27032700
- name: csi-node-driver-registrar
2704-
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0
2701+
image: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0"
27052702
imagePullPolicy: IfNotPresent
27062703
args:
27072704
- "--v=5"
@@ -2733,7 +2730,7 @@ spec:
27332730
securityContext:
27342731
privileged: true
27352732
allowPrivilegeEscalation: true
2736-
image: docker.io/openebs/zfs-driver:2.11.0-develop
2733+
image: "docker.io/openebs/zfs-driver:2.11.0-prerelease"
27372734
imagePullPolicy: IfNotPresent
27382735
args:
27392736
- "--nodename=$(OPENEBS_NODE_NAME)"
@@ -2804,7 +2801,6 @@ spec:
28042801
hostPath:
28052802
path: "/var/lib/kubelet/"
28062803
type: Directory
2807-
28082804
---
28092805
# Source: zfs-localpv/templates/zfs-controller.yaml
28102806
apiVersion: apps/v1
@@ -2813,7 +2809,7 @@ metadata:
28132809
name: openebs-zfs-localpv-controller
28142810
namespace: kube-system
28152811
labels:
2816-
openebs.io/version: "2.11.0-develop"
2812+
openebs.io/version: "2.11.0-prerelease"
28172813
role: "openebs-zfs"
28182814
app: "openebs-zfs-controller"
28192815
component: "openebs-zfs-controller"
@@ -2827,7 +2823,7 @@ spec:
28272823
template:
28282824
metadata:
28292825
labels:
2830-
openebs.io/version: "2.11.0-develop"
2826+
openebs.io/version: "2.11.0-prerelease"
28312827
role: "openebs-zfs"
28322828
app: "openebs-zfs-controller"
28332829
component: "openebs-zfs-controller"
@@ -2841,7 +2837,7 @@ spec:
28412837
serviceAccountName: openebs-zfs-controller-sa
28422838
containers:
28432839
- name: csi-resizer
2844-
image: registry.k8s.io/sig-storage/csi-resizer:v1.13.2
2840+
image: "registry.k8s.io/sig-storage/csi-resizer:v1.13.2"
28452841
args:
28462842
- "--v=5"
28472843
- "--csi-address=$(ADDRESS)"
@@ -2855,7 +2851,7 @@ spec:
28552851
resources:
28562852
{}
28572853
- name: csi-snapshotter
2858-
image: registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0
2854+
image: "registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0"
28592855
imagePullPolicy: IfNotPresent
28602856
args:
28612857
- "--csi-address=$(ADDRESS)"
@@ -2868,14 +2864,14 @@ spec:
28682864
resources:
28692865
{}
28702866
- name: snapshot-controller
2871-
image: registry.k8s.io/sig-storage/snapshot-controller:v8.2.0
2867+
image: "registry.k8s.io/sig-storage/snapshot-controller:v8.2.0"
28722868
args:
28732869
- "--v=5"
28742870
imagePullPolicy: IfNotPresent
28752871
resources:
28762872
{}
28772873
- name: csi-provisioner
2878-
image: registry.k8s.io/sig-storage/csi-provisioner:v5.2.0
2874+
image: "registry.k8s.io/sig-storage/csi-provisioner:v5.2.0"
28792875
imagePullPolicy: IfNotPresent
28802876
args:
28812877
- "--csi-address=$(ADDRESS)"
@@ -2902,7 +2898,7 @@ spec:
29022898
resources:
29032899
{}
29042900
- name: openebs-zfs-plugin
2905-
image: docker.io/openebs/zfs-driver:2.11.0-develop
2901+
image: "docker.io/openebs/zfs-driver:2.11.0-prerelease"
29062902
imagePullPolicy: IfNotPresent
29072903
env:
29082904
- name: OPENEBS_CONTROLLER_DRIVER
@@ -2930,7 +2926,6 @@ spec:
29302926
volumes:
29312927
- name: socket-dir
29322928
emptyDir: {}
2933-
29342929
---
29352930
# Source: zfs-localpv/templates/csidriver.yaml
29362931
# Create the CSI Driver object

0 commit comments

Comments
 (0)