From 75b9b9fe6de15a261af13faf74abae3bfe65a045 Mon Sep 17 00:00:00 2001 From: Thomas Kooi Date: Tue, 13 Jul 2021 21:21:56 +0200 Subject: [PATCH] cleanup: fix beta apiVersion for csidriver This change resolves a typo for installing the CSIDriver resource in Kubernetes clusters before 1.18, where the apiVersion is incorrect. See also: https://kubernetes-csi.github.io/docs/csi-driver-object.html [ndevos: replace v1betav1 in examples with v1beta1] Signed-off-by: Thomas Kooi --- charts/ceph-csi-cephfs/templates/csidriver-crd.yaml | 2 +- deploy/cephfs/kubernetes/csidriver.yaml | 2 +- deploy/rbd/kubernetes/csidriver.yaml | 2 +- examples/cephfs/snapshot.yaml | 2 +- examples/cephfs/snapshotclass.yaml | 2 +- examples/rbd/snapshot.yaml | 2 +- examples/rbd/snapshotclass.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/charts/ceph-csi-cephfs/templates/csidriver-crd.yaml b/charts/ceph-csi-cephfs/templates/csidriver-crd.yaml index 5229faa93..92c3d916a 100644 --- a/charts/ceph-csi-cephfs/templates/csidriver-crd.yaml +++ b/charts/ceph-csi-cephfs/templates/csidriver-crd.yaml @@ -1,7 +1,7 @@ {{ if semverCompare ">=1.18.0-beta.1" .Capabilities.KubeVersion.Version }} apiVersion: storage.k8s.io/v1 {{ else }} -apiVersion: storage.k8s.io/v1betav1 +apiVersion: storage.k8s.io/v1beta1 {{ end }} kind: CSIDriver metadata: diff --git a/deploy/cephfs/kubernetes/csidriver.yaml b/deploy/cephfs/kubernetes/csidriver.yaml index b3f93f000..49d0eaaea 100644 --- a/deploy/cephfs/kubernetes/csidriver.yaml +++ b/deploy/cephfs/kubernetes/csidriver.yaml @@ -1,6 +1,6 @@ --- # if Kubernetes version is less than 1.18 change -# apiVersion to storage.k8s.io/v1betav1 +# apiVersion to storage.k8s.io/v1beta1 apiVersion: storage.k8s.io/v1 kind: CSIDriver metadata: diff --git a/deploy/rbd/kubernetes/csidriver.yaml b/deploy/rbd/kubernetes/csidriver.yaml index f371e9c93..18ab2bc77 100644 --- a/deploy/rbd/kubernetes/csidriver.yaml +++ b/deploy/rbd/kubernetes/csidriver.yaml @@ -1,6 +1,6 @@ --- # if Kubernetes version is less than 1.18 change -# apiVersion to storage.k8s.io/v1betav1 +# apiVersion to storage.k8s.io/v1beta1 apiVersion: storage.k8s.io/v1 kind: CSIDriver metadata: diff --git a/examples/cephfs/snapshot.yaml b/examples/cephfs/snapshot.yaml index 29e0a8f58..674674e5e 100644 --- a/examples/cephfs/snapshot.yaml +++ b/examples/cephfs/snapshot.yaml @@ -1,6 +1,6 @@ --- # Snapshot API version compatibility matrix: -# v1betav1: +# v1beta1: # v1.17 =< k8s < v1.20 # 2.x =< snapshot-controller < v4.x # v1: diff --git a/examples/cephfs/snapshotclass.yaml b/examples/cephfs/snapshotclass.yaml index 62379cb8c..58af84aae 100644 --- a/examples/cephfs/snapshotclass.yaml +++ b/examples/cephfs/snapshotclass.yaml @@ -1,6 +1,6 @@ --- # Snapshot API version compatibility matrix: -# v1betav1: +# v1beta1: # v1.17 =< k8s < v1.20 # 2.x =< snapshot-controller < v4.x # v1: diff --git a/examples/rbd/snapshot.yaml b/examples/rbd/snapshot.yaml index 014634f44..5716128bd 100644 --- a/examples/rbd/snapshot.yaml +++ b/examples/rbd/snapshot.yaml @@ -1,6 +1,6 @@ --- # Snapshot API version compatibility matrix: -# v1betav1: +# v1beta1: # v1.17 =< k8s < v1.20 # 2.x =< snapshot-controller < v4.x # v1: diff --git a/examples/rbd/snapshotclass.yaml b/examples/rbd/snapshotclass.yaml index d2f325bc0..67a94e4fa 100644 --- a/examples/rbd/snapshotclass.yaml +++ b/examples/rbd/snapshotclass.yaml @@ -1,6 +1,6 @@ --- # Snapshot API version compatibility matrix: -# v1betav1: +# v1beta1: # v1.17 =< k8s < v1.20 # 2.x =< snapshot-controller < v4.x # v1: