chore: use storage.k8s.io/v1 apiVersion for 1.22+ (#4550)

Azure · Jun 30, 2021 · 1b8a29f · 1b8a29f
1 parent 29213a4
commit 1b8a29f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/parts/k8s/addons/azure-cloud-provider.yaml b/parts/k8s/addons/azure-cloud-provider.yaml
@@ -168,7 +168,7 @@ volumeBindingMode: Immediate
 {{else}}
   {{- if NeedsStorageAccountStorageClasses}}
 ---
-apiVersion: storage.k8s.io/v1beta1
+apiVersion: storage.k8s.io/v1{{- if not (IsKubernetesVersionGe "1.22.0-alpha.2")}}beta1{{end}}
 kind: StorageClass
 metadata:
   name: default
@@ -180,7 +180,7 @@ provisioner: kubernetes.io/azure-disk
 parameters:
   cachingmode: ReadOnly
 ---
-apiVersion: storage.k8s.io/v1beta1
+apiVersion: storage.k8s.io/v1{{- if not (IsKubernetesVersionGe "1.22.0-alpha.2")}}beta1{{end}}
 kind: StorageClass
 metadata:
   name: unmanaged-premium
@@ -193,7 +193,7 @@ parameters:
   storageaccounttype: Premium_LRS
   cachingmode: ReadOnly
 ---
-apiVersion: storage.k8s.io/v1beta1
+apiVersion: storage.k8s.io/v1{{- if not (IsKubernetesVersionGe "1.22.0-alpha.2")}}beta1{{end}}
 kind: StorageClass
 metadata:
   name: unmanaged-standard
@@ -221,7 +221,7 @@ parameters:
   {{- end}}
   {{- if NeedsManagedDiskStorageClasses}}
 ---
-apiVersion: storage.k8s.io/v1beta1
+apiVersion: storage.k8s.io/v1{{- if not (IsKubernetesVersionGe "1.22.0-alpha.2")}}beta1{{end}}
 kind: StorageClass
 metadata:
   name: default
@@ -235,7 +235,7 @@ parameters:
   storageaccounttype: Standard_LRS
   cachingmode: ReadOnly
 ---
-apiVersion: storage.k8s.io/v1beta1
+apiVersion: storage.k8s.io/v1{{- if not (IsKubernetesVersionGe "1.22.0-alpha.2")}}beta1{{end}}
 kind: StorageClass
 metadata:
   name: managed-premium
@@ -248,7 +248,7 @@ parameters:
   storageaccounttype: Premium_LRS
   cachingmode: ReadOnly
 ---
-apiVersion: storage.k8s.io/v1beta1
+apiVersion: storage.k8s.io/v1{{- if not (IsKubernetesVersionGe "1.22.0-alpha.2")}}beta1{{end}}
 kind: StorageClass
 metadata:
   name: managed-standard

diff --git a/pkg/engine/templates_generated.go b/pkg/engine/templates_generated.go